diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 63ed536b96..2477f507a0 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -237,8 +237,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/vim/plugins @figsoda @jonringer # VsCode Extensions -/pkgs/applications/editors/vscode @superherointj -/pkgs/applications/editors/vscode/extensions @jonringer @superherointj +/pkgs/applications/editors/vscode/extensions @jonringer # Prometheus exporter modules and tests /nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz @@ -312,6 +311,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /doc/languages-frameworks/javascript.section.md @winterqt # OCaml -/pkgs/build-support/ocaml @romildo @superherointj @ulrikstrid -/pkgs/development/compilers/ocaml @romildo @superherointj @ulrikstrid -/pkgs/development/ocaml-modules @romildo @superherointj @ulrikstrid +/pkgs/build-support/ocaml @romildo @ulrikstrid +/pkgs/development/compilers/ocaml @romildo @ulrikstrid +/pkgs/development/ocaml-modules @romildo @ulrikstrid diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index ecff018948..b86fffa460 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -3,7 +3,7 @@ Building software with Nix often requires downloading source code and other files from the internet. `nixpkgs` provides *fetchers* for different protocols and services. Fetchers are functions that simplify downloading files. -## Caveats +## Caveats {#chap-pkgs-fetchers-caveats} Fetchers create [fixed output derivations](https://nixos.org/manual/nix/stable/#fixed-output-drvs) from downloaded files. Nix can reuse the downloaded files via the hash of the resulting derivation. diff --git a/third_party/nixpkgs/doc/builders/images/binarycache.section.md b/third_party/nixpkgs/doc/builders/images/binarycache.section.md index fe2772f33b..62e47dad7c 100644 --- a/third_party/nixpkgs/doc/builders/images/binarycache.section.md +++ b/third_party/nixpkgs/doc/builders/images/binarycache.section.md @@ -6,7 +6,7 @@ Nix packages are most commonly shared between machines using [HTTP, SSH, or S3]( Note that this function is meant for advanced use-cases. The more idiomatic way to work with flat-file binary caches is via the [nix-copy-closure](https://nixos.org/manual/nix/stable/command-ref/nix-copy-closure.html) command. You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your containerization needs. -## Example +## Example {#sec-pkgs-binary-cache-example} The following derivation will construct a flat-file binary cache containing the closure of `hello`. diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md index 2467739a1a..3ac4f224b5 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md @@ -410,7 +410,7 @@ If the derivation is fully buildable (i.e. `nix-build` can be used on it), runni The behavior doesn't match `nix-shell` or `nix-build` exactly and this function is known not to work correctly for e.g. fixed-output derivations, content-addressed derivations, impure derivations and other special types of derivations. ::: -### Arguments +### Arguments {#ssec-pkgs-dockerTools-buildNixShellImage-arguments} `drv` @@ -473,7 +473,7 @@ The behavior doesn't match `nix-shell` or `nix-build` exactly and this function *Default:* (none) -### Example +### Example {#ssec-pkgs-dockerTools-buildNixShellImage-example} The following shows how to build the `pkgs.hello` package inside a Docker container built with `buildNixShellImage`. diff --git a/third_party/nixpkgs/doc/builders/images/makediskimage.section.md b/third_party/nixpkgs/doc/builders/images/makediskimage.section.md index c4566e7531..e50479c4e8 100644 --- a/third_party/nixpkgs/doc/builders/images/makediskimage.section.md +++ b/third_party/nixpkgs/doc/builders/images/makediskimage.section.md @@ -12,12 +12,12 @@ Whereas for many web servers, applications, it is possible to work with a Nix st NixOS tests also use this function when preparing the VM. The `cptofs` method is used when `virtualisation.useBootLoader` is false (the default). Otherwise the second method is used. -## Features +## Features {#sec-make-disk-image-features} For reference, read the function signature source code for documentation on arguments: . Features are separated in various sections depending on if you opt for a Nix-store only image or a full NixOS image. -### Common +### Common {#sec-make-disk-image-features-common} - arbitrary NixOS configuration - automatic or bound disk size: `diskSize` parameter, `additionalSpace` can be set when `diskSize` is `auto` to add a constant of disk space @@ -29,7 +29,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto - the current nixpkgs can be realized as a channel in the disk image, which will change the hash of the image when the sources are updated - additional store paths can be provided through `additionalPaths` -### Full NixOS image +### Full NixOS image {#sec-make-disk-image-features-full-image} - arbitrary contents with permissions can be placed in the target filesystem using `contents` - a `/etc/nixpkgs/nixos/configuration.nix` can be provided through `configFile` @@ -37,7 +37,7 @@ Features are separated in various sections depending on if you opt for a Nix-sto - EFI variables can be mutated during image production and the result is exposed in `$out` - boot partition size when partition table is `efi` or `hybrid` -### On bit-to-bit reproducibility +### On bit-to-bit reproducibility {#sec-make-disk-image-features-reproducibility} Images are **NOT** deterministic, please do not hesitate to try to fix this, source of determinisms are (not exhaustive) : @@ -47,7 +47,7 @@ Images are **NOT** deterministic, please do not hesitate to try to fix this, sou A `deterministic` flag is available for best efforts determinism. -## Usage +## Usage {#sec-make-disk-image-usage} To produce a Nix-store only image: ```nix diff --git a/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md b/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md index 90d75c5491..fee508dc29 100644 --- a/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md +++ b/third_party/nixpkgs/doc/builders/special/makesetuphook.section.md @@ -12,7 +12,7 @@ pkgs.makeSetupHook { } ./script.sh ``` -#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash +#### setup hook that depends on the hello package and runs hello and @shell@ is substituted with path to bash {#sec-pkgs.makeSetupHook-usage-example} ```nix pkgs.makeSetupHook { @@ -27,7 +27,7 @@ pkgs.makeSetupHook { '') ``` -## Attributes +## Attributes {#sec-pkgs.makeSetupHook-attributes} * `name` Set the name of the hook. * `propagatedBuildInputs` Runtime dependencies (such as binaries) of the hook. diff --git a/third_party/nixpkgs/doc/builders/special/mkshell.section.md b/third_party/nixpkgs/doc/builders/special/mkshell.section.md index 73cc57f485..96d4353595 100644 --- a/third_party/nixpkgs/doc/builders/special/mkshell.section.md +++ b/third_party/nixpkgs/doc/builders/special/mkshell.section.md @@ -20,7 +20,7 @@ pkgs.mkShell { } ``` -## Attributes +## Attributes {#sec-pkgs-mkShell-attributes} * `name` (default: `nix-shell`). Set the name of the derivation. * `packages` (default: `[]`). Add executable packages to the `nix-shell` environment. @@ -29,7 +29,7 @@ pkgs.mkShell { ... all the attributes of `stdenv.mkDerivation`. -## Building the shell +## Building the shell {#sec-pkgs-mkShell-building} This derivation output will contain a text file that contains a reference to all the build inputs. This is useful in CI where we want to make sure that diff --git a/third_party/nixpkgs/doc/builders/testers.chapter.md b/third_party/nixpkgs/doc/builders/testers.chapter.md index a0f0f97f9d..a644262fd9 100644 --- a/third_party/nixpkgs/doc/builders/testers.chapter.md +++ b/third_party/nixpkgs/doc/builders/testers.chapter.md @@ -178,7 +178,7 @@ letting NixOS invoke Nixpkgs anew. If a test machine needs to set NixOS options under `nixpkgs`, it must set only the `nixpkgs.pkgs` option. -### Parameter +### Parameter {#tester-nixosTest-parameter} A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-tests), or path to it. Example: @@ -200,7 +200,7 @@ A [NixOS VM test network](https://nixos.org/nixos/manual/index.html#sec-nixos-te } ``` -### Result +### Result {#tester-nixosTest-result} A derivation that runs the VM test. diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md index 96e2ecf970..30fe4fa47d 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -290,7 +290,7 @@ Other examples of reasons are: - The previous download links were all broken - Crash when starting on some X11 systems -#### Acceptable backport criteria +#### Acceptable backport criteria {#acceptable-backport-criteria} The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages. diff --git a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md index d9ed56fb83..ff3d70ef0c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/agda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/agda.section.md @@ -216,7 +216,7 @@ you can test whether it builds correctly by writing in a comment: @ofborg build agdaPackages.iowa-stdlib ``` -### Maintaining Agda packages +### Maintaining Agda packages {#agda-maintaining-packages} As mentioned before, the aim is to have a compatible, and up-to-date package set. These two conditions sometimes exclude each other: diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 0ef0c830ef..4c1650781f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -281,11 +281,11 @@ mkShell { } ``` -### Using an overlay +### Using an overlay {#beam-using-overlays} If you need to use an overlay to change some attributes of a derivation, e.g. if you need a bugfix from a version that is not yet available in nixpkgs, you can override attributes such as `version` (and the corresponding `hash`) and then use this overlay in your development environment: -#### `shell.nix` +#### `shell.nix` {#beam-using-overlays-shell.nix} ```nix let diff --git a/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md b/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md index d8c35bd20c..d329943dc3 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md @@ -4,7 +4,7 @@ [R⁵RS](https://schemers.org/Documents/Standards/R5RS/HTML/)-compliant Scheme compiler. It includes an interactive mode and a custom package format, "eggs". -## Using Eggs +## Using Eggs {#sec-chicken-using} Eggs described in nixpkgs are available inside the `chickenPackages.chickenEggs` attrset. Including an egg as a build input is @@ -22,7 +22,7 @@ might write: Both `chicken` and its eggs have a setup hook which configures the environment variables `CHICKEN_INCLUDE_PATH` and `CHICKEN_REPOSITORY_PATH`. -## Updating Eggs +## Updating Eggs {#sec-chicken-updating-eggs} nixpkgs only knows about a subset of all published eggs. It uses [egg2nix](https://github.com/the-kenny/egg2nix) to generate a @@ -36,7 +36,7 @@ $ cd pkgs/development/compilers/chicken/5/ $ egg2nix eggs.scm > eggs.nix ``` -## Adding Eggs +## Adding Eggs {#sec-chicken-adding-eggs} When we run `egg2nix`, we obtain one collection of eggs with mutually-compatible versions. This means that when we add new eggs, we may diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuelang.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuelang.section.md index ef408c7bb1..86304208aa 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/cuelang.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/cuelang.section.md @@ -7,7 +7,7 @@ - do configuration akin to [Dhall Lang](https://dhall-lang.org/) - perform data validation -## Cuelang schema quick start +## Cuelang schema quick start {#cuelang-quickstart} Cuelang schemas are similar to JSON, here is a quick cheatsheet: @@ -21,7 +21,7 @@ Cuelang schemas are similar to JSON, here is a quick cheatsheet: - Read to learn more about the semantics. - Read to learn about the language specification. -## `writeCueValidator` +## `writeCueValidator` {#cuelang-writeCueValidator} Nixpkgs provides a `pkgs.writeCueValidator` helper, which will write a validation script based on the provided Cuelang schema. diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 2152f86165..b6a622875a 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -11,7 +11,7 @@ with import {}; mkShell { name = "dotnet-env"; packages = [ - dotnet-sdk_3 + dotnet-sdk ]; } ``` @@ -27,36 +27,57 @@ mkShell { name = "dotnet-env"; packages = [ (with dotnetCorePackages; combinePackages [ - sdk_3_1 sdk_6_0 + sdk_7_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 6.0 7.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info -.NET Core SDK (reflecting any global.json): - Version: 3.1.101 - Commit: b377529961 +.NET SDK: + Version: 7.0.202 + Commit: 6c74320bc3 -... +Środowisko uruchomieniowe: + OS Name: nixos + OS Version: 23.05 + OS Platform: Linux + RID: linux-x64 + Base Path: /nix/store/n2pm44xq20hz7ybsasgmd7p3yh31gnh4-dotnet-sdk-7.0.202/sdk/7.0.202/ -.NET Core SDKs installed: - 2.1.803 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk] - 3.0.102 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk] - 3.1.101 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/sdk] +Host: + Version: 7.0.4 + Architecture: x64 + Commit: 0a396acafe -.NET Core runtimes installed: - Microsoft.AspNetCore.All 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.All] - Microsoft.AspNetCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] - Microsoft.AspNetCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] - Microsoft.AspNetCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] - Microsoft.NETCore.App 2.1.15 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App] - Microsoft.NETCore.App 3.0.2 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App] - Microsoft.NETCore.App 3.1.1 [/nix/store/iiv98i2jdi226dgh4jzkkj2ww7f8jgpd-dotnet-core-combined/shared/Microsoft.NETCore.App] +.NET SDKs installed: + 6.0.407 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk] + 7.0.202 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/sdk] + +.NET runtimes installed: + Microsoft.AspNetCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] + Microsoft.AspNetCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.AspNetCore.App] + Microsoft.NETCore.App 6.0.15 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App] + Microsoft.NETCore.App 7.0.4 [/nix/store/3b19303vwrhv0xxz1hg355c7f2hgxxgd-dotnet-core-combined/shared/Microsoft.NETCore.App] + +Other architectures found: + None + +Environment variables: + Not set + +global.json file: + Not found + +Learn more: + https://aka.ms/dotnet/info + +Download .NET: + https://aka.ms/dotnet/download ``` ## dotnet-sdk vs dotnetCorePackages.sdk {#dotnet-sdk-vs-dotnetcorepackages.sdk} @@ -119,8 +140,8 @@ in buildDotnetModule rec { projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. - dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.net_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6.0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index ec123e7c7b..4b4f523129 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -160,7 +160,7 @@ All `haskell.packages.*` package sets use the same package descriptions and the of versions by default. There are however GHC version specific override `.nix` files to loosen this a bit. -### Dependency resolution +### Dependency resolution {#haskell-dependency-resolution} Normally when you build Haskell packages with `cabal-install`, `cabal-install` does dependency resolution. It will look at all Haskell package versions known @@ -230,7 +230,7 @@ specification, test suites, benchmarks etc. by compiling and invoking the package's `Setup.hs`. It does *not* use or invoke the `cabal-install` binary, but uses the underlying `Cabal` library instead. -### General arguments +### General arguments {#haskell-derivation-args} `pname` : Package name, assumed to be the same as on Hackage (if applicable) @@ -479,7 +479,7 @@ are especially useful when writing [overrides](#haskell-overriding-haskell-packa when you want to make sure that they are definitely included. However, it is recommended to use the more accurate ones listed above when possible. -### Meta attributes +### Meta attributes {#haskell-derivation-meta} `haskellPackages.mkDerivation` accepts the following attributes as direct arguments which are transparently set in `meta` of the resulting derivation. See @@ -714,7 +714,7 @@ editor plugin to achieve this. ## Overriding Haskell packages {#haskell-overriding-haskell-packages} -### Overriding a single package +### Overriding a single package {#haskell-overriding-a-single-package} @@ -803,7 +803,7 @@ lib.pipe my-haskell-package [ ] ``` -#### `haskell.lib.compose` +#### `haskell.lib.compose` {#haskell-haskell.lib.compose} The base interface for all overriding is the following function: @@ -826,7 +826,7 @@ following overview. Refer to the [documentation of `haskellPackages.mkDerivation`](#haskell-mkderivation) for a more detailed description of the effects of the respective arguments. -##### Packaging Helpers +##### Packaging Helpers {#haskell-packaging-helpers} `overrideSrc { src, version } drv` : Replace the source used for building `drv` with the path or derivation given @@ -875,7 +875,7 @@ sometimes necessary when working with versioned packages in altogether. Useful if it fails to evaluate cleanly and is causing noise in the evaluation errors tab on Hydra. -##### Development Helpers +##### Development Helpers {#haskell-development-helpers} `sdistTarball drv` : Create a source distribution tarball like those found on Hackage @@ -913,7 +913,7 @@ for debugging with e.g. `gdb`. -##### Trivial Helpers +##### Trivial Helpers {#haskell-trivial-helpers} `doJailbreak drv` : Sets the `jailbreak` argument to `true` for `drv`. @@ -998,7 +998,7 @@ benchmark component. `dontCoverage drv` : Sets the `doCoverage` argument to `false` for `drv`. -#### Library functions in the Haskell package sets +#### Library functions in the Haskell package sets {#haskell-package-set-lib-functions} Some library functions depend on packages from the Haskell package sets. Thus they are exposed from those instead of from `haskell.lib.compose` which can only access what is @@ -1062,7 +1062,7 @@ it does for the unstable branches. ## F.A.Q. {#haskell-faq} -### Why is topic X not covered in this section? Why is section Y missing? +### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered} We have been working on [moving the nixpkgs Haskell documentation back into the nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md index 76cf6e03c2..6d5e465ec3 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -6,16 +6,16 @@ This contains instructions on how to package javascript applications. The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. -## Getting unstuck / finding code examples +## Getting unstuck / finding code examples {#javascript-finding-examples} If you find you are lacking inspiration for packing javascript applications, the links below might prove useful. Searching online for prior art can be helpful if you are running into solved problems. -### Github +### Github {#javascript-finding-examples-github} - Searching Nix files for `mkYarnPackage`: - Searching just `flake.nix` files for `mkYarnPackage`: -### Gitlab +### Gitlab {#javascript-finding-examples-gitlab} - Searching Nix files for `mkYarnPackage`: - Searching just `flake.nix` files for `mkYarnPackage`: @@ -105,7 +105,7 @@ After you have identified the correct system, you need to override your package }); ``` -### Adding and Updating Javascript packages in nixpkgs +### Adding and Updating Javascript packages in nixpkgs {#javascript-adding-or-updating-packages} To add a package from NPM to nixpkgs: @@ -140,7 +140,7 @@ To update NPM packages in nixpkgs, run the same `generate.sh` script: ./pkgs/development/node-packages/generate.sh ``` -#### Git protocol error +#### Git protocol error {#javascript-git-error} Some packages may have Git dependencies from GitHub specified with `git://`. GitHub has [disabled unecrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git), so you may see the following error when running the generate script: @@ -288,7 +288,7 @@ configurePhase = '' This will generate a derivation including the `node_modules` directory. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. -#### Overriding dependency behavior +#### Overriding dependency behavior {#javascript-mkYarnPackage-overriding-dependencies} In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building. diff --git a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md index fb6fee997d..75cbdaeb6f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md @@ -4,7 +4,7 @@ Nixpkgs provides a couple of facilities for working with this tool. -## Writing packages providing pkg-config modules +## Writing packages providing pkg-config modules {#pkg-config-writing-packages} Packages should set `meta.pkgConfigModules` with the list of package config modules they provide. They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list. @@ -29,9 +29,9 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -## Accessing packages via pkg-config module name +## Accessing packages via pkg-config module name {#sec-pkg-config-usage} -### Within Nixpkgs +### Within Nixpkgs {#sec-pkg-config-usage-internal} A [setup hook](#setup-hook-pkg-config) is bundled in the `pkg-config` package to bring a derivation's declared build inputs into the environment. This will populate environment variables like `PKG_CONFIG_PATH`, `PKG_CONFIG_PATH_FOR_BUILD`, and `PKG_CONFIG_PATH_HOST` based on: @@ -44,7 +44,7 @@ For more details see the section on [specifying dependencies in general](#ssec-s Normal pkg-config commands to look up dependencies by name will then work with those environment variables defined by the hook. -### Externally +### Externally {#sec-pkg-config-usage-external} The `defaultPkgConfigPackages` package set is a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index a65cea533b..88d57618d0 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -1117,7 +1117,7 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` -#### Optional extra dependencies +#### Optional extra dependencies {#python-optional-dependencies} Some packages define optional dependencies for additional features. With `setuptools` this is called `extras_require` and `flit` calls it @@ -1801,14 +1801,14 @@ The following rules are desired to be respected: * Attribute names in `python-packages.nix` should be sorted alphanumerically to avoid merge conflicts and ease locating attributes. -## Package set maintenance +## Package set maintenance {#python-package-set-maintenance} The whole Python package set has a lot of packages that do not see regular updates, because they either are a very fragile component in the Python ecosystem, like for example the `hypothesis` package, or packages that have no maintainer, so maintenance falls back to the package set maintainers. -### Updating packages in bulk +### Updating packages in bulk {#python-package-bulk-updates} There is a tool to update alot of python libraries in bulk, it exists at `maintainers/scripts/update-python-libraries` with this repository. @@ -1836,7 +1836,7 @@ would be: $ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix ``` -## CPython Update Schedule +## CPython Update Schedule {#python-cpython-update-schedule} With [PEP 602](https://www.python.org/dev/peps/pep-0602/), CPython now follows a yearly release cadence. In nixpkgs, all supported interpreters diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index d1265097d2..f1953500fa 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -201,7 +201,7 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"' Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. -### Platform-specific gems +### Platform-specific gems {#ruby-platform-specif-gems} Right now, bundix has some issues with pre-built, platform-specific gems: [bundix PR #68](https://github.com/nix-community/bundix/pull/68). Until this is solved, you can tell bundler to not use platform-specific gems and instead build them from source each time: diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 3490b25761..39e38c6a12 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -166,8 +166,8 @@ in If your package requires building specific parts, use instead `pkgs.vimUtils.buildVimPlugin`. -### Specificities for some plugins -#### Treesitter +### Specificities for some plugins {#vim-plugin-specificities} +#### Treesitter {#vim-plugin-treesitter} By default `nvim-treesitter` encourages you to download, compile and install the required Treesitter grammars at run time with `:TSInstall`. This works @@ -244,7 +244,7 @@ Alternatively, set the number of processes to a lower count to avoid rate-limiti ./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` -## How to maintain an out-of-tree overlay of vim plugins ? +## How to maintain an out-of-tree overlay of vim plugins ? {#vim-out-of-tree-overlays} You can use the updater script to generate basic packages out of a custom vim plugin list: diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml index ccbaf40586..8aca360176 100644 --- a/third_party/nixpkgs/doc/manual.xml +++ b/third_party/nixpkgs/doc/manual.xml @@ -1,19 +1,20 @@ + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="nixpkgs-manual"> Nixpkgs Manual Version - + Using Nixpkgs - + Standard environment @@ -21,7 +22,7 @@ - + Builders @@ -32,7 +33,7 @@ - + Contributing to Nixpkgs diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index 1fca829aa5..0b4777efdb 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -101,7 +101,7 @@ $ cd path/to/nixpkgs $ nix-build -A your-package.tests ``` -#### Package tests +#### Package tests {#var-meta-tests-packages} Tests that are part of the source package are often executed in the `installCheckPhase`. @@ -113,7 +113,7 @@ Prefer `passthru.tests` for tests that are introduced in nixpkgs because: For more on how to write and run package tests, see . -#### NixOS tests +#### NixOS tests {#var-meta-tests-nixos} The NixOS tests are available as `nixosTests` in parameters of derivations. For instance, the OpenSMTPD derivation includes lines similar to: diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 6f3f2b4460..081d1e778f 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -703,7 +703,7 @@ The prefix under which the package must be installed, passed via the `--prefix` The key to use when specifying the prefix. By default, this is set to `--prefix=` as that is used by the majority of packages. -##### `dontAddStaticConfigureFlags` +##### `dontAddStaticConfigureFlags` {#var-stdenv-dontAddStaticConfigureFlags} By default, when building statically, stdenv will try to add build system appropriate configure flags to try to enable static builds. @@ -1095,15 +1095,15 @@ postInstall = '' Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form: -#### `--replace` \ \ +#### `--replace` \ \ {#fun-substitute-replace} Replace every occurrence of the string \ by \. -#### `--subst-var` \ +#### `--subst-var` \ {#fun-substitute-subst-var} Replace every occurrence of `@varName@` by the contents of the environment variable \. This is useful for generating files from templates, using `@...@` in the template as placeholders. -#### `--subst-var-by` \ \ +#### `--subst-var-by` \ \ {#fun-substitute-subst-var-by} Replace every occurrence of `@varName@` by the string \. @@ -1244,7 +1244,7 @@ Multiple paths can be specified. patchShebangs [--build | --host] PATH... ``` -##### Flags +##### Flags {#patch-shebangs.sh-invocation-flags} `--build` : Look up commands available at build time @@ -1252,7 +1252,7 @@ patchShebangs [--build | --host] PATH... `--host` : Look up commands available at run time -##### Examples +##### Examples {#patch-shebangs.sh-invocation-examples} ```sh patchShebangs --host /nix/store/-hello-1.0/bin @@ -1339,7 +1339,7 @@ Similarly, the CC Wrapper follows the Bintools Wrapper in defining standard envi Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses. -### Other hooks +### Other hooks {#stdenv-other-hooks} Many other packages provide hooks, that are not part of `stdenv`. You can find these in the [Hooks Reference](#chap-hooks). diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 4eefe3bea0..acfd0716e4 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1974,12 +1974,6 @@ githubId = 28444296; name = "Benjamin Hougland"; }; - bigzilla = { - email = "m.billyzaelani@gmail.com"; - github = "bigzilla"; - githubId = 20436235; - name = "Billy Zaelani Malik"; - }; billewanick = { email = "bill@ewanick.com"; github = "billewanick"; @@ -10031,6 +10025,12 @@ fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; }]; }; + minizilla = { + email = "m.billyzaelani@gmail.com"; + github = "minizilla"; + githubId = 20436235; + name = "Billy Zaelani Malik"; + }; mir06 = { email = "armin.leuprecht@uni-graz.at"; github = "mir06"; @@ -10540,6 +10540,11 @@ githubId = 6295090; name = "Mats"; }; + mynacol = { + github = "Mynacol"; + githubId = 26695166; + name = "Paul Prechtel"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "Myrl"; @@ -11540,6 +11545,12 @@ githubId = 686076; name = "Vitalii Voloshyn"; }; + panda2134 = { + email = "me+nixpkgs@panda2134.site"; + github = "panda2134"; + githubId = 7239200; + name = "panda2134"; + }; pandaman = { email = "kointosudesuyo@infoseek.jp"; github = "pandaman64"; @@ -14394,6 +14405,12 @@ fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51"; }]; }; + stepech = { + name = "stepech"; + github = "stepech"; + githubId = 29132060; + matrix = "@stepech:matrix.org"; + }; stephank = { email = "nix@stephank.nl"; matrix = "@skochen:matrix.org"; @@ -15974,6 +15991,12 @@ fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; }]; }; + vinnymeller = { + email = "vinnymeller@proton.me"; + github = "vinnymeller"; + githubId = 19894025; + name = "Vinny Meller"; + }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 2cbeedeaf7..5f7e40a28b 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -19,6 +19,8 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -32,6 +34,7 @@ import Control.Monad (forM_, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) import Data.Aeson ( FromJSON, + FromJSONKey, ToJSON, decodeFileStrict', eitherDecodeStrict', @@ -51,6 +54,7 @@ import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as Text import Data.Text.Encoding (encodeUtf8) +import qualified Data.Text.IO as Text import Data.Time (defaultTimeLocale, formatTime, getCurrentTime) import Data.Time.Clock (UTCTime) import GHC.Generics (Generic) @@ -90,13 +94,16 @@ import Distribution.Simple.Utils (safeLast, fromUTF8BS) newtype JobsetEvals = JobsetEvals { evals :: Seq Eval } - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype Nixpkgs = Nixpkgs {revision :: Text} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs} - deriving (Generic, ToJSON, FromJSON, Show) + deriving stock (Generic, Show) + deriving anyclass (ToJSON, FromJSON) data Eval = Eval { id :: Int @@ -104,13 +111,42 @@ data Eval = Eval } deriving (Generic, ToJSON, FromJSON, Show) +-- | Hydra job name. +-- +-- Examples: +-- - @"haskellPackages.lens.x86_64-linux"@ +-- - @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- - @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ +-- - @"arion.aarch64-linux"@ +newtype JobName = JobName { unJobName :: Text } + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSONKey, FromJSON, Ord, ToJSON) + +-- | Datatype representing the result of querying the build evals of the +-- haskell-updates Hydra jobset. +-- +-- The URL (where @EVAL_ID@ is a +-- value like 1792418) returns a list of 'Build'. data Build = Build - { job :: Text + { job :: JobName , buildstatus :: Maybe Int + -- ^ Status of the build. See 'getBuildState' for the meaning of each state. , finished :: Int + -- ^ Whether or not the build is finished. @0@ if finished, non-zero otherwise. , id :: Int , nixname :: Text + -- ^ Nix name of the derivation. + -- + -- Examples: + -- - @"lens-5.2.1"@ + -- - @"cabal-install-3.8.0.1"@ + -- - @"lens-static-x86_64-unknown-linux-musl-5.1.1"@ , system :: Text + -- ^ System + -- + -- Examples: + -- - @"x86_64-linux"@ + -- - @"aarch64-darwin"@ , jobsetevals :: Seq Int } deriving (Generic, ToJSON, FromJSON, Show) @@ -196,7 +232,7 @@ newtype Maintainers = Maintainers { maintainers :: Maybe Text } -- -- Note that Hydra jobs without maintainers will have an empty string for the -- maintainer list. -type HydraJobs = Map Text Maintainers +type HydraJobs = Map JobName Maintainers -- | Map of email addresses to GitHub handles. -- This is built from the file @../../maintainer-list.nix@. @@ -221,12 +257,12 @@ type EmailToGitHubHandles = Map Text Text -- , ("conduit.x86_64-darwin", ["snoyb", "webber"]) -- ] -- @@ -type MaintainerMap = Map Text (NonEmpty Text) +type MaintainerMap = Map JobName (NonEmpty Text) -- | Information about a package which lists its dependencies and whether the -- package is marked broken. data DepInfo = DepInfo { - deps :: Set Text, + deps :: Set PkgName, broken :: Bool } deriving stock (Generic, Show) @@ -234,23 +270,37 @@ data DepInfo = DepInfo { -- | Map from package names to their DepInfo. This is the data we get out of a -- nix call. -type DependencyMap = Map Text DepInfo +type DependencyMap = Map PkgName DepInfo -- | Map from package names to its broken state, number of reverse dependencies (fst) and -- unbroken reverse dependencies (snd). -type ReverseDependencyMap = Map Text (Int, Int) +type ReverseDependencyMap = Map PkgName (Int, Int) -- | Calculate the (unbroken) reverse dependencies of a package by transitively -- going through all packages if it’s a dependency of them. calculateReverseDependencies :: DependencyMap -> ReverseDependencyMap -calculateReverseDependencies depMap = Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) +calculateReverseDependencies depMap = + Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) where -- This code tries to efficiently invert the dependency map and calculate -- it’s transitive closure by internally identifying every pkg with it’s index -- in the package list and then using memoization. + keys :: [PkgName] keys = Map.keys depMap + + pkgToIndexMap :: Map PkgName Int pkgToIndexMap = Map.fromDistinctAscList (zip keys [0..]) - intDeps = zip [0..] $ (\DepInfo{broken,deps} -> (broken,mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps)) <$> Map.elems depMap + + depInfos :: [DepInfo] + depInfos = Map.elems depMap + + depInfoToIdx :: DepInfo -> (Bool, [Int]) + depInfoToIdx DepInfo{broken,deps} = + (broken, mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps) + + intDeps :: [(Int, (Bool, [Int]))] + intDeps = zip [0..] (fmap depInfoToIdx depInfos) + rdepMap onlyUnbroken = IntSet.size <$> resultList where resultList = go <$> [0..] @@ -267,7 +317,7 @@ getMaintainerMap = do handlesMap :: EmailToGitHubHandles <- readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: " pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs - where + where -- Split a comma-spearated string of Maintainers into a NonEmpty list of -- GitHub handles. splitMaintainersToGitHubHandles @@ -279,7 +329,10 @@ getMaintainerMap = do -- script ./dependencies.nix. getDependencyMap :: IO DependencyMap getDependencyMap = - readJSONProcess nixExprCommand ("maintainers/scripts/haskell/dependencies.nix":nixExprParams) "Failed to decode nix output for lookup of dependencies: " + readJSONProcess + nixExprCommand + ("maintainers/scripts/haskell/dependencies.nix" : nixExprParams) + "Failed to decode nix output for lookup of dependencies: " -- | Run a process that produces JSON on stdout and and decode the JSON to a -- data type. @@ -331,16 +384,77 @@ platformIcon (Platform x) = case x of "aarch64-darwin" -> ":green_apple:" _ -> x +platformIsOS :: OS -> Platform -> Bool +platformIsOS os (Platform x) = case (os, x) of + (Linux, "x86_64-linux") -> True + (Linux, "aarch64-linux") -> True + (Darwin, "x86_64-darwin") -> True + (Darwin, "aarch64-darwin") -> True + _ -> False + + +-- | A package name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgName' +-- @"lens"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgName' @"cabal-install"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgName' @"ghc90"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgName' @"arion"@. +-- +-- 'PkgName' is also used as a key in 'DependencyMap' and 'ReverseDependencyMap'. +-- In this case, 'PkgName' originally comes from attribute names in @haskellPackages@ +-- in Nixpkgs. +newtype PkgName = PkgName Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + +-- | A package set name. This is parsed from a 'JobName'. +-- +-- Examples: +-- +-- - The 'JobName' @"haskellPackages.lens.x86_64-linux"@ produces the 'PkgSet' +-- @"haskellPackages"@. +-- - The 'JobName' @"haskell.packages.ghc925.cabal-install.aarch64-darwin"@ +-- produces the 'PkgSet' @"haskell.packages.ghc925"@. +-- - The 'JobName' @"pkgsMusl.haskell.compiler.ghc90.x86_64-linux"@ produces +-- the 'PkgSet' @"pkgsMusl.haskell.compiler"@. +-- - The 'JobName' @"arion.aarch64-linux"@ produces the 'PkgSet' @""@. +-- +-- As you can see from the last example, 'PkgSet' can be empty (@""@) for +-- top-level jobs. +newtype PkgSet = PkgSet Text + deriving stock (Generic, Show) + deriving newtype (Eq, FromJSON, FromJSONKey, Ord, ToJSON) + data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) -newtype Table row col a = Table (Map (row, col) a) data SummaryEntry = SummaryEntry { - summaryBuilds :: Table Text Platform BuildResult, + summaryBuilds :: Table PkgSet Platform BuildResult, summaryMaintainers :: Set Text, summaryReverseDeps :: Int, summaryUnbrokenReverseDeps :: Int } -type StatusSummary = Map Text SummaryEntry +type StatusSummary = Map PkgName SummaryEntry + +data OS = Linux | Darwin + +newtype Table row col a = Table (Map (row, col) a) + +singletonTable :: row -> col -> a -> Table row col a +singletonTable row col a = Table $ Map.singleton (row, col) a + +unionTable :: (Ord row, Ord col) => Table row col a -> Table row col a -> Table row col a +unionTable (Table l) (Table r) = Table $ Map.union l r + +filterWithKeyTable :: (row -> col -> a -> Bool) -> Table row col a -> Table row col a +filterWithKeyTable f (Table t) = Table $ Map.filterWithKey (\(r,c) a -> f r c a) t + +nullTable :: Table row col a -> Bool +nullTable (Table t) = Map.null t instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) @@ -363,18 +477,45 @@ getBuildState Build{finished, buildstatus} = case (finished, buildstatus) of (_, Just 11) -> OutputLimitExceeded (_, i) -> Unknown i -buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary -buildSummary maintainerMap reverseDependencyMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary +combineStatusSummaries :: Seq StatusSummary -> StatusSummary +combineStatusSummaries = foldl (Map.unionWith unionSummary) Map.empty where - unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) - toSummary build@Build{job, id, system} = Map.singleton name (SummaryEntry (Table (Map.singleton (set, Platform system) (BuildResult (getBuildState build) id))) maintainers reverseDeps unbrokenReverseDeps) - where - packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) - splitted = nonEmpty $ Text.splitOn "." packageName - name = maybe packageName NonEmpty.last splitted - set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted - maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) - (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap + unionSummary :: SummaryEntry -> SummaryEntry -> SummaryEntry + unionSummary (SummaryEntry lb lm lr lu) (SummaryEntry rb rm rr ru) = + SummaryEntry (unionTable lb rb) (lm <> rm) (max lr rr) (max lu ru) + +buildToPkgNameAndSet :: Build -> (PkgName, PkgSet) +buildToPkgNameAndSet Build{job = JobName jobName, system} = (name, set) + where + packageName :: Text + packageName = fromMaybe jobName (Text.stripSuffix ("." <> system) jobName) + + splitted :: Maybe (NonEmpty Text) + splitted = nonEmpty $ Text.splitOn "." packageName + + name :: PkgName + name = PkgName $ maybe packageName NonEmpty.last splitted + + set :: PkgSet + set = PkgSet $ maybe "" (Text.intercalate "." . NonEmpty.init) splitted + +buildToStatusSummary :: MaintainerMap -> ReverseDependencyMap -> Build -> StatusSummary +buildToStatusSummary maintainerMap reverseDependencyMap build@Build{job, id, system} = + Map.singleton pkgName summaryEntry + where + (pkgName, pkgSet) = buildToPkgNameAndSet build + + maintainers :: Set Text + maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + + (reverseDeps, unbrokenReverseDeps) = + Map.findWithDefault (0,0) pkgName reverseDependencyMap + + buildTable :: Table PkgSet Platform BuildResult + buildTable = + singletonTable pkgSet (Platform system) (BuildResult (getBuildState build) id) + + summaryEntry = SummaryEntry buildTable maintainers reverseDeps unbrokenReverseDeps readBuildReports :: IO (Eval, UTCTime, Seq Build) readBuildReports = do @@ -396,19 +537,36 @@ printTable name showR showC showE (Table mapping) = joinTable <$> (name : map sh rows = toList $ Set.fromList (fst <$> Map.keys mapping) cols = toList $ Set.fromList (snd <$> Map.keys mapping) -printJob :: Int -> Text -> (Table Text Platform BuildResult, Text) -> [Text] -printJob evalId name (Table mapping, maintainers) = +printJob :: Int -> PkgName -> (Table PkgSet Platform BuildResult, Text) -> [Text] +printJob evalId (PkgName name) (Table mapping, maintainers) = if length sets <= 1 then map printSingleRow sets - else ["- [ ] " <> makeJobSearchLink "" name <> " " <> maintainers] <> map printRow sets + else ["- [ ] " <> makeJobSearchLink (PkgSet "") name <> " " <> maintainers] <> map printRow sets where - printRow set = " - " <> printState set <> " " <> makeJobSearchLink set (if Text.null set then "toplevel" else set) - printSingleRow set = "- [ ] " <> printState set <> " " <> makeJobSearchLink set (makePkgName set) <> " " <> maintainers - makePkgName set = (if Text.null set then "" else set <> ".") <> name - printState set = Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms - makeJobSearchLink set linkLabel= makeSearchLink evalId linkLabel (makePkgName set) + printRow :: PkgSet -> Text + printRow (PkgSet set) = + " - " <> printState (PkgSet set) <> " " <> + makeJobSearchLink (PkgSet set) (if Text.null set then "toplevel" else set) + + printSingleRow set = + "- [ ] " <> printState set <> " " <> + makeJobSearchLink set (makePkgName set) <> " " <> maintainers + + makePkgName :: PkgSet -> Text + makePkgName (PkgSet set) = (if Text.null set then "" else set <> ".") <> name + + printState set = + Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms + + makeJobSearchLink :: PkgSet -> Text -> Text + makeJobSearchLink set linkLabel = makeSearchLink evalId linkLabel (makePkgName set) + + sets :: [PkgSet] sets = toList $ Set.fromList (fst <$> Map.keys mapping) + + platforms :: [Platform] platforms = toList $ Set.fromList (snd <$> Map.keys mapping) + label pf (BuildResult s i) = "[[" <> platformIcon pf <> icon s <> "]](https://hydra.nixos.org/build/" <> showT i <> ")" makeSearchLink :: Int -> Text -> Text -> Text @@ -425,76 +583,177 @@ details summary content = ["
" <> summary <> " ", ""] evalLine :: Eval -> UTCTime -> Text evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime = - "*evaluation [" - <> showT id - <> "](https://hydra.nixos.org/eval/" - <> showT id - <> ") of nixpkgs commit [" - <> Text.take 7 revision - <> "](https://github.com/NixOS/nixpkgs/commits/" - <> revision - <> ") as of " - <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) - <> "*" + "*evaluation [" + <> showT id + <> "](https://hydra.nixos.org/eval/" + <> showT id + <> ") of nixpkgs commit [" + <> Text.take 7 revision + <> "](https://github.com/NixOS/nixpkgs/commits/" + <> revision + <> ") as of " + <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) + <> "*" -printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text +printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(PkgName, Int)] -> Text printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps = - Text.unlines $ - headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] - <> totals - <> optionalList "#### Maintained packages with build failure" (maintainedList fails) - <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) - <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) - <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) - <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) - <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) - <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) - <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] - <> footer - where - footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] - headline = - [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" - , evalLine eval fetchTime ] - totals = - [ "#### Build summary" - , "" - ] - <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary - brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " - numSummary = statusToNumSummary summary - jobsByState predicate = Map.filter (predicate . worstState) summary - worstState = foldl' min Success . fmap state . summaryBuilds - fails = jobsByState (== Failed) - failedDeps = jobsByState (== DependencyFailed) - unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) - withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) - withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) - optionalList heading list = if null list then mempty else [heading] <> list - optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list - maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer - unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer - showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) - showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) - tldr = case (errors, warnings) of - ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] - _ -> [":red_circle: **Branch not mergeable**"] - warnings = - if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> - if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> - if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." - errors = - if' (isNothing mergeableJob) "No `mergeable` job found." <> - if' (isNothing maintainedJob) "No `maintained` job found." <> - if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> - if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> - if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." <> - if' (outstandingJobs (Platform "aarch64-darwin") > 100) "Too many outstanding jobs on aarch64-darwin." - if' p e = if p then [e] else mempty - outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m - maintainedJob = Map.lookup "maintained" summary - mergeableJob = Map.lookup "mergeable" summary + Text.unlines $ + headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] + <> totals + <> optionalList "#### Maintained Linux packages with build failure" (maintainedList (fails summaryLinux)) + <> optionalList "#### Maintained Linux packages with failed dependency" (maintainedList (failedDeps summaryLinux)) + <> optionalList "#### Maintained Linux packages with unknown error" (maintainedList (unknownErr summaryLinux)) + <> optionalHideableList "#### Maintained Darwin packages with build failure" (maintainedList (fails summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with failed dependency" (maintainedList (failedDeps summaryDarwin)) + <> optionalHideableList "#### Maintained Darwin packages with unknown error" (maintainedList (unknownErr summaryDarwin)) + <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList (fails summary)) + <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList (failedDeps summary)) + <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList (unknownErr summary)) + <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) + <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] + <> footer + where + footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"] + + headline = + [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" + , evalLine eval fetchTime + ] + + totals :: [Text] + totals = + [ "#### Build summary" + , "" + ] <> + printTable + "Platform" + (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) + (\x -> showT x <> " " <> icon x) + showT + numSummary + + brokenLine :: (PkgName, Int) -> Text + brokenLine (PkgName name, rdeps) = + "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> + ") :arrow_heading_up: " <> Text.pack (show rdeps) <> " " + + numSummary = statusToNumSummary summary + + summaryLinux :: StatusSummary + summaryLinux = withOS Linux summary + + summaryDarwin :: StatusSummary + summaryDarwin = withOS Darwin summary + + -- Remove all BuildResult from the Table that have Platform that isn't for + -- the given OS. + tableForOS :: OS -> Table PkgSet Platform BuildResult -> Table PkgSet Platform BuildResult + tableForOS os = filterWithKeyTable (\_ platform _ -> platformIsOS os platform) + + -- Remove all BuildResult from the StatusSummary that have a Platform that + -- isn't for the given OS. Completely remove all PkgName from StatusSummary + -- that end up with no BuildResults. + withOS + :: OS + -> StatusSummary + -> StatusSummary + withOS os = + Map.mapMaybe + (\e@SummaryEntry{summaryBuilds} -> + let buildsForOS = tableForOS os summaryBuilds + in if nullTable buildsForOS then Nothing else Just e { summaryBuilds = buildsForOS } + ) + + jobsByState :: (BuildState -> Bool) -> StatusSummary -> StatusSummary + jobsByState predicate = Map.filter (predicate . worstState) + + worstState :: SummaryEntry -> BuildState + worstState = foldl' min Success . fmap state . summaryBuilds + + fails :: StatusSummary -> StatusSummary + fails = jobsByState (== Failed) + + failedDeps :: StatusSummary -> StatusSummary + failedDeps = jobsByState (== DependencyFailed) + + unknownErr :: StatusSummary -> StatusSummary + unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) + + withMaintainer :: StatusSummary -> Map PkgName (Table PkgSet Platform BuildResult, NonEmpty Text) + withMaintainer = + Map.mapMaybe + (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + + withoutMaintainer :: StatusSummary -> StatusSummary + withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) + + optionalList :: Text -> [Text] -> [Text] + optionalList heading list = if null list then mempty else [heading] <> list + + optionalHideableList :: Text -> [Text] -> [Text] + optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list + + maintainedList :: StatusSummary -> [Text] + maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer + + summaryEntryGetReverseDeps :: SummaryEntry -> (Int, Int) + summaryEntryGetReverseDeps sumEntry = + ( negate $ summaryUnbrokenReverseDeps sumEntry + , negate $ summaryReverseDeps sumEntry + ) + + sortOnReverseDeps :: [(PkgName, SummaryEntry)] -> [(PkgName, SummaryEntry)] + sortOnReverseDeps = sortOn (\(_, sumEntry) -> summaryEntryGetReverseDeps sumEntry) + + unmaintainedList :: StatusSummary -> [Text] + unmaintainedList = showBuild <=< sortOnReverseDeps . Map.toList . withoutMaintainer + + showBuild :: (PkgName, SummaryEntry) -> [Text] + showBuild (name, entry) = + printJob + id + name + ( summaryBuilds entry + , Text.pack + ( if summaryReverseDeps entry > 0 + then + " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <> + " | " <> show (summaryReverseDeps entry) + else "" + ) + ) + + showMaintainedBuild + :: (PkgName, (Table PkgSet Platform BuildResult, NonEmpty Text)) -> [Text] + showMaintainedBuild (name, (table, maintainers)) = + printJob + id + name + ( table + , Text.intercalate " " (fmap ("@" <>) (toList maintainers)) + ) + + tldr = case (errors, warnings) of + ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + _ -> [":red_circle: **Branch not mergeable**"] + warnings = + if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> + if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> + if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." + errors = + if' (isNothing mergeableJob) "No `mergeable` job found." <> + if' (isNothing maintainedJob) "No `maintained` job found." <> + if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> + if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too many outstanding jobs on x86_64-linux." <> + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too many outstanding jobs on aarch64-linux." + + if' p e = if p then [e] else mempty + + outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m + + maintainedJob = Map.lookup (PkgName "maintained") summary + mergeableJob = Map.lookup (PkgName "mergeable") summary printEvalInfo :: IO () printEvalInfo = do @@ -509,13 +768,18 @@ printMaintainerPing = do let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap pure (rdepMap, tops) (eval, fetchTime, buildReport) <- readBuildReports - putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap reverseDependencyMap buildReport) topBrokenRdeps)) + let statusSummaries = + fmap (buildToStatusSummary maintainerMap reverseDependencyMap) buildReport + buildSum :: StatusSummary + buildSum = combineStatusSummaries statusSummaries + textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps + Text.putStrLn textBuildSummary printMarkBrokenList :: IO () printMarkBrokenList = do (_, fetchTime, buildReport) <- readBuildReports runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} -> - case (getBuildState build, Text.splitOn "." job) of + case (getBuildState build, Text.splitOn "." $ unJobName job) of (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do -- Fetch build log from hydra to figure out the cause of the error. build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"] diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index 76e4393731..e23f1b562e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -158,7 +158,7 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. -- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream. +- `protonmail-bridge` package has been updated to major version 3. - Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`. @@ -178,7 +178,7 @@ In addition to numerous new and upgraded packages, this release has the followin - Please note that an upgrade from v24 (or older) to v26 directly is not possible. Please upgrade to `nextcloud25` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud25;`](options.html#opt-services.nextcloud.package). - It's recommended to use the latest version available (i.e. v26) and to specify that using `services.nextcloud.package`. -- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core +- .NET 5.0 and .NET 3.1 were removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core - The iputils package, which is installed by default, no longer provides the `ninfod`, `rarpd` and `rdisc` tools. See @@ -273,6 +273,16 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.chronyd` is now started with additional systemd sandbox/hardening options for better security. +- PostgreSQL has opt-in support for [JIT compilation](https://www.postgresql.org/docs/current/jit-reason.html). It can be enabled like this: + ```nix + { + services.postgresql = { + enable = true; + enableJIT = true; + }; + } + ``` + - `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses. - The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: @@ -336,8 +346,6 @@ In addition to numerous new and upgraded packages, this release has the followin - The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream. -- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream. - - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting. - `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`. diff --git a/third_party/nixpkgs/nixos/modules/config/malloc.nix b/third_party/nixpkgs/nixos/modules/config/malloc.nix index 4db0480b15..b740ebfccb 100644 --- a/third_party/nixpkgs/nixos/modules/config/malloc.nix +++ b/third_party/nixpkgs/nixos/modules/config/malloc.nix @@ -97,6 +97,7 @@ in }; config = mkIf (cfg.provider != "libc") { + boot.kernel.sysctl."vm.max_map_count" = mkIf (cfg.provider == "graphene-hardened") (mkDefault 1048576); environment.etc."ld-nix.so.preload".text = '' ${providerLibPath} ''; diff --git a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix index 76605a063a..e9ae4d651d 100644 --- a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix +++ b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix @@ -132,13 +132,13 @@ in exit 1 '' else configText; - - environment.systemPackages = [ cfg.package ]; } (mkIf cfg.enable { networking.resolvconf.package = pkgs.openresolv; + environment.systemPackages = [ cfg.package ]; + systemd.services.resolvconf = { description = "resolvconf update"; diff --git a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix index fa9dd4d6d8..e2e88a8ead 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix @@ -22,6 +22,6 @@ in }; config = mkIf cfg.enable { - services.udev.packages = [ pkgs.nitrokey-udev-rules ]; + services.udev.packages = [ pkgs.libnitrokey ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix index c4b93db22b..7b5e669d47 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix @@ -90,8 +90,8 @@ in mesaPackage = mkOption { type = types.package; - default = pkgs.mesa_23; - defaultText = literalExpression "pkgs.mesa_23"; + default = pkgs.mesa; + defaultText = literalExpression "pkgs.mesa"; example = literalExpression "pkgs.mesa_22"; description = lib.mdDoc '' The Mesa driver package used for rendering support on the system. @@ -103,8 +103,8 @@ in }; mesaPackage32 = mkOption { type = types.package; - default = pkgs.pkgsi686Linux.mesa_23; - defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23"; + default = pkgs.pkgsi686Linux.mesa; + defaultText = literalExpression "pkgs.pkgsi686Linux.mesa"; example = literalExpression "pkgs.pkgsi686Linux.mesa_22"; description = lib.mdDoc '' Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 434931ccae..79a3ab6baa 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -462,8 +462,7 @@ in boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" - # proprietary driver is not compiled with support for X86_KERNEL_IBT - ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off"; + ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off"; services.udev.extraRules = '' diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 23ffb81b6a..abd88d285a 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -1063,6 +1063,7 @@ ./services/search/opensearch.nix ./services/search/qdrant.nix ./services/security/aesmd.nix + ./services/security/authelia.nix ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix @@ -1210,7 +1211,6 @@ ./services/web-apps/zabbix.nix ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/authelia.nix ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix index a52783aa66..9bdd5d4056 100644 --- a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -51,6 +51,10 @@ in { enable = mkEnableOption (lib.mdDoc "installing proxychains configuration"); + package = mkPackageOptionMD pkgs "proxychains" { + example = "pkgs.proxychains-ng"; + }; + chain = { type = mkOption { type = types.enum [ "dynamic" "strict" "random" ]; @@ -159,7 +163,7 @@ in { }; environment.etc."proxychains.conf".text = configFile; - environment.systemPackages = [ pkgs.proxychains ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix index 98269f6250..fc63f0f187 100644 --- a/third_party/nixpkgs/nixos/modules/programs/steam.nix +++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix @@ -9,23 +9,36 @@ in { enable = mkEnableOption (lib.mdDoc "steam"); package = mkOption { - type = types.package; - default = pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; - if pkgs.stdenv.hostPlatform.is64bit - then [ package ] ++ extraPackages - else [ package32 ] ++ extraPackages32; - }; - defaultText = literalExpression '' - pkgs.steam.override { - extraLibraries = pkgs: with config.hardware.opengl; + type = types.package; + default = pkgs.steam; + defaultText = literalExpression "pkgs.steam"; + example = literalExpression '' + pkgs.steam-small.override { + extraEnv = { + MANGOHUD = true; + OBS_VKCAPTURE = true; + RADV_TEX_ANISO = 16; + }; + extraLibraries = p: with p; [ + atk + ]; + } + ''; + apply = steam: steam.override (prev: { + extraLibraries = pkgs: let + prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ]; + additionalLibs = with config.hardware.opengl; if pkgs.stdenv.hostPlatform.is64bit then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; - } - ''; + in prevLibs ++ additionalLibs; + }); description = lib.mdDoc '' - steam package to use. + The Steam package to use. Additional libraries are added from the system + configuration to ensure graphics work properly. + + Use this option to customise the Steam package rather than adding your + custom Steam to {option}`environment.systemPackages` yourself. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix index a51708170f..aae77cee07 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix @@ -114,6 +114,8 @@ in options.services.sanoid = { enable = mkEnableOption (lib.mdDoc "Sanoid ZFS snapshotting service"); + package = lib.mkPackageOptionMD pkgs "sanoid" {}; + interval = mkOption { type = types.str; default = "hourly"; @@ -181,7 +183,7 @@ in ExecStartPre = (map (buildAllowCommand "allow" [ "snapshot" "mount" "destroy" ]) datasets); ExecStopPost = (map (buildAllowCommand "unallow" [ "snapshot" "mount" "destroy" ]) datasets); ExecStart = lib.escapeShellArgs ([ - "${pkgs.sanoid}/bin/sanoid" + "${cfg.package}/bin/sanoid" "--cron" "--configdir" (pkgs.writeTextDir "sanoid.conf" configFile) diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 6188f10946..0f375455e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -87,6 +87,8 @@ in options.services.syncoid = { enable = mkEnableOption (lib.mdDoc "Syncoid ZFS synchronization service"); + package = lib.mkPackageOptionMD pkgs "sanoid" {}; + interval = mkOption { type = types.str; default = "hourly"; @@ -331,7 +333,7 @@ in ExecStopPost = (map (buildUnallowCommand c.localSourceAllow) (localDatasetName c.source)) ++ (map (buildUnallowCommand c.localTargetAllow) (localDatasetName c.target)); - ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/syncoid" ] + ExecStart = lib.escapeShellArgs ([ "${cfg.package}/bin/syncoid" ] ++ optionals c.useCommonArgs cfg.commonArgs ++ optional c.recursive "-r" ++ optionals (c.sshKey != null) [ "--sshkey" c.sshKey ] diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index 97c1e57f9b..72b2f992a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -147,8 +147,8 @@ in systemd.services.k3s = { description = "k3s service"; - after = [ "network.service" "firewall.service" ]; - wants = [ "network.service" "firewall.service" ]; + after = [ "firewall.service" "network-online.target" ]; + wants = [ "firewall.service" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = optional config.boot.zfs.enabled config.boot.zfs.package; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md index 1805bafe3b..4d66ee38be 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.md @@ -171,3 +171,40 @@ self: super: { }; } ``` + +## JIT (Just-In-Time compilation) {#module-services-postgres-jit} + +[JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package +is disabled by default because of the ~300MiB closure-size increase from the LLVM dependency. It +can be optionally enabled in PostgreSQL with the following config option: + +```nix +{ + services.postgresql.enableJIT = true; +} +``` + +This makes sure that the [`jit`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT)-setting +is set to `on` and a PostgreSQL package with JIT enabled is used. Further tweaking of the JIT compiler, e.g. setting a different +query cost threshold via [`jit_above_cost`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT-ABOVE-COST) +can be done manually via [`services.postgresql.settings`](#opt-services.postgresql.settings). + +The attribute-names of JIT-enabled PostgreSQL packages are suffixed with `_jit`, i.e. for each `pkgs.postgresql` +(and `pkgs.postgresql_`) in `nixpkgs` there's also a `pkgs.postgresql_jit` (and `pkgs.postgresql__jit`). +Alternatively, a JIT-enabled variant can be derived from a given `postgresql` package via `postgresql.withJIT`. +This is also useful if it's not clear which attribute from `nixpkgs` was originally used (e.g. when working with +[`config.services.postgresql.package`](#opt-services.postgresql.package) or if the package was modified via an +overlay) since all modifications are propagated to `withJIT`. I.e. + +```nix +with import { + overlays = [ + (self: super: { + postgresql = super.postgresql.overrideAttrs (_: { pname = "foobar"; }); + }) + ]; +}; +postgresql.withJIT.pname +``` + +evaluates to `"foobar"`. diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 7bbe1ad225..3d55995aba 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -7,9 +7,18 @@ let cfg = config.services.postgresql; postgresql = + let + # ensure that + # services.postgresql = { + # enableJIT = true; + # package = pkgs.postgresql_; + # }; + # works. + base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package; + in if cfg.extraPlugins == [] - then cfg.package - else cfg.package.withPackages (_: cfg.extraPlugins); + then base + else base.withPackages (_: cfg.extraPlugins); toStr = value: if true == value then "yes" @@ -42,6 +51,8 @@ in enable = mkEnableOption (lib.mdDoc "PostgreSQL Server"); + enableJIT = mkEnableOption (lib.mdDoc "JIT support"); + package = mkOption { type = types.package; example = literalExpression "pkgs.postgresql_11"; @@ -435,19 +446,21 @@ in log_line_prefix = cfg.logLinePrefix; listen_addresses = if cfg.enableTCPIP then "*" else "localhost"; port = cfg.port; + jit = mkDefault (if cfg.enableJIT then "on" else "off"); }; services.postgresql.package = let mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version."; + base = 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 "17.09" then mkThrow "9_6" + else mkThrow "9_5"; in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (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 "17.09" then mkThrow "9_6" - else mkThrow "9_5"); + mkDefault (if cfg.enableJIT then base.withJIT else base); services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix index b6b51b21c7..2a4104a4ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix @@ -755,8 +755,8 @@ in { Group = "matrix-synapse"; WorkingDirectory = cfg.dataDir; ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' - chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key - chmod 0600 ${cfg.dataDir}/homeserver.signing.key + chown matrix-synapse:matrix-synapse ${cfg.settings.signing_key_path} + chmod 0600 ${cfg.settings.signing_key_path} '')) ]; ExecStart = '' ${cfg.package}/bin/synapse_homeserver \ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix index 11bb8497c9..f3b97e9151 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix @@ -22,6 +22,8 @@ in { ''; }; + package = lib.mkPackageOptionMD pkgs "grafana-loki" { }; + group = mkOption { type = types.str; default = "loki"; @@ -78,7 +80,7 @@ in { ''; }]; - environment.systemPackages = [ pkgs.grafana-loki ]; # logcli + environment.systemPackages = [ cfg.package ]; # logcli users.groups.${cfg.group} = { }; users.users.${cfg.user} = { @@ -99,7 +101,7 @@ in { else cfg.configFile; in { - ExecStart = "${pkgs.grafana-loki}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${cfg.package}/bin/loki --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; User = cfg.user; Restart = "always"; PrivateTmp = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix index f963e34154..05e8632e31 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix @@ -87,7 +87,6 @@ let }; '' } - allow-query { any; }; ${extraConfig} }; '') diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/authelia.nix b/third_party/nixpkgs/nixos/modules/services/security/authelia.nix similarity index 100% rename from third_party/nixpkgs/nixos/modules/services/web-servers/authelia.nix rename to third_party/nixpkgs/nixos/modules/services/security/authelia.nix diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix index 2491c788d6..df8ed96f8d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix @@ -60,7 +60,7 @@ in package = mkOption { # TODO: when 23.05 is released and if Garage 0.9 is the default, put a stateVersion check. - default = if versionAtLeast stateVersion "23.05" then pkgs.garage_0_8_0 + default = if versionAtLeast config.system.stateVersion "23.05" then pkgs.garage_0_8 else pkgs.garage_0_7; defaultText = literalExpression "pkgs.garage_0_7"; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index 9c88d12ca6..1f48713a68 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -121,7 +121,7 @@ in environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon # https://xkbcommon.org/doc/current/group__include-path.html - XKB_CONFIG_ROOT = "${xkb_patched}/etc/X11/xkb"; + XKB_CONFIG_ROOT = config.services.xserver.xkbDir; }; services.xserver = { diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 896f8c0a69..74ab7070fd 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -338,6 +338,12 @@ in config = { + assertions = [ + { + assertion = config.system.copySystemConfiguration -> !lib.inPureEvalMode; + message = "system.copySystemConfiguration is not supported with flakes"; + } + ]; system.extraSystemBuilderCmds = optionalString diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index cdd9e00d25..3167a865fc 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -565,6 +565,7 @@ in { postfixadmin = handleTest ./postfixadmin.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; + postgresql-jit = handleTest ./postgresql-jit.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/authelia.nix b/third_party/nixpkgs/nixos/tests/authelia.nix index 7c239ebdd5..679c65fea0 100644 --- a/third_party/nixpkgs/nixos/tests/authelia.nix +++ b/third_party/nixpkgs/nixos/tests/authelia.nix @@ -1,5 +1,5 @@ # Test Authelia as an auth server for Traefik as a reverse proxy of a local web service -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ lib, ... }: { name = "authelia"; meta.maintainers = with lib.maintainers; [ jk ]; diff --git a/third_party/nixpkgs/nixos/tests/postgresql-jit.nix b/third_party/nixpkgs/nixos/tests/postgresql-jit.nix new file mode 100644 index 0000000000..baf26b8da2 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/postgresql-jit.nix @@ -0,0 +1,48 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + inherit (pkgs) lib; + packages = builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs); + + mkJitTest = packageName: makeTest { + name = "${packageName}"; + meta.maintainers = with lib.maintainers; [ ma27 ]; + nodes.machine = { pkgs, lib, ... }: { + services.postgresql = { + enable = true; + enableJIT = true; + package = pkgs.${packageName}; + initialScript = pkgs.writeText "init.sql" '' + create table demo (id int); + insert into demo (id) select generate_series(1, 5); + ''; + }; + }; + testScript = '' + machine.start() + machine.wait_for_unit("postgresql.service") + + with subtest("JIT is enabled"): + machine.succeed("sudo -u postgres psql <<<'show jit;' | grep 'on'") + + with subtest("Test JIT works fine"): + output = machine.succeed( + "cat ${pkgs.writeText "test.sql" '' + set jit_above_cost = 1; + EXPLAIN ANALYZE SELECT CONCAT('jit result = ', SUM(id)) FROM demo; + SELECT CONCAT('jit result = ', SUM(id)) from demo; + ''} | sudo -u postgres psql" + ) + assert "JIT:" in output + assert "jit result = 15" in output + + machine.shutdown() + ''; + }; +in +lib.genAttrs packages mkJitTest diff --git a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix index ae2708546f..b0bd7711db 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql-wal-receiver.nix @@ -116,4 +116,4 @@ let }; # Maps the generic function over all attributes of PostgreSQL packages -in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql { }))) +in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))) diff --git a/third_party/nixpkgs/nixos/tests/postgresql.nix b/third_party/nixpkgs/nixos/tests/postgresql.nix index 7e0a82c388..b44849e0a1 100644 --- a/third_party/nixpkgs/nixos/tests/postgresql.nix +++ b/third_party/nixpkgs/nixos/tests/postgresql.nix @@ -137,7 +137,7 @@ let maintainers = [ zagy ]; }; - machine = {...}: + nodes.machine = {...}: { services.postgresql = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/vaultwarden.nix b/third_party/nixpkgs/nixos/tests/vaultwarden.nix index d0b11e0053..95d00c1d8e 100644 --- a/third_party/nixpkgs/nixos/tests/vaultwarden.nix +++ b/third_party/nixpkgs/nixos/tests/vaultwarden.nix @@ -121,6 +121,8 @@ let driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys( '${userPassword}' ) + if driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').is_selected(): + driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').click() driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click() @@ -133,9 +135,9 @@ let ) driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() - wait.until(EC.title_contains("Vaultwarden Web Vault")) + wait.until(EC.title_contains("Vaults")) - driver.find_element(By.XPATH, "//button[contains(., 'Add item')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'New item')]").click() driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( 'secrets' diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 6d8f279dad..24d610f62d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") '' + sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; nativeBuildInputs = [ @@ -93,9 +95,6 @@ stdenv.mkDerivation rec { ffmpeg_4 file flac - ] ++ lib.optionals stdenv.isDarwin [ - AppKit - ] ++ [ gtk3 lame libid3tag @@ -135,6 +134,7 @@ stdenv.mkDerivation rec { libuuid util-linux ] ++ lib.optionals stdenv.isDarwin [ + AppKit CoreAudioKit # for portaudio libpng libjpeg diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index 28b60fa600..5b558a419d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -14,6 +14,8 @@ , pcaudiolib , sonicSupport ? true , sonic +, alsa-plugins +, makeWrapper }: stdenv.mkDerivation rec { @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ]; + nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn makeWrapper ]; buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib @@ -49,6 +51,8 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng + wrapProgram $out/bin/espeak-ng \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix index da54f07dfb..40ecd0dd21 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-+0s+MCFLw527gFj7pfiYGfKYihthFjRLPeto2SbALw0="; + hash = "sha256-gQPr+mCZ7tnASs/ibow1b0Qj3ppZhdgP4U1Vxo+FfE4="; }; deleteVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 1018cdbc77..1a7b1e2f87 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.99.6"; + version = "0.99.7"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-D25P254iaOsS0TyAKAiarDP37D4U9Dw7mdvUin/Qblc="; + sha256 = "sha256-bsvq48zTNafsQGFXVApCEWIL8H2RXiowalEu/W3DUu0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix b/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix new file mode 100644 index 0000000000..accba200e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchurl, buildPythonApplication, pyqt5, qttools, which }: + +buildPythonApplication rec { + pname = "patchance"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz"; + sha256 = "sha256-8Zn6xcDv4hBFXnaXK9xslYEB8uHEfIP+1NKvcPAyHj0="; + }; + + format = "other"; + + nativeBuildInputs = [ + pyqt5 # pyuic5 and pyrcc5 to build resources. + qttools # lrelease to build translations. + which # which to find lrelease. + ]; + + propagatedBuildInputs = [ pyqt5 ]; + + dontWrapQtApps = true; # The program is a python script. + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath" + ''; + + meta = with lib; { + homepage = "https://github.com/Houston4444/Patchance"; + description = "JACK Patchbay GUI"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix new file mode 100644 index 0000000000..bc1a85abaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchurl, buildPythonApplication, pydbus, pyliblo, pyqt5, qttools, which }: + +buildPythonApplication rec { + pname = "raysession"; + version = "0.13.1"; + + src = fetchurl { + url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz"; + sha256 = "sha256-iiFRtX43u9BHe7a4ojza7kav+dMW9e05dPi7Gf9d1GM="; + }; + + postPatch = '' + # Fix installation path of xdg schemas. + substituteInPlace Makefile --replace '$(DESTDIR)/' '$(DESTDIR)$(PREFIX)/' + # Do not wrap an importable module with a shell script. + chmod -x src/daemon/desktops_memory.py + ''; + + format = "other"; + + nativeBuildInputs = [ + pyqt5 # pyuic5 and pyrcc5 to build resources. + qttools # lrelease to build translations. + which # which to find lrelease. + ]; + + propagatedBuildInputs = [ pydbus pyliblo pyqt5 ]; + + dontWrapQtApps = true; # The program is a python script. + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath" + ''; + + meta = with lib; { + homepage = "https://github.com/Houston4444/RaySession"; + description = "Session manager for Linux musical programs"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix index 7cad39b63e..1d43d11c60 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { pname = "setbfree"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - sha256 = "sha256-OYrsq3zVaotmS1KUgDIQbVQgxpfweMKiB17/PC1iXDA="; + sha256 = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; }; postPatch = '' - sed 's#/usr/local#$(out)#g' -i common.mak - sed 's#/usr/share/fonts/truetype/ttf-bitstream-vera#${ttf_bitstream_vera}/share/fonts/truetype#g' \ - -i b_synth/Makefile + substituteInPlace common.mak \ + --replace /usr/local "$out" \ + --replace /usr/share/fonts/truetype/ttf-bitstream-vera "${ttf_bitstream_vera}/share/fonts/truetype" ''; nativeBuildInputs = [ pkg-config ]; @@ -25,6 +25,15 @@ stdenv.mkDerivation rec { ttf_bitstream_vera ]; + doInstallCheck = true; + + installCheckPhase = ''( + set -x + test -e $out/bin/setBfreeUI + )''; + + enableParallelBuilding = true; + meta = with lib; { description = "A DSP tonewheel organ emulator"; homepage = "https://setbfree.org"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tonelib-noisereducer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tonelib-noisereducer/default.nix new file mode 100644 index 0000000000..20dbe8c19d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/tonelib-noisereducer/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, alsa-lib +, freetype +, libglvnd +, mesa +, curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "tonelib-noisereducer"; + version = "1.2.0"; + + src = fetchurl { + url = "https://tonelib.net/download/221222/ToneLib-NoiseReducer-amd64.deb"; + sha256 = "sha256-27JuFVmamIUUKRrpjlsE0E6x+5X9RutNGPiDf5dxitI="; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 + ]; + + unpackCmd = "dpkg -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + meta = with lib; { + description = "ToneLib NoiseReducer – two-unit noise reduction rack effect plugin"; + homepage = "https://tonelib.net/tl-noisereducer.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix index e4cbfacedc..bdd17b2f8f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20221119"; pname = "x42-plugins"; + version = "20230315"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-q5RiEzV2QKNWXP8KB6nQjyNCTftiYgeowcbD709PEIk="; + hash = "sha256-l7Wg+G795i4QFI94NHcPDnvJMYcfQONUkIJeyX2bZos="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,10 +31,12 @@ stdenv.mkDerivation rec { sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; + enableParallelBuilding = true; + meta = with lib; { description = "Collection of LV2 plugins by Robin Gareus"; homepage = "https://github.com/x42/x42-plugins"; - maintainers = with maintainers; [ magnetophon ]; + maintainers = with maintainers; [ magnetophon orivej ]; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 1bc33588c4..709e20f476 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.8.12"; + version = "23.3.13"; src = fetchzip { url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU="; + sha256 = "sha256-/xCDtR3V++LaZZWTaNpeD3YuP5ZM5BChB1CUBH/xNcU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix index a8ce5ca242..fbd8c08575 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/teos/default.nix @@ -24,6 +24,7 @@ let license = licenses.mit; maintainers = with maintainers; [ seberm ]; }; + updateScript = ./update.sh; in { teos = rustPlatform.buildRustPackage { @@ -43,6 +44,8 @@ in darwin.apple_sdk.frameworks.Security ]; + passthru.updateScript = updateScript; + __darwinAllowLocalNetworking = true; meta = meta // { @@ -70,6 +73,8 @@ in darwin.apple_sdk.frameworks.SystemConfiguration ]; + passthru.updateScript = updateScript; + __darwinAllowLocalNetworking = true; meta = meta // { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/teos/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/teos/update.sh new file mode 100755 index 0000000000..b7e344cda8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/teos/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq git gnupg common-updater-scripts +set -euo pipefail + +# Fetch latest release, update derivation +scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) +nixpkgs=$(realpath "$scriptDir"/../../../..) + +oldVersion=$(nix-instantiate --eval -E "(import \"$nixpkgs\" { config = {}; overlays = []; }).teos.version" | tr -d '"') +version=$(curl -s --show-error "https://api.github.com/repos/talaia-labs/rust-teos/releases/latest" | jq -r '.tag_name' | tail -c +2) + +if [[ $version == $oldVersion ]]; then + echo "Already at latest version $version" + exit 0 +fi +echo "New version: $version" + +tmpdir=$(mktemp -d /tmp/teos.XXX) +repo="${tmpdir}/repo" +trap 'rm -rf $tmpdir' EXIT + +git clone --depth 1 --branch "v${version}" -c advice.detachedHead=false 'https://github.com/talaia-labs/rust-teos' "$repo" +git -C "$repo" checkout "tags/v${version}" + +rm -rf "${repo}/.git" +hashcheck=$(nix hash path "$repo") + +(cd "$nixpkgs" && update-source-version teos "$version" "$hashcheck") +sed -i 's|cargoHash = .*|cargoHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";|' "${scriptDir}/default.nix" +echo +echo "rust-teos: $oldVersion -> $version" diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index be9bb651e2..6f897ad392 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.188.0"; + version = "1.189.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-h5lbZ7H9a24OQvisBcmHe5RfaXTz2/LX3b4x6ArraYQ="; + hash = "sha256-adSX/J/p6E6vz7O5Cg3DgYQjrJYaEcOhYSDQqii68eg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 711496c544..364d22e98a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -16,23 +16,23 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.03.22", - "hash": "sha256-IoucMftNzDSOU3R6vyWTjfM9UVJrUSiHe5Kt1Ax05fg=" + "rev": "2023.03.28", + "hash": "sha256-24WOYnPb5MyEXHv3+E2MDisE5aHCTopulyqD2NFMaQU=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.03.14", - "hash": "sha256-75ndPG3nSM7Y/jEZFPmKfQMnFrARe1DNva1HoDHxqAE=" + "rev": "2023.03.28", + "hash": "sha256-nY3f72xK8luBQuFSCE7r+tP9Y3on8K4ULKW5WfKOs7E=" }, "EControl": { "owner": "Alexey-T", - "rev": "2023.03.06", - "hash": "sha256-JQURgyFfzKL8RC2wJmubFrXmpCeGWDkz1jXl4wBwhJ8=" + "rev": "2023.03.28", + "hash": "sha256-kaQAoNP9gRzkQsaQHBiMt6KheuTg/2cnWwUClPy8xoY=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.01.18", - "hash": "sha256-SLZIDcrLwvhkJY92e/wtSsoY5SrjghcumbdpuVdK4iE=" + "rev": "2023.03.28", + "hash": "sha256-fisjVB0AtqW24ZO6LIO5FKlTdoe8/zxnfuaEilllbVw=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index c04e215b99..8450fea7ac 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -8,6 +8,7 @@ , patchelf , openssl , expat +, libxcrypt-legacy , vmopts ? null }: @@ -50,6 +51,7 @@ let libdbusmenu openssl.out expat + libxcrypt-legacy ]; dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 86b6fa4bfe..7945186b40 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c4572fcec877053df89e7aba3bcd52a0ca5c7df7"; - sha256 = "0bbzmzkra9dj2a7j9lnss2fdl0h93r7n8cy5dfnlq80ynryfnsc5"; + rev = "f67f20184f0fe852881d925d387ce138754fa147"; + sha256 = "1f8iw4jrpyhb3nk9sz7hymdhl84bxxafjc0n7g2srhb2ggypnv46"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-03-20"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "4b8f537dadf5f9abbdd1554584bec9c04843909c"; - sha256 = "0sb94hi4qph8wg9agkg5kvqzfjnqnk683y05r0waw69r4iarsfar"; + rev = "45911fd6b436976ae9e83eb0a1968d3b8e72276b"; + sha256 = "09rp8xc3w7kzpcvkxjjcd9535slj2v2grl2jw5s00n4qlkvrd6p2"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-03-16"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ac100fa691b10dd990ca0cdc31ebd054a5959b58"; - sha256 = "1j59vy5dypc5a1ymgd640lyqkq2gsicqapgmlssxz0g91r71n40z"; + rev = "dde293000b626cca90804e7b82731173f195b3ee"; + sha256 = "13s8yh14ln7aslvj6r7r2naa4w01rc7szrrcrrzi545gkrn98r1x"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "73a7242daa785fc66a887ab1864dc1c9432d7cbe"; - sha256 = "09zv4wjnb1gfwq718gavpb5s2cwf7a057h3g8d8gs5x3vrxs6sda"; + rev = "2f132784aab54fcaedae6d2c465d32b3185dde7f"; + sha256 = "0zx5imcyndgyqw6jqrnmq23pnc2z0n5v2z5jlj72qb2c5lj321cq"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-03-18"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ab85d57942b3d7e1a2530af1a083b77f4ba33cba"; - sha256 = "1arywda3ai49x0wxbjkp4z7nfmqxfz3z5gcggwbwv6ddxkfd3ld5"; + rev = "8a59ed2dc9563833ee0277b5bfd2e06faf95c2ab"; + sha256 = "0bsigxpdflamw4sp5cx1g2kmxdg6hxv1knkn1d69idfadz0dfb82"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -547,12 +547,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-03-15"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fbae1bc1937ce69fa80b4b32d178ce666fd5c07c"; - sha256 = "0a1pfslirdi04ag8fawclmk97nrzifgmja6p2hjqp9a47ikn8br2"; + rev = "7dbd3c96ac1eb3a1981e740423a31500108f6e25"; + sha256 = "1z906gmwar9v3xwcx1r7ry0k9mvqcfg0vkg1v978qslcakcyqpzh"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -737,6 +737,18 @@ final: prev: meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; + auto-hlsearch-nvim = buildVimPluginFrom2Nix { + pname = "auto-hlsearch.nvim"; + version = "2023-03-04"; + src = fetchFromGitHub { + owner = "asiryk"; + repo = "auto-hlsearch.nvim"; + rev = "8f28246d53e9478717ca3b51c8112083fbebd7e3"; + sha256 = "1v6d15swvbxzq0rqx543bbpy64jm7w2vj6di8qad0a58s9v68aq2"; + }; + meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; + }; + auto-pairs = buildVimPluginFrom2Nix { pname = "auto-pairs"; version = "2019-02-27"; @@ -775,12 +787,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-02-28"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "8fb04cef34aff609fb84ab6dd753dc2d6babfad8"; - sha256 = "1bx5gxlsiav8ix8npc5vwm1lnhhvxvbri8qf2jwl0xc6f3p5dgx1"; + rev = "c4db42ffc0edbd244502be951c142df0c8a7e582"; + sha256 = "0kp3mkl3bl2l6ainfxs7snj78svqfhcxc7yflvfln8397y9b6647"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -835,12 +847,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-03-20"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "1c9d324c493650667ff621c835d552e56fd229ca"; - sha256 = "1kk1jjfz1dk0jqi2gq641qg0ymxcaw9ns0lyfgbrdk1qqrgrmiwq"; + rev = "a2334fb2c4c4abf3fa2ecc75300ff843ede8313d"; + sha256 = "1dymszzvfyxw1plpp14ikghlwxxnlkd6l0mh6ndzw2mj63kqh0i2"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1075,12 +1087,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-03-21"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "3d2020703c10385970032acda4f2efe0679458d1"; - sha256 = "09iakiv13q3gmyn21az5zz1jf34iw3n5hs2nr7zih956irkj2w03"; + rev = "64d73ca03b085b7ad2f8a1ea62cc9e853d8ce502"; + sha256 = "0ay4balgjphgk66971bixsrmdwkj4ymh88fxc8bnxyhmfmpcy04r"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1123,12 +1135,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "1e54101b36457baf33555380f1dac56db5d17e62"; - sha256 = "1vvd0c9mjiqpgd63b5vkkmnbg8a00yw8k02mk410r5hlzx1c3axx"; + rev = "425c8430771321b610ca068a7594668d7a7ea3d6"; + sha256 = "0si9cmpmh8jjiac3654v5avxyf9lsxdqmgv74h47blzwzn8dgrmn"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1639,12 +1651,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-10-28"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "b40178b780d547bcf131c684bc5fd41af17d05f2"; - sha256 = "076x4rfcvy81m28dpjaqcxrl3q9mhfz7qbwgkqsyndrasibsmlzr"; + rev = "c8e3a74b51597d69d240085a258636972ce98e15"; + sha256 = "0xb4bvh49z26cpi005q6ma0mv9mw49npcrayvd3c6pcdgr148p5p"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1963,12 +1975,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ddb8a72022139be35d02c747d5d009172c9d64ca"; - sha256 = "0z9ngh66g02ssxgh0403h9w1j9zmpamvap0lmy7gacy20w471g1i"; + rev = "235c4e709e7ed8f572fc2f3287a614e2d415a921"; + sha256 = "0rdjj2jfrn5yq9qbadi7vs8pc3lpp6542y0y3xczkphi1w6a8kqw"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2047,12 +2059,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2023-02-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "82cdd72049fc729854d69747be2673bc8ba8d97f"; - sha256 = "0qpc4fqjyq9kyb1rvwgp192v34fzmv5nacdsvc0pycyanbmh04hf"; + rev = "51936288d182a677fcb808e660081ad7e9ecd4ec"; + sha256 = "0j6amy2jc7jgxgsski4za5fhc4wgxh22lqz3k01ag40845gfndqb"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2095,48 +2107,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-03-18"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "db62371b6eac73954c194f3c8faee36cffee8135"; - sha256 = "02kn7j40421rs27dnyw14sa7wdbca81xqd52h4m03dr9jklpifl9"; + rev = "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4"; + sha256 = "0x78a8s20pf93aip87j9dhrjpm4330faz3lqlwk6x6qi6dmvdvyy"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-02-15"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b"; - sha256 = "0jzk1hd8kvh8bswdzbnbjn62r19l4j5klyni7gxbhsgbshfa3v87"; + rev = "b6e5624351ba735e25eb8864d7d22819aad00606"; + sha256 = "1dymnx2jraybrqi2yqa9ycbirw77gvcgfxl5gayi2828yhs543qh"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "5084d1e7304c34cbd507b026dc557ef772b7bf86"; - sha256 = "0rqd7nnl561h4d82mjg6z2pplgiak2k9624jdqqvjihf2k756xih"; + rev = "073ffdc8504c4b5ff98c099002fb58adaf2f782e"; + sha256 = "1hyw840jfkrcrzv86j9sr5625yyw8mxkb44v1hmcg12ydsllyghh"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "f464963331327cbf588548f62bd8ad77331a1c26"; - sha256 = "0s5z599dx6sy7jpc7ssr84qcbxz06ss1n2581x7app2l816zzhlq"; + rev = "6b52ae60235525d6a00fc091de4598ac88a63ecc"; + sha256 = "08r1zhmpjzifb89v56k8v2w0xxylai353b2d73lsz4i8x4bvipii"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2155,12 +2167,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "2dec8c79eaf60755b32cd29ac0a6ddbb8290ff6a"; - sha256 = "11ig2dv4vy601nrkxr7rjsh9dy5qcwcbilh5f5a8k76q0vaz4wi7"; + rev = "8847707462e5d89a0043e7846439e180b9dfb04f"; + sha256 = "1nhfg0vazpszydbgvdls49gvnpr0l0lqxphzz9p12177wirw2a83"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2299,12 +2311,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "cf924ac83fa218d30faf9fb47ac0b628b2706276"; - sha256 = "0lc876mwazx33vy4aq98k6gcrblc3kndg530gmc1lj89hlldsgvb"; + rev = "4c2b038c5cfa70f90506f1551e5fd2d040174e08"; + sha256 = "1c3nvgp1g4pycg7cswjr41d0bqp3p3yaibna59nn2125v729fpjp"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2673,12 +2685,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-26"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; - sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; + rev = "0fb00f58591e6d28a8e344984403b3e390df2458"; + sha256 = "0mmd4xc93hgqlm0pykp8vaxkqm86ih8qbzbazvd4a12yfrx6fzjv"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2963,12 +2975,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2023-02-17"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "688b4fec4517650e29c3e63cfbb6e498b3112ba1"; - sha256 = "16j8c13jyqr9f8lw8sxcvcv0p60qpa4apdcqcz3ll6r6pb1413vz"; + rev = "0ba1e16d07627532b6cae915cc992ecac249fb97"; + sha256 = "01rrjxlg4xjfs8la0cfcnf5z36s5fdxqzfs4mc0zdz1bn5z60qmf"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2987,12 +2999,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-03-17"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "12003d9727bc5074ccb405b3d80e691c72d4859b"; - sha256 = "1srjyh6d23m4ajxzh4l2qv0478ghblxn04kdqlbmbfgr6xksa0nx"; + rev = "d35d9e61a1ff4bb8b505ae80d3856b72b4ee7d71"; + sha256 = "1ai3cx556023j09h6bcib9vcib4drsmwcwg6gy7jnx56kffz3a8z"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3012,24 +3024,24 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "a5e0679035a154b2c3eab376c5e51141e07c6910"; - sha256 = "05q4hyd9dgs6937pc2knwhk6419420ivcrjj4937zfrs6dcc7z9q"; + rev = "cbea79fef62ecc3048d9a2af38cc96acbbe85e37"; + sha256 = "1853hmkncw9dzk72arw8m0v0fj14hqcix6bdkalvm16xxxvvwlag"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-03-04"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "4c1739137acd3e7f03e2065a7be8a4dc41c7e461"; - sha256 = "0bvbdfs9gnncrsca5azb82cd7h3va1v6j6xa2sjn580maqmyyv4z"; + rev = "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e"; + sha256 = "12s75i4y7yjby9bs6gfaxs9xwy6ahffccmac3snqllqm51q0ypd5"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3084,12 +3096,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-03-16"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "727df22e2ae72a0482e5eb923e3d1c861a157a94"; - sha256 = "06s4svb8r4d9xi10sk9wf0zqa1qmrafj749kfayw705fig2an9v0"; + rev = "4cf6321406fc937a7ecc894e9e1ec2591061f43b"; + sha256 = "093f4627iavr58c552symq0n86aj4yahbjkjkiyi1ll273910vll"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3120,12 +3132,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead"; - sha256 = "1j98blydm49bzla95w082qy2hd61yb0476zawflipa8awf7ja6ac"; + rev = "8d91ba2dc2421a54981115f61b914974f938fa77"; + sha256 = "0j45scar2frdk3a31lsc536z5vyzwanpg3nn89awp9idzhyviwys"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3228,12 +3240,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "79a74aebab4cd5fca460c61dc47e5e1d7a54b01e"; - sha256 = "077ckb2lwg5lfjvin7rf76qmik0vy0f2aczkp789wl8yrn6isca6"; + rev = "d49f79fbdaf5247ce694637555e8cd503f6fc05f"; + sha256 = "13bf3xvx0mnz1wjah9qr3sllwkcmppjza8byfxc5a8pcbfwkyhmx"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3324,12 +3336,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-02-24"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "1ad47c6454a5a53d3f4ffdd4022e84f4a6e376cb"; - sha256 = "07119ndsavmhi3km0jkdfk3xw6rhainxdp8vhgqrg54286aqj1d3"; + rev = "8cb8dc053b7b24eac457395e3c535fdbcd95e97e"; + sha256 = "1mxpg3w9b5qizc277j3cr1fbdfzaxxr43gqnl1mah9sdr07s5djq"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3408,12 +3420,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-02-20"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "bbded06ea23faad779297122e93b1c0dcdb2a770"; - sha256 = "0sirrb5s3g93a65ygc2s8g481vfgp205vyvsrghml5r93pddvzkc"; + rev = "eb450d62cec8e78dc6129c2d41a1b2ffd2caafed"; + sha256 = "0k3mmjls51pxdxglrc3s4gxnrjd98997xzj2xrrhb8pzmsbmyzzm"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3432,36 +3444,36 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-03-03"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "5a8ccfb1876b1b2e29ea32c63221be6df45870d1"; - sha256 = "0zgjwp7ijbgbg6m5m1nqkyxsvswkppp61ars4vrhlyd8zf2pd1bw"; + rev = "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215"; + sha256 = "1awml5n7g045kpn16g3qrn9yrx5j7rwzwvfyaqqxgmwhp1rkkwwh"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "c02634a8350d559eeed94f78c67016fa6d80a8bf"; - sha256 = "1bsc6zfrqxws2cqvf385wjjdhmxm2q15fg4hxf0hpkn9s6ipnkyy"; + rev = "636fe41c878ac828c193a9d056044dc10f9e7621"; + sha256 = "1za4pbadl1m21392y9iri4c81cai0wbywl6q9v09qdmvdpaz4l7x"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; godbolt-nvim = buildVimPluginFrom2Nix { pname = "godbolt.nvim"; - version = "2023-01-02"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "a55d794e9faebfc09896bff3e9efd1156527f300"; - sha256 = "0cfwm1acj3ahk7kcrjwz7fqm7dqr13bgzkzybpkm4gncfzz3srph"; + rev = "7e526ff6d04107161a732a6cba674d69bdc7e198"; + sha256 = "03l60x3mz3apma2hp7ls2vila19lfgdds9h3c4q35j4rb839mnfg"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -3576,12 +3588,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "488acf89979463d3ab77f8a5d35a11a2c809ac19"; - sha256 = "0m65ixwniz9vcnl8wz9gxqwdcf737m2jd4k3pgm7aphk7ks6b45m"; + rev = "2fc3ea0836aa91e50e5a98e232549a65de366d93"; + sha256 = "1zxg6q0w3i71lia3sm2n5kk56kcc56q05lcbv76y7i3wn7spwx9j"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3647,12 +3659,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-03-20"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "580587aac975b93d9d908f48f7c1df56fdef1c2d"; - sha256 = "1x8fy7ph6nbz84masqv5q5l61yq2w9hik6l90m35ig2r1jhkp2fx"; + rev = "d6efc37b999981e8744c63c551be039d6eceae50"; + sha256 = "1mmn47bk7lhaak2r68pzhhhsyjsd0y9lkprqq7l3jrdyj30iay0p"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3695,12 +3707,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-03-22"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "ab080c47581cdecb8a5b4ec79c5c19fecb5bcd2b"; - sha256 = "06r8naxqpc4ih8xdz03jckir06mgl12zr2h8f77dnclfwpl4jvq5"; + rev = "18394c46ff3c9fa52629dba358fa79244dc84ae3"; + sha256 = "1wb4lcwh69qg4dc6s21m8ab67yyfimcmgryp9r59j2izb4jblpw7"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4139,12 +4151,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "0133b85255d476afda403f3e9cd0310fe5af3f57"; - sha256 = "183vlqr0cx822xxhf0yca46lbjynagnnwrczfjaa30vjv1cr3344"; + rev = "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d"; + sha256 = "10mhniygcxidp8wgzd1chfcdwmhh84rqk7g1k2bz0jsjkc31hxlp"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4235,12 +4247,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "a80422f21750fcbf0e90b26da877d4024d76f116"; - sha256 = "0cjw2aakslmaipyqfxn7ghr35sshlhcymhvdhgpyypd8crxs3ip0"; + rev = "57cce98dfdb2f2dd05a0567d89811e6d0505e13b"; + sha256 = "10ayiikd4sxm61rm2689cgbk2byh48si9h5pz5dbz2rwm40k5kig"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4259,12 +4271,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-03-13"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "f87c54ded50ae46dcc4687f139a5debc1f977a7e"; - sha256 = "0iyi1hg2l6xsfngbxiwp8njzmqb8gdi4skyvqf3lg7vh4yy8f15k"; + rev = "157ca8a08ad13845cf67b440a595b55b25b9a459"; + sha256 = "1v6018a86la5rlfms0q02kq5pix233n1a9aispy08ws7aj4d45kj"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4307,12 +4319,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-03-20"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "ee9e14955c9aa280e08b5600f7eb53e7c2578cd7"; - sha256 = "1lh6nfwb1q4690qqn6vfjimw3qmq9fz7fa3vi3kk55q4sdy0rw0h"; + rev = "6b6eabf5c7e1937e7490714d3515dfe5bfce3bc2"; + sha256 = "1b89513w25gz7awflwhj2qhz0ypknz0h64s2fd6vyl1bg7fj2w55"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4643,12 +4655,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "56ce3384695a982efaa8f6c1995255671757182c"; - sha256 = "0jlm7fwc7rl5ayqf00ix6ynzxsmnrd3g68mhkxy4qyaf746wnpy8"; + rev = "416cc687ba7eedae1da36d8426ddd538c2ceb2f4"; + sha256 = "0aq0w6k02xyh6jffm9lwsns91p6ag211cv2vl0d2m99mw81ss8bh"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4750,12 +4762,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "025886915e7a1442019f467e0ae2847a7cf6bf1a"; - sha256 = "0wchv8a93xfyr3y22nvqcnqm5wis0j6vslcrbzzfyaza5adjvpmx"; + rev = "bc8ec05022743d3f08bda7a76c6bb5e9a9024581"; + sha256 = "1zc0amafr1g3gkrxn2mppda0qpb3444xpjldm94h05qh78qz2j70"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4775,12 +4787,12 @@ final: prev: lush-nvim = buildNeovimPluginFrom2Nix { pname = "lush.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a9eefbdc97d1b3f8f38d11700553d0fea2ad8f5b"; - sha256 = "1hawb671p66lfphmmksdagrpjrzri45wrmn1drc22bp9cib2vixy"; + rev = "e26df50e856e671ce79db99449e1b015d6608673"; + sha256 = "1y9r9b93d3xg8hnvdc1ymibl9x7cai2ddibxwmzsjaq7dv6zpilg"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4847,12 +4859,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-03-18"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "2b811031febe5f743e07305738181ff367e1e452"; - sha256 = "11b2rf3wb1mdkcsfkgikm8x2yryrdv659bh9yq8b2cic9g9p64a0"; + rev = "b64fdede85fd5e0b720ce722919e0a9b95ed6547"; + sha256 = "0an210nwcm0drgdgq6divxffsqhbxlv50ksnbip52j6avdj38vb4"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -4871,12 +4883,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9f4e06029b1d8cd3bb4438f6b3de6d5c42d2d8d1"; - sha256 = "115b00q3m7jsmh2nvn5hk4zd95mxwl2bddvcdxg4vjxhgn8z3yx5"; + rev = "fdf33558c4386516150748670fde10ea39a7d86f"; + sha256 = "006dq2h8llmsz2ik9i0n3zbwfpqp7g01nzql315a6pmg3cy20ka5"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4943,12 +4955,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-03-21"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9f8b92998a9964e03535c2c7e0708958e23e261a"; - sha256 = "1c1wywn7hpagcwdp2vnrrlf60vvqs9rl0p5g3m94jcrs6yihbqib"; + rev = "078279d4b154fb8990b6d1fc00bf162ec5015e29"; + sha256 = "1d8mhing8czkgq28dp7l9jl5ihhybiwiq7cs943h6qyjwyg6yy28"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5303,12 +5315,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f28a0c750a40ceec22eb97dd8111ef2203ff7cc1"; - sha256 = "02hkr0l2d61c9gbp24xdi9az1snim1qkkkbf4wz7qfzhr0p6b3z8"; + rev = "11388446753d800b8413d42bb770b401cddb7d62"; + sha256 = "0izn5af7ixbjb1sr4fsgnxma7gdxbiz7fqqwdlrsj587fmnsv6y5"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5327,12 +5339,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "e027abc6d2a9c1efead2f697da8df2c0ed66b8ff"; - sha256 = "1iw0l2g76wfd6j9jk6ixm0l5nq9kq4kd36hgj98a2ag87mjdgk4s"; + rev = "7330427f9f71ac5aaa2d1a4c22ccd3914434e289"; + sha256 = "03sa4dr28akq891f4pldlfxkwvwgvjxpy4sa9d9s76pkqijp4205"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5351,12 +5363,12 @@ final: prev: neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-02-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "93d997dbddfe084e77ba4541c54a7b8bfd754fb1"; - sha256 = "1yqmpgjrlqkqvmmk0ib8bwkcn8z78sm21yl6xlbq4pa219zwdm1z"; + rev = "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901"; + sha256 = "1plc0kb0pdyciwd4kwgcqqiqn4k0gzlp4p8s1578x1bjlf1cpwwk"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; @@ -5423,12 +5435,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-03-13"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "532548b9f444bd1ae6f2efd3edd842282cc79659"; - sha256 = "1c7i1bkzwh3swq702cl31pm2h8cwj6lh5bm8bwdaz64pz5pz9f61"; + rev = "01d8a9b2db38a28fd40851b894e9d146d279c892"; + sha256 = "1aq6vzkprmz5g2xdk2h6cnv8ncfshbkca7whl8s4n9pkqw1qm980"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5483,24 +5495,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-03-13"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "bbbfa55d850f1aaa6707ea85fb5230ac866459c6"; - sha256 = "1ymij3src1jdsx4zfjz0hgyqq5zp2rp17lqpl3dbabibwd4k9cnp"; + rev = "9f35041605ae0371fd94f669fe67eb5bd1574518"; + sha256 = "1i86pbv8r4v2siy3n8lhsh4sy47ybp5d486naqc99w22p0p9mkmi"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-03-22"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "9edce09399f144526857073f0fa1b17ffb2a5909"; - sha256 = "03g01j7znm1wra8yyqd6m5912npji2fp1mkzkq7acfyvsnysx4ii"; + rev = "c76cace9efbf431f17295ba56c91f890d55ac110"; + sha256 = "06ps407zim81wvlp9yidicp8gk64ym0nzwzcyqazbj1qb9zig8mi"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5591,12 +5603,12 @@ final: prev: netman-nvim = buildVimPluginFrom2Nix { pname = "netman.nvim"; - version = "2023-03-03"; + version = "2023-03-23"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "1ef50efcbe88f8293e97946af37243a20873bb1c"; - sha256 = "16vc6ly4l9b9xkwkwb2j7q21kg26c7drdz97hgkbdzwfb66w2651"; + rev = "0992ecede84db9591c59ee2131f39443f4a44f3c"; + sha256 = "0nmm6yp1q99f7c26h0ymwd237vv7b9652ffaffbm2ym4ahcmg8xr"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -5639,12 +5651,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9b6e3a470ac12fb2ce3de2162bb80bd0b47736f6"; - sha256 = "1l1qfj8pbw1icd4795ly0m1iyam80m5pr0ixg0hw0v4vga2vjvg3"; + rev = "4b73c9d0995eb1a43e284534b97a543ca21c5c77"; + sha256 = "0ndriv1ka82n8j9969h54c7zqpjzax6r52iqfvz282wmnch5kxhl"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5675,12 +5687,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-03-23"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bfd61997f62b52aa9fe5ec59590956d1bb7fe605"; - sha256 = "13h1vk99rdzsibfzpw96pc2k3zlrih5q6ggw813b7sbfdca82lkw"; + rev = "4bd36c153bc08bb959a6bcb2d091843c807db6b6"; + sha256 = "0c0dcgrrn29bjnm89di3v3ksvvxnhaa8kydcqxpckn03v1pyxp8a"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5711,36 +5723,36 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "d9be19ad02edb98fc7f47f407415bf1285c43811"; - sha256 = "06vanvv99x5kk9rx3gljaa58hak2chsz6rbi758igp04mwpkabjg"; + rev = "33db10e593edc7d720c0f5c0320899bd1dd014e1"; + sha256 = "1c7izqhr8x9rhwij9g6nqs1lvhnga6mpf1mfcpiid96s2ygvrbk2"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "f8b1a72a7bce56d9e9ed054708dc855d57dec085"; - sha256 = "1dci8aqlny9saq8w1rjwpdknz3cpk4rqmiijdav26djdb85ghwb1"; + rev = "1da4edfba3e9278e98fc9723d7235d9ab3889744"; + sha256 = "18y314k7da239w05rkxz6nqjljjx24mx9kx5020bkkx80q1z57yk"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2023-03-12"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "be318c83a233cb877ba08faa15380a54241272b1"; - sha256 = "1wk40p9sh6i7gljixnrx57ik8fw57dh8kzmf53kqigafxayzj0sa"; + rev = "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f"; + sha256 = "01zbahh1q332lcksd7dmkw109i7x5xan9w9z3n13bwwpn01knf6h"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5783,12 +5795,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-03-23"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "0180603b6f3cee40f83c6fc226b9ac5f85e691c4"; - sha256 = "1min0civzm1d6pfi5ixh1g66wvbfd38y65m9n4jb5l3grfa8ysci"; + rev = "01e035ac1c0ba1cc7a688110e3a9f939cab1f454"; + sha256 = "0yhzb4adwcrnyx4f1x8aciy88bvi75gr8yf0x0rw5blbj6vgcpzk"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5843,12 +5855,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-03-07"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "e755f366721bc9e189ddecd39554559045ac0a18"; - sha256 = "07r9h19q3800r93ac4qawyl745mppp3035j9xffmx2igj5zvjmk5"; + rev = "0fd6519d44eac3a6736aafdb3fe9da916c3701d4"; + sha256 = "0ds77blb357mamxsjhhp8cj6mrnpvzmk3p0w1cy3wdikmbng940v"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5867,12 +5879,12 @@ final: prev: nvim-biscuits = buildVimPluginFrom2Nix { pname = "nvim-biscuits"; - version = "2023-01-09"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "25a880605fa4533b7075c54a0fdb5f0a25bc4f84"; - sha256 = "12lij0yv3n596yp2jbrdh17awrgvsm8gfyrafgvdzj4jibn16c68"; + rev = "0224be36b60588e88b21b8244a0bcd069699720e"; + sha256 = "1pw7ad9x4jn1ciam72bdc2087mrmxwr4przivfpkhjj6vjgfpn1v"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; @@ -5939,12 +5951,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-03-22"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "29ff4654b106ca08cdb649120d8f296fb00723f4"; - sha256 = "02kbvp689m8fbhhf759zngg2wyy2awws55hp905nzq4vzk8sxp82"; + rev = "28b9ed6ef2afe8632557953be920543403965546"; + sha256 = "1vcbj8wvil4sfnkmgi8h4mq6zb9034431673xn1jp72n9nvjc8kn"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6023,12 +6035,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-03-18"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "7e81998e31277c7a33b6c34423640900c5c2c776"; - sha256 = "0alv7kcdrvr82awh834yy7nxf7dnfwqhmpi6q23b32h76h5gm740"; + rev = "7389e85233e3483b31b6a1c4ba69cda77336b7a8"; + sha256 = "09jfi1phzq9pak10hyvxkgrq6vq1ly1zdblpy5l173fj9n2qxwip"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6047,24 +6059,24 @@ final: prev: nvim-dap-python = buildVimPluginFrom2Nix { pname = "nvim-dap-python"; - version = "2023-02-17"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "65ccab83fb3d0b29ead6c765c1c52a1ed49592e8"; - sha256 = "1ald7spnfqbyiqz4kgp21wxwqm3zr53d4ajxls0rsy6mkqq6b2jl"; + rev = "af5e04c6eae97498258f84c61e1b22be6660763b"; + sha256 = "0wvmsv3ivjy8q0ym4yd6jwqajf5mzr5czp9iin11sk2lfk554y1m"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-02-23"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "bdb94e3853d11b5ce98ec182e5a3719d5c0ef6fd"; - sha256 = "1l45dcmirnyryy5qkf007bzmb35nvyhqn56myfz47h835w0qhn44"; + rev = "56a2df0e96bfa64ebd6967e7cad877a1530633d5"; + sha256 = "0grh6227yhy0sp8rvgr6p1wlb6jimwqaqhdlc5lxbcqi9h46lrvb"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6143,24 +6155,24 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2023-03-07"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "ce11467796389a4e5838c22384f94c624121796b"; - sha256 = "1pyhjazxl1ijg1m8gvaw92lslh61052yk12plnqyl8mlla3a9zb2"; + rev = "14670d94c7813bfe929ed2ca2d3875f4f468173e"; + sha256 = "0igiam19m1kw9ir41zkpfq78n67yypwvmmw2j3p04qnbwj0x3nxb"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-03-20"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "26a272937f1f3ff5c38d67662c5d7cc76148a4a5"; - sha256 = "07w1bygcs3myfarp2zpm21clyc0abmrglpwqkdj0z4azd4wa1cqz"; + rev = "8aa4a21c04eaacf4c3a37588f45e673613e061da"; + sha256 = "011f8miv3glz4rx67ha525c17y8r49lb8v6hg31znzjczrb6rkhg"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6275,12 +6287,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c6105c449683b944b5d2138fcf82f18c657249e9"; - sha256 = "08rkj9yfygkn7map3wgg0ggvh3i8yb5kpqid1q3a02c810xppn7w"; + rev = "c5505c70571b094663745167d40388edd40f6450"; + sha256 = "1nmnd1gbawa67n27sgbgipaiaxy8dqsgdk6vzc6wpjs4sgx32fd8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6347,12 +6359,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "ca34afcd15c7f6dd0836fc4fca2e37024bfa5019"; - sha256 = "05nlb1880zaghcags6b751h89k9x3aw7hiapvigip877lpch0nfs"; + rev = "35731604fb5adab5fe939975879d22994aa8b575"; + sha256 = "0lz8w2870b3p3m6dixzxlnj2z1z0xia44hbgf5gdq8rld53i44y2"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6491,24 +6503,24 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-03-20"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "2d7d23c1122bb2589880236e932d373933b07937"; - sha256 = "0wjnq69ygnsqn1nh31gy4rqv3k9mxk787aknai5w47iclq0rdjhb"; + rev = "8fd64743b6390ab151a607fa91d0d74087a80ba6"; + sha256 = "0hygvazda2kxrrnw9f0xf6mvnkigfzf57n5m7kbbgf6kpf65w7y5"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2023-03-21"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "056f69ed494198ff6ea0070cfc66997cfe0a6c8b"; - sha256 = "0nkfb13jrhczw2y3wd5qr183l50wy8jk0chkiw66x4388gqnz9lm"; + rev = "50f667861fac75592fc9e482472c12672e1cd723"; + sha256 = "0gaamghwl1z9b4rszfcahr75s3namw15ycwdhg0vz6nxxlb253k0"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6539,40 +6551,52 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "aa9971768a08caa4f10f94ab84e48d2ceb30b1c0"; - sha256 = "1yq7a1baf85vhzycnys13jl3chhlixfa5gcqm97pzh3rz5y6g8ys"; + rev = "45400cd7e02027937cd5e49845545e606ecf5a1f"; + sha256 = "069618ckwyxdhg6w6iw3p3axlpizv2zia7q0p4y7sraw1w3n9vpm"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-22"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "87cf2abeb6077ac19a1249d0b06f223aa398a0a0"; - sha256 = "1zq55kfjaf3gsm3l4xv210fzzidg2bk6r6bk551y7jgvf6j6fapm"; + rev = "9850baa958d6a1edd6586d77e354d89249f97a88"; + sha256 = "0rryx8xavm89jmjr2j31kqm58bdcx38ls9j37j5ikmv43zgzr1cp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-03-20"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "88d1627285f7477883516ef60521601862dae7a1"; - sha256 = "1kdda1jsa9zxbz6bgjxlzbx97f0dqxvl9k8lkcg5wx2nsmdyn4i0"; + rev = "fc7db280562455590c4592499542d6d5061dbe4b"; + sha256 = "1ig8ii9mzb002l7qy56acvchhwdqcjd4x1rqqv79glj2b6zc24c8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; + nvim-treesitter-endwise = buildVimPluginFrom2Nix { + pname = "nvim-treesitter-endwise"; + version = "2022-09-26"; + src = fetchFromGitHub { + owner = "RRethy"; + repo = "nvim-treesitter-endwise"; + rev = "0cf4601c330cf724769a2394df555a57d5fd3f34"; + sha256 = "12psl12ggmw23b7z9ph6360sc4qprvn3f5m4ikl1mhp50bg3wyry"; + }; + meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; + }; + nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; version = "2023-03-15"; @@ -6599,12 +6623,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-03-19"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a"; - sha256 = "11dm8vyxsy1b7c93f8gx5n6x4qf86b821myqaa09k1g761skrsvz"; + rev = "b55fe6175f0001347a433c9df358c8cbf8a4e90f"; + sha256 = "1kip55hxkg6lgbqj37hx5fsph5j4c69r7n6c7ypqynhn7qg6flqx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6647,11 +6671,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-19"; + version = "2023-03-27"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "742049ef6716f59c7202644a026d8dc09fc60c52"; - sha256 = "1d5p5w3vsz9pajdz4j2wmfv5nkv4bdhp084h5lhh58z0vcj62z1m"; + rev = "51d835d411df45b14b9531789eff0c590cabf018"; + sha256 = "0c8cy8bcmbn7lrr7ld9l5iss4k6hccn4m1mp25zx3blmwz0xi01d"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -6670,12 +6694,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-03-21"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "95b1e300699be8eb6b5be1758a9d4d69fe93cc7f"; - sha256 = "1hzmp6vfz4kfj7rid2br1gi438wsy435dy76n5fqqqsw67l86iza"; + rev = "267af2d57e0f251d65b95bdfd1f382211b272417"; + sha256 = "1lmd723v78jyrx3ibfllc45ykripzdvlc664fi9pd3r5gkl2xx9a"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6766,12 +6790,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-03-20"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "4b05ebdf202bf61ce240f40558822fe5564d02ea"; - sha256 = "0caafnxg0apz14fj4ppv8pba2633dlv9fa8bzfqznsavx3w1xwhj"; + rev = "931453fc09085c09537295c991c66637869e97e1"; + sha256 = "0fjsckcbrqvz1g1cnixyjn6idwd0g7bjp75k0mnn7vx13kiflchb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6827,12 +6851,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-03-17"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "a43138792c23e3f56399666049dd57afb61706ae"; - sha256 = "1zi2bbnp3zjvfral8wwq79c7syr5jlmkcrkf715kxs4h0zbmpb6m"; + rev = "6f9dcb258537d077f6037d3b7a55f6b36f15b1ec"; + sha256 = "1b28zw48yfv6541lf9zrb8n8rfsn3dcwglwbcjbk6w3bl0h9739l"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6899,12 +6923,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-03-17"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "1323b7c20b2fb4d70fd1cd5f85fa5d0fa7ae30e9"; - sha256 = "15vvmn8ypwbkdh9cl5vwpqck2f5dqslya9sm8ywpd6kxkn64740b"; + rev = "aa084b56b6a4898fda11e6e39ccc6636e213f2e2"; + sha256 = "1z5xip6d0kzvdp99kih77w78qc0hrr4gx1if751pdzdysy63sdfj"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6923,12 +6947,12 @@ final: prev: package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-11-17"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "54337910c67946ffb8a2845a4e547dba925e0f37"; - sha256 = "0j75j32a8y1a7nmcn26zakv5mcylzggcic7v0ih88zsqaikl9hj3"; + rev = "4d98c8cc90d970d87c472c04bf7ca712336cc753"; + sha256 = "1wk9s1240f3vlyxi0xy97vkp3xz3r27582knav3zd6wrhqhih25r"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -7657,12 +7681,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-03-20"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "8432c5fb3934aff8f3b466c009cd9e7bb1bf771a"; - sha256 = "09r3brjb0dn46yfsjgiwbaqzdgq43isna4bphwkpg1mfxd3mgm52"; + rev = "2748c52e9bef39702941d3171670810e9d2dcace"; + sha256 = "15nxm9yni6g5l7a16z9yc590q159dw8y48jqnaszgbv9hp7w01sp"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -7718,24 +7742,24 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2023-02-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "48f21d04dc7f9732d04ffec101dfcf17b7f515cb"; - sha256 = "01dkvxkh3xpv45cbc4sylw5a1dsipd3841x88cc32nrarafsmgfn"; + rev = "1a7028ff1eac9c043936659324d644d60353bdfa"; + sha256 = "0lfcngn50xz4vxs3sw175fjrwdvacghfhm9qr9x8rn24cflc6afi"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-03-02"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "52b521618511b3a874255c8a717ace7155fd5f21"; - sha256 = "1nhyrwwf05q9dvc8r4dwpcb8ira1rz2wicnq260splh9hv1wqly3"; + rev = "3d4239b83fe8e68af4193e584094fbe633f30636"; + sha256 = "0zil0ydcy2x2wn9w2wr1mqasrss21qh7k5vdiap9z71x61mz7llq"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -7971,12 +7995,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2023-02-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "97a9e1e319eec2d7e9731be4c6ac9638a1a2d79d"; - sha256 = "1fzrp7jdlgw5f27m3jwvsq0knaf5zlhh5b72if493xaajibil0bx"; + rev = "a30674d07b220304ed81f1f46a8f1de36ce74c38"; + sha256 = "1z0kwd335pad6np8kr2njyrh2m97f1n6mh2pabl7axhcisvhvhrd"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -8357,12 +8381,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-03-22"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "24389d847f931e3822c5babdd308d20e2e8c638f"; - sha256 = "1dgd1ipmi17wjpslv7ilqjjjfg9sw2s4ig15simh92h3ipr3bpv3"; + rev = "6d90c93eb2907ee99a0cea10c03642465d2e1ec5"; + sha256 = "09b5fribhmqcxasvnc4gssw4li8px1wpljkzx2kscdyrgjp3raqq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8526,12 +8550,12 @@ final: prev: telescope-undo-nvim = buildVimPluginFrom2Nix { pname = "telescope-undo.nvim"; - version = "2023-02-16"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "03ff45fab0c4adad4d252e25b5b194e22caf5b4f"; - sha256 = "1mik7qwz16bgbfpr5lcsrgkrjwifk1zanzmsdbj416kxhsz90fx7"; + rev = "231b5ebb4328d2768c830c9a8d1b9c696116848d"; + sha256 = "1qvn1yamhv6gvbxgmin1yi3rqnmx1611gslrddhsfjkzc246pyzz"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -8682,12 +8706,12 @@ final: prev: text-case-nvim = buildVimPluginFrom2Nix { pname = "text-case.nvim"; - version = "2022-10-08"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "2cbe6b6653b46d2ec23bb2ba808b5c1fc78e9382"; - sha256 = "1fwrvsl4rdsrljb8y6g4zpv5vvlz8hxakcyz6f7zr4xxnr5rlb3c"; + rev = "43e85e883da911685ac329234b8f1298b75ab8fe"; + sha256 = "0f52ksvlll6wzqw1lvd6raqxqhngbzi1ncbkj4kjif2yidgg3fyx"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -8778,12 +8802,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "14e2cd9a6e5e67483a03660f08471ca9a981c4a5"; - sha256 = "1mk0adblrfjhhrngc3zvrp2f348cdvj4nx7mmpjv8vq7vpvr5b4h"; + rev = "0874bda6848ff6f3da3ffdf4bd8297a5c951c5d4"; + sha256 = "101lqk11s8kkcfwcrzaanab1qpbbl1q7rbnbz04y2h444zlxkfv3"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8815,12 +8839,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-03-16"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "9a595ba699837c4333c4296634feed320f084df2"; - sha256 = "154qnxarrmylnyclw4kyapi6hc98rfjymajf0a8i2ars9qkwnqzi"; + rev = "ed6c92d6708e5208360347f2281de99602061dc8"; + sha256 = "0pqh3c4w14299zhrh1zwvfgapyi86xjc0ppq5bl1c85h3pif50v3"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8863,12 +8887,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-03-16"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "90248883bdb2d559ff4ba7f0148eb0145d3f0908"; - sha256 = "0nmh68wl10xy4ckma66657p37firg30747bxhnyw2r36mx3i1vps"; + rev = "29aac56d24bf9870f2ea337817c5542b56e21f16"; + sha256 = "11b8inbldx2cnpwhr4ag4y736q40nm3k0ff4grsndyi7h8yb4c8b"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8899,12 +8923,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "7915277a259fdff5d46c6f1d2e100df2ec384d3b"; - sha256 = "10ssqf1pn9375br9lp2c3kgax3i0207vhs8wdpdwps3v0b0cj0vx"; + rev = "2ae7237c2917d661f458443c9a88680f8ca2d7b2"; + sha256 = "086w4yk5vnm03q1rkxjg0n6pg8hq5abzbz8g3ynds558q9yg03xv"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9007,12 +9031,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-03-21"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "437864dcde91e29b186bed09c72944019dddf10d"; - sha256 = "1hxxan9g035xm6rh6rz9wxrxqfy8qfwp95mi179fxi71xbj2j77m"; + rev = "338bcda8812266d428d9801ee5ef71a58d1c73fc"; + sha256 = "1yr6765bi8kbdnxbsl4mazmcaqzf224fxm9irmphdpkvjv8z9shq"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9103,12 +9127,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-03-19"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "f6a419ac6db364fd2856803ccfbf0dbfcaba4581"; - sha256 = "00w6ns8k0w0gn9sp1n8hgwgaym577p4ak4v4qxh845kp8mb4fd4h"; + rev = "6609328f120b69f6275e37a055c3634311faf4f8"; + sha256 = "0z6hslfbgshbgl6vg6v1wm4f6jgmy88si6abqjaar7dl2r12h3w3"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -9187,12 +9211,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-02-25"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "880a562ff9176773897930b5a26a496f68e5a985"; - sha256 = "0id4l89cbwkfkhxj90n8mc6vmqkgig5w21l3brvvfzc8hsrs15a6"; + rev = "7a05efb84e6068a0b0801d736b58fc645e5cdfd2"; + sha256 = "1641c2hs3m9f0hpsibnzxcjk7fg8f4dcpahdvqbyv12h3xbbbkq3"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9895,12 +9919,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2023-02-08"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "080b38a0fd14d14e21cf85fc26b18415303c3c5e"; - sha256 = "10734wy3j3ffkrc5ifm04kh4vk0axpl1isxdryak1ai90wxr3xhz"; + rev = "7bf26b5432ca93309d08037b27fa9459e64a460c"; + sha256 = "0izvr4x6lx05p97xk03bhmnjna1nhy4vbx18x5z05a96idwh0lpi"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -10495,12 +10519,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2023-01-06"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "614622790b9dbe2d5a47b435b01accddf17be3e6"; - sha256 = "1v9xk5gapbl8s5lb5j3kc87a865hidj2cx164kvw80rjbwx4knnq"; + rev = "f2be859ea48a761fd25a07efa037514f84abdf30"; + sha256 = "16rl00c3w7gsjqdk7irgd6cfvf75ws2ni4cnnr8c1bbadxiy1a34"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -10627,12 +10651,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "309c68117eca3a95349093012e5886a184c1812d"; - sha256 = "1inslzavlygwx5s5nzqnw663y36d9wszi4lfaz16b3jf60xx1907"; + rev = "9acbad1335ee6f30a8497733dcb2373c4550c8a2"; + sha256 = "0s5cvglw2yalp3bqakn02j3fs1vgb90pd4269663ah8yvv4kkgr2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -10699,12 +10723,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2022-06-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "5143bea9ed17bc32163dbe3ca706344d79507b9d"; - sha256 = "02vk8lgl6zswg6bdg1qy4qrh47bwflil601z8i33yjx5q2qrq0ra"; + rev = "105fd5559bd9df3f1204ecdcac2a587614e1a4be"; + sha256 = "1bgczw9i0p76cabkdfb1x11kmq59qaih1nz3q9hmqjd3964x92q0"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -10771,12 +10795,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-03-05"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "23cc4bca2f586c8c2f7d2cb78bbbfec4b7361763"; - sha256 = "0hi17i24wrcj0lbs8c7p8m92bzhxp4f531c0612z5iqjxadsi66v"; + rev = "e8e175ec6e47b31111dbfb0169537fda26346fe2"; + sha256 = "0civa2wcqagzzhb889yzjjmz89axq3c7ih4v2w0dswj3jh6gpn0y"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11493,12 +11517,12 @@ final: prev: vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2022-04-30"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "39ec72353c2170db2caf797072800c513647e9c5"; - sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx"; + rev = "6e098b385f91ec0893449130eda2a96c89e369a1"; + sha256 = "0i7xnf5n67mr2d45ap1y157jmj11rxc2qdpxk0qy2nahfgac7669"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -11614,12 +11638,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-03-16"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "f69d1ac5bd3c4e6ad349f64317000cc9a4a895cf"; - sha256 = "10i9h942c9inmd2wcd3y7mmb8yn1bwc9dg5swrfl1iif6k4cmj34"; + rev = "156367e4cbd123bc9a70eeabeaa16f7cf9239e12"; + sha256 = "19jh4s9fv40q9vy1lykh0zv5qv225zs48wgskd7b0xq0gh2c9vcz"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -12526,12 +12550,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2022-07-27"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "cad60fe382f3f501bbb28e113dfe8c0de6e77c75"; - sha256 = "1c456ypxgjnmbprjl79kvg5vm26nws0csw8fbs6gmdr21m3x1p4w"; + rev = "ee69335de176d9325267b0fd2597a22901d927b1"; + sha256 = "1s60dcvwqyc1mm0ck2hnihq3lk0ymklhhnlpcybnj1fdphq90dzk"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -12658,12 +12682,12 @@ final: prev: vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2023-03-18"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "624c7549a5dfccef2030acc545198d102e4be1c0"; - sha256 = "1a8in8phb6spvvpd5hmyjf0q18b4jwf5wlb72p3y6yvwa87k24rq"; + rev = "3e878abfd6ddc6fb5dba48b41f2b72c3a2f8249f"; + sha256 = "10jyd0nlzmp8grmvdf15jlr29aim2w29c6yqpzs6753zsj6x9mn1"; }; meta.homepage = "https://github.com/tpope/vim-sensible/"; }; @@ -12996,12 +13020,12 @@ final: prev: pname = "vim-substrata"; version = "2021-03-23"; src = fetchFromGitHub { - owner = "arzg"; + owner = "lunacookies"; repo = "vim-substrata"; rev = "f7b71f31d2ffa91715964b14b41ad4009d4d97f6"; sha256 = "1cpmyr63xjx5nm5h619xwryjaljq1kdf3msdrdr082ljci2830z2"; }; - meta.homepage = "https://github.com/arzg/vim-substrata/"; + meta.homepage = "https://github.com/lunacookies/vim-substrata/"; }; vim-subversive = buildVimPluginFrom2Nix { @@ -13127,12 +13151,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-03-22"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "3995a9419dbea1d93ab916bc8f53ee9f19435223"; - sha256 = "00m4gvk2wk1jx72wf6mdhnrzwmppraykk4ha4pxb3l3p853idgng"; + rev = "739024ba3264cf153d54ab8da5cdaaa978f7628c"; + sha256 = "1549qrgpyi87rmm14n182zns8kgvfk2yg5cl8sz7vvnzyh3s2gvz"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -13307,12 +13331,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-03-17"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "bde36fce7165f6b414afab6a0723133730f0f27d"; - sha256 = "1w473xm8a6qfmpwy2cmw9mivpsa5mjw2hz3696ym29n6hkgxbmb0"; + rev = "77bd3e8ec5688cf3d03eb77e34e312913e206b5d"; + sha256 = "0arg3ipfh248cdq1g4kba6nr7cp8fhz6j7pwrb555l8jggabg6a3"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13860,12 +13884,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-03-23"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5a6e46e2b8a96e79d5cab98e50a9b9109715d940"; - sha256 = "0ah361mg1qlpkx6vwaj7x8a2ja717njinq2ax4fhcr8z34h4q0ra"; + rev = "1043b590d98fa3f069a0879c65293aa2c7c31b0d"; + sha256 = "1wa01bmjlyry68rlk2f77g2b39jqydm3w9yic09g4f7qzxayy5kl"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13968,12 +13992,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-03-21"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "87b1459b3e0be0340da2183fc4ec8a00b2960678"; - sha256 = "0y1jypz17rap62hrbqm6207rjmv3gcj8i7c6na0jfd34nh82pmi0"; + rev = "4b73390eec680b4c061ea175eb32c0ff3412271d"; + sha256 = "0c8f765hm0j9k5j3xcnmmzrj3ajrc9v3gw94rc6sil5p0va997a7"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -14112,12 +14136,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2022-08-26"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4bf3879055847e675335f1c3050bd2dd11700c7e"; - sha256 = "1i7iavcqxrn6khrx3nqqf2d0q1b7hggjz86s53yjs69xn31bqsxa"; + rev = "1be1f3afc06108d210a7725217f9a1e50f93808f"; + sha256 = "089yfiz3k8gbsamydaihvzh1sy3vajklvm74853xyrfy3y21nw4h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -14245,12 +14269,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "eb4e73bfc5c364e86f08fbc8680e975a56638b1b"; - sha256 = "1xf22v477v073hppsw40iik6rx6354n7zmir6wp2yy41hkl6mlvf"; + rev = "73587f9c454da81679202f1668c30fea6cdafd5e"; + sha256 = "0775rqp1367rivqxilpqmrjh5k900j3idid2lg7h5h2q4h8yicaj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14269,12 +14293,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-03-19"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "773fb772e43b10d407133079e5ef2c69bda3ed8b"; - sha256 = "08vyzhwxqg10qw7w8qfp5n6dznd3zn0c01n5yx7nw8863acilm4d"; + rev = "38a86b349902b7afd0589200b98a7459b32d6c1a"; + sha256 = "0jcsqm0q7qpqraf7rh5hlwi5fp5yxkslz3qhk434q6qvjibs00xz"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -14317,12 +14341,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-03-22"; + version = "2023-03-29"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "04617d1f5b1cfbdd2a99d9765ef04fc6ae415622"; - sha256 = "1jgf7sm0755a1vcbfm1wxmkv6alrbpyfzrrfbi3100hh4c9khxg6"; + rev = "abb0e427ffd70cb5b240f17d996b7c84cd55d001"; + sha256 = "09k9h4s0j5nizp2v9a44mayp515h1vqpy6iglyjvfmw5f46fkjxm"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 52fb227ae5..3708d32549 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=257efff"; + version = "0.0.0+rev=833b53d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "257efffa387da3283a37816b71dedfecf4af5222"; - hash = "sha256-Yc3oFzOMyQwW2URyEzSIe6wBNAu9J2vPFIXk43sVUv8="; + rev = "833b53df97143bc46e014608dee9f64f78d7473c"; + hash = "sha256-M3mAZ5CORunUEIxy4+yQ8qTSbpmEgEmHgTB98niTbXo="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -49,12 +49,12 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=e559793"; + version = "0.0.0+rev=b8e81f6"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; - hash = "sha256-qLY8lpeP0jKqhNxoSLwBTOfulK79/0KOjgq/rKWUBSA="; + rev = "b8e81f62109e65adca1ab51ab9d414411db5a37f"; + hash = "sha256-3fCaV/MxqOP9g6Ma/eTAerKL+HVweDjihgeUR6h4wY0="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; @@ -236,12 +236,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=03fa93d"; + version = "0.0.0+rev=0b6d0eb"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "03fa93db133d6048a77d4de154a7b17ea8b9d076"; - hash = "sha256-0KYGEgAWmKFialuCy2zTfadDYezaftRRWjnr7sua9/c="; + rev = "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74"; + hash = "sha256-rsxRiZCrsEB/ixAP4YmxFtnCoDQrLAp75c74DFR0/nk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -258,12 +258,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=91c3ca3"; + version = "0.0.0+rev=967e7d7"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "91c3ca3e42326e0f7b83c82765940bbf7f91c847"; - hash = "sha256-0jDO8Wkqkn9ol4mfga/h/9yMMWkMF9Z/33rTxB8n1dg="; + rev = "967e7d74a1a04a680674199e12141963a8dd6336"; + hash = "sha256-3rkmxnf1YzshBUEOXBXj9Zpg9IHh2uS0QzdncOU99IQ="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -436,12 +436,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=9fe5cdf"; + version = "0.0.0+rev=abf5794"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "9fe5cdfab0f0d753112e9949a3501f64b75a3d92"; - hash = "sha256-nJikCiksuOAEXEvX2eQ2jZoVmzPQLJ36l4mk0irPW3c="; + rev = "abf5794511a912059b8234ea7e70d60b55df8805"; + hash = "sha256-38Q2HB5Hj7qdNwMyyXt1eNTqYHefkfC9teJM6PRE22A="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -456,6 +456,17 @@ }; meta.homepage = "https://github.com/travonted/tree-sitter-fennel"; }; + firrtl = buildGrammar { + language = "firrtl"; + version = "0.0.0+rev=58e9655"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-firrtl"; + rev = "58e9655caa6b6d0ef8dc0e6bd3d8e060beb6b40d"; + hash = "sha256-yvfB5xFBeBP8iFXpeKeD86kCVdu/hxAEw7lQ7ghuKGY="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl"; + }; fish = buildGrammar { language = "fish"; version = "0.0.0+rev=f917690"; @@ -601,12 +612,12 @@ }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=bc1c685"; + version = "0.0.0+rev=16c3786"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "bc1c685aa6a7caf9e58c5746ab386a1e673eb9af"; - hash = "sha256-CDXyynCsnmOvOs1rs9e29tNHosywTvGM0UyWVtwMqZ8="; + rev = "16c3786e1a2c87a236c823d1a8859574778a3436"; + hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; @@ -711,12 +722,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=fb3c19e"; + version = "0.0.0+rev=98fc7f5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "fb3c19e8e307acaf9336ab88330fd386ce731638"; - hash = "sha256-2nXKC7rQYbY2Sr0GVYETR83KYza1HKqpmjFkkgP80rI="; + rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087"; + hash = "sha256-BDvzmFIGABtkWEUbi74o3vPLsiwNWsQDNura867vYpU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -744,12 +755,12 @@ }; help = buildGrammar { language = "help"; - version = "0.0.0+rev=8f75ef3"; + version = "0.0.0+rev=c4e23d2"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "8f75ef3ec86bc315d5fdb939899b397289389181"; - hash = "sha256-zzD899bOSVn0/RCki6i8wHEQgaIrCurRw4AxnN3J+VA="; + rev = "c4e23d265f022dcd51053c40d47cd06e7756a347"; + hash = "sha256-D6ML/6fixz2suB7TmoOb4B4nZaj+B7wluug/m/MZ7Oc="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -766,12 +777,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=306d485"; + version = "0.0.0+rev=fce5ea2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "306d48516a6b3dbb18a184692e8edffa8403018f"; - hash = "sha256-PvraHZYbTF3FFIQoooRr1Lx4ZrBLzzxWd5YoqibBQfM="; + rev = "fce5ea2e842404ce1af13fffdcf0daa02240c3dd"; + hash = "sha256-7/HJPPLUwwnxgmNP0Vzm+nTJ1YfnUYbqMcOEZZj5uRA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -942,12 +953,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=e463703"; + version = "0.0.0+rev=826ef28"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; - hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; + rev = "826ef28d605d0925a86a99022cd222c96f2d0952"; + hash = "sha256-7fDwzt9BXs1h+2D9APAG/ruA81ZyAL4LOElXLdz8wyE="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1008,12 +1019,12 @@ }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=40a67ee"; + version = "0.0.0+rev=5c9572f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "40a67ee798eb3c989fffde0277ff6de740ebaf34"; - hash = "sha256-vhiUaZms4Je/TBTTepQiuddl0sKodrHcrBCauBPgu7Y="; + rev = "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e"; + hash = "sha256-90FXGhzTpPVVBPpAdAvfqdIOVCPKTUtRC0WWQyCR0Eg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1245,12 +1256,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=ff1f0ac"; + version = "0.0.0+rev=3d3a95e"; src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; - rev = "ff1f0ac0f1c678a23f68d0140e75a0da8e11b7b5"; - hash = "sha256-RFSDtd8iJJEX7dawMzaGwJUB4t/nr11hmG2EdTp11s4="; + rev = "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e"; + hash = "sha256-YM4lxdcvkX2l4KkdktDSoNXaN2zCqAS4W0mXMh8GJOs="; }; meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl"; }; @@ -1309,6 +1320,17 @@ }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; + pony = buildGrammar { + language = "pony"; + version = "0.0.0+rev=af8a2d4"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-pony"; + rev = "af8a2d40ed813d818380e7798f16732f34d95bf6"; + hash = "sha256-fgPnDU58qfZfRmBA2hBQt23TjJqiU6XobBYzRD7ZFz0="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; + }; prisma = buildGrammar { language = "prisma"; version = "0.0.0+rev=eca2596"; @@ -1674,12 +1696,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=4cf4bb6"; + version = "0.0.0+rev=8c8412a"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "4cf4bb67c27f5c5a75f634fe941c588660e69ab3"; - hash = "sha256-dRXkUFaWMkFe0qWtNs3fkhct1+JLIbF/Z0VQdR0bjV4="; + rev = "8c8412a54d97d6f96a4bf4ecb76cba4808952ed5"; + hash = "sha256-rt7pmmPuWn6eA8pYk4wRABmMql4jm0+4BtNwcRI2QRQ="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1766,12 +1788,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=6d2ec89"; + version = "0.0.0+rev=7ba226c"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "6d2ec894aef843fc89312c904e20c5f555aec4e3"; - hash = "sha256-5V4sMnjVsdSJdeYspxn0nYqq73lVHvz7eGRfD/orqo4="; + rev = "7ba226cf85280c7917d082940022006e6a3b7b6f"; + hash = "sha256-OszsJIzggkPRor8aulnpHP0vPT+8fVfDtiIdUiAAqFU="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -1867,12 +1889,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=66cf9d3"; + version = "0.0.0+rev=4cd190d"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"; - hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU="; + rev = "4cd190d1aaced458e8f1548e11b3beae5e4ea806"; + hash = "sha256-rbIRx/LA5kvq7vI5WdR8be0WCyyTxsWB87ENNO7Qkao="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1901,12 +1923,12 @@ }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=54fe7c0"; + version = "0.0.0+rev=621457c"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "54fe7c05dfa2b9e100572496531e15c9bec86343"; - hash = "sha256-xP0pHuK0Gc8huTWaZY/DMfWzm6Jw/oVCx1huYL8Vwx4="; + rev = "621457c5c6efe471b601edb5a42191824f304b41"; + hash = "sha256-oNtvynabIoiitnLg6R1F8VL+IxNifI+3Um/QuUqui88="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index e6c70d60a0..579d01558d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -301,6 +301,14 @@ self: super: { dependencies = with self; [ completion-nvim nvim-treesitter ]; }); + copilot-vim = super.copilot-vim.overrideAttrs (old: { + postInstall = '' + substituteInPlace $out/autoload/copilot/agent.vim \ + --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ + " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" + ''; + }); + cpsm = super.cpsm.overrideAttrs (old: { nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -806,7 +814,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-GN7KM3fkeOcqmyUwsPMw499kS/eYqh8pbyPgMv4/NN4="; + cargoHash = "sha256-gnQNQlW/c1vzyR+HbYn7rpxZ1C6WXFcqpylIOTUMZ6g="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index a21406e36a..e821e40072 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -60,6 +60,7 @@ https://github.com/skywind3000/asynctasks.vim/,, https://github.com/vmchale/ats-vim/,, https://github.com/ray-x/aurora/,, https://github.com/hotwatermorning/auto-git-diff/,, +https://github.com/asiryk/auto-hlsearch.nvim/,HEAD, https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, @@ -553,6 +554,7 @@ https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/romgrk/nvim-treesitter-context/,, +https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index bf975ce68e..44fb209b2b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -25,11 +25,13 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; # - # Unless there is a good reason not to, we attempt to use the same name as the - # extension's unique identifier (the name the extension gets when installed - # from vscode under `~/.vscode`) and found on the marketplace extension page. - # So an extension's attribute name should be of the form: - # "${mktplcRef.publisher}.${mktplcRef.name}". + # Unless there is a good reason not to, we attempt to use the lowercase + # version of the extension's unique identifier. The unique identifier can be + # found on the marketplace extension page, and is the name under which the + # extension is installed by VSCode under `~/.vscode`. + # + # This means an extension should be located at + # ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { @@ -253,7 +255,7 @@ let }; }; - Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + arjun.swagger-viewer = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "Arjun"; name = "swagger-viewer"; @@ -451,18 +453,6 @@ let }; }; - bodil.file-browser = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "file-browser"; - publisher = "bodil"; - version = "0.2.11"; - sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - bierner.emojisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "emojisense"; @@ -536,6 +526,18 @@ let }; }; + bodil.file-browser = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "file-browser"; + publisher = "bodil"; + version = "0.2.11"; + sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -594,6 +596,23 @@ let chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; + chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; + description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; + homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.drupol ]; + }; + mktplcRef = { + name = "chatgpt-reborn"; + publisher = "chris-hayes"; + version = "3.11.2"; + sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; + }; + }; + christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "path-intellisense"; @@ -634,35 +653,6 @@ let }; }; - coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; - description = "A customizable extension for colorizing matching brackets"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; - homepage = "https://github.com/CoenraadS/BracketPair"; - license = lib.licenses.mit; - maintainers = [ ]; - }; - mktplcRef = { - name = "bracket-pair-colorizer"; - publisher = "CoenraadS"; - version = "1.0.61"; - sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652"; - }; - }; - - coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "bracket-pair-colorizer-2"; - publisher = "CoenraadS"; - version = "0.2.2"; - sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { mktplcRef = { name = "llvm-syntax-highlighting"; @@ -692,23 +682,6 @@ let }; }; - chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/chris-hayes.chatgpt-reborn/changelog"; - description = "A Visual Studio Code extension to support ChatGPT, GPT-3 and Codex conversations"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=chris-hayes.chatgpt-reborn"; - homepage = "https://github.com/christopher-hayes/vscode-chatgpt-reborn"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.drupol ]; - }; - mktplcRef = { - name = "chatgpt-reborn"; - publisher = "chris-hayes"; - version = "3.11.2"; - sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo="; - }; - }; - cweijan.vscode-database-client2 = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-database-client2"; @@ -1080,23 +1053,6 @@ let }; }; - faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "lex-flex-yacc-bison"; - publisher = "faustinoaq"; - version = "0.0.3"; - sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; - description = "Language support for Lex, Flex, Yacc and Bison."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; - homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.emilytrau ]; - }; - }; - file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -1257,59 +1213,78 @@ let }; }; - github = { - codespaces = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "codespaces"; - version = "1.14.1"; - sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; - }; - meta = { license = lib.licenses.unfree; }; + github.codespaces = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "codespaces"; + version = "1.14.1"; + sha256 = "sha256-oiAn/tW4jfccsY8zH6L7UzldeM7sV9tllSvgZD8c9aY="; }; + meta = { license = lib.licenses.unfree; }; + }; - copilot = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "github"; - name = "copilot"; - version = "1.78.9758"; - sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; - }; - meta = { - description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; - homepage = "https://github.com/features/copilot"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.Zimmi48 ]; - }; + github.copilot = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot"; + version = "1.78.9758"; + sha256 = "sha256-qIaaM72SenMv+vtkTMBodD2JsroZLpw8qEttr5aIDQk="; }; + meta = { + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; + homepage = "https://github.com/features/copilot"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.Zimmi48 ]; + }; + }; - github-vscode-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "github-vscode-theme"; - publisher = "github"; - version = "6.3.3"; - sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; - }; - meta = { - description = "GitHub theme for VS Code"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; - homepage = "https://github.com/primer/github-vscode-theme"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.hugolgst ]; - }; + github.github-vscode-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-vscode-theme"; + publisher = "github"; + version = "6.3.3"; + sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk="; }; + meta = { + description = "GitHub theme for VS Code"; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + homepage = "https://github.com/primer/github-vscode-theme"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hugolgst ]; + }; + }; - vscode-pull-request-github = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-pull-request-github"; - publisher = "github"; - version = "0.61.2023032418"; - sha256 = "sha256-pCFq0lAMH3fno4/BtHJHhS4hX1KqxsPf4wEmAm66Y8E="; - }; - meta = { license = lib.licenses.mit; }; + github.vscode-github-actions = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-github-actions"; + publisher = "github"; + version = "0.25.3"; + sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI="; }; + meta = { + description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions"; + homepage = "https://github.com/github/vscode-github-actions"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + + github.vscode-pull-request-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pull-request-github"; + publisher = "github"; + # Stable versions are listed on the GitHub releases page and use a + # semver scheme, contrary to preview versions which are listed on + # the VSCode Marketplace and use a calver scheme. We should avoid + # using preview versions, because they can require insider versions + # of VS Code + version = "0.60.0"; + sha256 = "sha256-VAoKNRYrzUXUQSDAX8NM17aknCUxMRsTRd5adQu+w/s="; + }; + meta = { license = lib.licenses.mit; }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { @@ -1598,18 +1573,6 @@ let }; }; - jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-styled-components"; - publisher = "jpoissonnier"; - version = "1.4.1"; - sha256 = "sha256-ojbeuYBCS+DjF5R0aLuBImzoSOb8mXw1s0Uh0CzggzE="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; @@ -1809,8 +1772,6 @@ let meta.license = lib.licenses.mit; }; - matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher - matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { mktplcRef = { name = "caddyfile-support"; @@ -1990,88 +1951,6 @@ let }; }; - ms-vscode.anycode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "anycode"; - publisher = "ms-vscode"; - version = "0.0.70"; - sha256 = "sha256-POxgwvKF4A+DxKVIOte4I8REhAbO1U9Gu6r/S41/MmA="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "cmake-tools"; - publisher = "ms-vscode"; - version = "1.14.20"; - sha256 = "sha256-j67Z65N9YW8wY4zIWWCtPIKgW9GYoUntBoGVBLR/H2o="; - }; - meta.license = lib.licenses.mit; - }; - - ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; - - ms-vscode.hexeditor = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "hexeditor"; - publisher = "ms-vscode"; - version = "1.9.11"; - sha256 = "sha256-w1R8z7Q/JRAsqJ1mgcvlHJ6tywfgKtS6A6zOY2p01io="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-vscode.makefile-tools = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "makefile-tools"; - publisher = "ms-vscode"; - version = "0.6.0"; - sha256 = "07zagq5ib9hd3w67yk2g728vypr4qazw0g9dyd5bax21shnmppa9"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-vscode.PowerShell = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "PowerShell"; - publisher = "ms-vscode"; - version = "2023.3.1"; - sha256 = "sha256-FJolnWU0DbuQYvMuGL3mytf0h39SH9rUPCl2ahLXLuY="; - }; - meta = { - description = "A Visual Studio Code extension for PowerShell language support"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell"; - homepage = "https://github.com/PowerShell/vscode-powershell"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.rhoriguchi ]; - }; - }; - - ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; - - ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "Theme-TomorrowKit"; - publisher = "ms-vscode"; - version = "0.1.4"; - sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; - }; - meta = { - description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit"; - homepage = "https://github.com/microsoft/vscode-themes"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.ratsclub ]; - }; - }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { @@ -2122,20 +2001,90 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - - msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { + ms-vscode.anycode = buildVscodeMarketplaceExtension { mktplcRef = { - name = "debugger-for-chrome"; - publisher = "msjsdiag"; - version = "4.12.11"; - sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; + name = "anycode"; + publisher = "ms-vscode"; + version = "0.0.70"; + sha256 = "sha256-POxgwvKF4A+DxKVIOte4I8REhAbO1U9Gu6r/S41/MmA="; }; meta = { license = lib.licenses.mit; }; }; + ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "cmake-tools"; + publisher = "ms-vscode"; + version = "1.14.20"; + sha256 = "sha256-j67Z65N9YW8wY4zIWWCtPIKgW9GYoUntBoGVBLR/H2o="; + }; + meta.license = lib.licenses.mit; + }; + + ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; + + ms-vscode.hexeditor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "hexeditor"; + publisher = "ms-vscode"; + version = "1.9.11"; + sha256 = "sha256-w1R8z7Q/JRAsqJ1mgcvlHJ6tywfgKtS6A6zOY2p01io="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-vscode.makefile-tools = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "makefile-tools"; + publisher = "ms-vscode"; + version = "0.6.0"; + sha256 = "07zagq5ib9hd3w67yk2g728vypr4qazw0g9dyd5bax21shnmppa9"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-vscode.powershell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "PowerShell"; + publisher = "ms-vscode"; + version = "2023.3.1"; + sha256 = "sha256-FJolnWU0DbuQYvMuGL3mytf0h39SH9rUPCl2ahLXLuY="; + }; + meta = { + description = "A Visual Studio Code extension for PowerShell language support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell"; + homepage = "https://github.com/PowerShell/vscode-powershell"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.rhoriguchi ]; + }; + }; + + ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Theme-TomorrowKit"; + publisher = "ms-vscode"; + version = "0.1.4"; + sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; + }; + meta = { + description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit"; + homepage = "https://github.com/microsoft/vscode-themes"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; + }; + }; + + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; + + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; @@ -2194,6 +2143,23 @@ let }; }; + nvarner.typst-lsp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typst-lsp"; + publisher = "nvarner"; + version = "0.3.0"; + sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; + description = "A VSCode extension for providing a language server for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; + homepage = "https://github.com/nvarner/typst-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; @@ -2211,6 +2177,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.37.3"; + sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + oderwat.indent-rainbow = buildVscodeMarketplaceExtension { mktplcRef = { name = "indent-rainbow"; @@ -2227,18 +2205,6 @@ let }; }; - octref.vetur = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vetur"; - publisher = "octref"; - version = "0.37.3"; - sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - phoenixframework.phoenix = buildVscodeMarketplaceExtension { mktplcRef = { name = "phoenix"; @@ -2337,6 +2303,16 @@ let }; }; + redhat.vscode-xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-xml"; + publisher = "redhat"; + version = "0.25.2023032304"; + sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; + }; + meta.license = lib.licenses.epl20; + }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-yaml"; @@ -2349,16 +2325,6 @@ let }; }; - redhat.vscode-xml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-xml"; - publisher = "redhat"; - version = "0.25.2023032304"; - sha256 = "sha256-3hU/MZU9dP91p2PVycFL6yg/nf4/x8tt76vmlkiHnE8="; - }; - meta.license = lib.licenses.epl20; - }; - richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -2371,7 +2337,7 @@ let }; }; - rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { + rioj7.commandonallfiles = buildVscodeMarketplaceExtension { mktplcRef = { name = "commandOnAllFiles"; publisher = "rioj7"; @@ -2407,18 +2373,6 @@ let }; }; - rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-paste-and-indent"; - publisher = "Rubymaniac"; - version = "0.0.8"; - sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -2431,6 +2385,18 @@ let }; }; + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; ryu1kn.partial-diff = buildVscodeMarketplaceExtension { @@ -2546,18 +2512,6 @@ let }; }; - silvenon.mdx = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "mdx"; - publisher = "silvenon"; - version = "0.1.0"; - sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - skellock.just = buildVscodeMarketplaceExtension { mktplcRef = { name = "just"; @@ -2688,6 +2642,22 @@ let }; }; + styled-components.vscode-styled-components = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-styled-components"; + publisher = "styled-components"; + version = "1.7.6"; + sha256 = "sha256-ZXXXFUriu//2Wmj1N+plj7xzJauGBfj+79SyrkUZAO4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/styled-components.vscode-styled-components/changelog"; + description = "Syntax highlighting and IntelliSense for styled-components"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=styled-components.vscode-styled-components"; + homepage = "https://github.com/styled-components/vscode-styled-components"; + license = lib.licenses.mit; + }; + }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { @@ -3098,7 +3068,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; + wakatime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3230,10 +3200,15 @@ let }; }; - aliases = self: super: { - # aliases + aliases = super: { + Arjun.swagger-viewer = super.arjun.swagger-viewer; jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; - ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) go; }; + jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; + matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher + ms-vscode.go = super.golang.go; + ms-vscode.PowerShell = super.ms-vscode.powershell; + rioj7.commandOnAllFiles = super.rioj7.commandonallfiles; + WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; _1Password = throw ''_1Password has been replaced with "1Password"''; _2gua = throw ''_2gua has been replaced with "2gua"''; _4ops = throw ''_4ops has been replaced with "4ops"''; @@ -3243,7 +3218,9 @@ let # then apply extension specific modifcations to packages. # overlays will be applied left to right, overrides should come after aliases. - overlays = lib.optionals config.allowAliases [ aliases ]; + overlays = lib.optionals config.allowAliases [ + (self: super: lib.recursiveUpdate super (aliases super)) + ]; toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 09ccf97d2f..5e5467f2ff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1h8iryrcn22i2vxh7srlfy1amdvkk6p7fk6wmsbylhb845zfq0s2"; - x86_64-darwin = "1q2nfm89m9lp9mf7q62l17z9gkmj0fpjmn905x7dw8xjlslkp9v8"; - aarch64-linux = "19y661ad95dmr9hhkmb8a2w17jj4c9ywlg49bi2r5l7birv4v6hy"; - aarch64-darwin = "18ycg1hj26zj68zni314wpbl3h8p7jw3lf2h791vjzbpgjznxnz4"; - armv7l-linux = "0hk67pik1z1s1nd2m0xc8zgfyn8i7v2z14j5bmc48k7spirrpz7r"; + x86_64-linux = "1j9m31d760zrmj1gwfqnxvji8kmm8sx2s9p2mam3vsk5mb9l3n58"; + x86_64-darwin = "1p54yrmcv7xlgj247yyj7y83q92jx2vhjkx6hrbqcai67ixw531w"; + aarch64-linux = "1m2xqy9lnb3ifnh90lq9qk3fd3h6nmk5fnwrlyjgrg395hvgk4ai"; + aarch64-darwin = "15n8g5rwz1h31dish9idwzvqimx3civn4rj1jzhnq77aixk8p5z3"; + armv7l-linux = "1j1nlbcpncb0s2gn1520kxqqamga3gh1slr7scl24mj1z8fg5r1n"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.76.2"; + version = "1.77.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 437008193b..ac0087772b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.687"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "da073fce6127243fcd93b736cde951c4e835e508"; - sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f"; + rev = "460f96967de6f5cb729ed57baaa4dad2178c8cb6"; + sha256 = "008mjih7lp2zq86g750s237d9g2p2jqfryp6izac3iqr3s7dbr6g"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix index 216a275249..d520ba5072 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix @@ -53,6 +53,7 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; }) + (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -130,7 +131,7 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.1-build23"; sha256 = "1qnz15q2g6qknjgbv3pb53llqpb4lcwfwmgfvm6325zxjm79r792"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.3-build25"; sha256 = "190gqalpkhw1zb3pvb92dxrciyn1giznl125vxxx9gsy8a6cipka"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) @@ -273,6 +274,6 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) - (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-f7c841d"; sha256 = "1fxvv77hgbblb14xwdpk231cgm5b3wl0li1ksx2vswxi9n758hrk"; }) + (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-fb78016"; sha256 = "1r43b5fd5q8xq8b5nk11jsz2gnm96dh7sxc0rrv2p605ivz7icin"; }) (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/graphics/identity/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/identity/default.nix new file mode 100644 index 0000000000..ba459d5551 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/identity/default.nix @@ -0,0 +1,69 @@ +{ appstream-glib +, blueprint-compiler +, desktop-file-utils +, fetchFromGitLab +, gst_all_1 +, gtk4 +, lib +, libadwaita +, meson +, ninja +, nix-update-script +, pkg-config +, rustPlatform +, stdenv +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "identity"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "YaLTeR"; + repo = "identity"; + rev = "v${version}"; + sha256 = "sha256-ZBK2Vc2wnohABnWXRtmRdAAOnkTIHt4RriZitu8BW1A="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-5NUnrBHj3INhh9zbdwPink47cP6uJiRyzzdj+yiSVD8="; + }; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gstreamer + gtk4 + libadwaita + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A program for comparing multiple versions of an image or video"; + homepage = "https://gitlab.gnome.org/YaLTeR/identity"; + maintainers = [ lib.maintainers.paveloom ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 59fd3f9156..992ae201c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libX11, libXext, libXrender +, ilmbase, libepoxy, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo="; + hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { pugixml potrace libharu + libepoxy ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock index 8c4fd4f6a7..f3da4c9988 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -21,16 +21,44 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.6" +name = "anstream" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] [[package]] -name = "arrayvec" -version = "0.5.2" +name = "anstyle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys", +] [[package]] name = "atty" @@ -38,29 +66,20 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "bindgen" -version = "0.53.3" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", - "cfg-if 0.1.10", "clang-sys", - "clap", - "env_logger", "lazy_static", "lazycell", "log", @@ -70,6 +89,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -79,62 +99,27 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - [[package]] name = "cc" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ "nom", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -143,9 +128,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "0.29.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" dependencies = [ "glob", "libc", @@ -161,13 +146,55 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim", + "strsim 0.8.0", "textwrap", "unicode-width", "vec_map", - "yaml-rust", + "yaml-rust 0.3.5", ] +[[package]] +name = "clap" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", + "strsim 0.10.0", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.11", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + [[package]] name = "clipboard" version = "0.5.0" @@ -192,47 +219,46 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys", +] + [[package]] name = "config" version = "0.0.0" dependencies = [ "glob", - "itertools", + "itertools 0.10.5", "man_dmenu", "prettytable-rs", "termcolor", - "yaml-rust", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "crossbeam-utils" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" -dependencies = [ - "cfg-if 1.0.0", + "yaml-rust 0.4.5", ] [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", "itoa", "ryu", @@ -249,10 +275,20 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "1.0.5" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +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", @@ -263,9 +299,9 @@ dependencies = [ name = "dmenu-build" version = "0.0.0" dependencies = [ - "clap", + "clap 2.34.0", "clipboard", - "itertools", + "itertools 0.9.0", "lazy_static", "libc", "overrider", @@ -278,32 +314,40 @@ dependencies = [ "termcolor", "unicode-segmentation", "x11", - "yaml-rust", + "yaml-rust 0.3.5", ] [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] -name = "env_logger" -version = "0.7.1" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -329,20 +373,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "headers" @@ -352,6 +396,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -362,12 +412,32 @@ dependencies = [ ] [[package]] -name = "humantime" -version = "1.3.0" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ - "quick-error", + "hermit-abi 0.3.1", + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys", ] [[package]] @@ -380,10 +450,19 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "0.4.8" +name = "itertools" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "lazy_static" @@ -399,27 +478,39 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libloading" -version = "0.5.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cc", + "cfg-if", "winapi", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "log" version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -435,7 +526,7 @@ dependencies = [ name = "man_dmenu" version = "0.1.0" dependencies = [ - "itertools", + "itertools 0.10.5", ] [[package]] @@ -445,13 +536,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] -name = "nom" -version = "5.1.2" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", - "version_check", + "minimal-lexical", ] [[package]] @@ -483,6 +580,12 @@ dependencies = [ "objc", ] +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + [[package]] name = "overrider" version = "0.7.0" @@ -491,7 +594,7 @@ checksum = "55b9fb8c67b6adf9fff65ad57571c42ccc80e8a9d2712e5427d00aa7fa293114" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -501,7 +604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9709eba39b602b089deaf80b123e5c8ecfd071aab827a66c1a58412074fbcc" dependencies = [ "glob", - "syn", + "syn 1.0.109", ] [[package]] @@ -527,13 +630,13 @@ dependencies = [ [[package]] name = "prettytable-rs" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" +checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" dependencies = [ - "atty", "csv", "encode_unicode", + "is-terminal", "lazy_static", "term", "unicode-width", @@ -541,9 +644,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -555,75 +658,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16b1c456def2ad84b3574651f069541dea178ee688e882943cb21232a5cb01" dependencies = [ "glob", - "itertools", + "itertools 0.9.0", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", "redox_syscall", - "rust-argon2", + "thiserror", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rustc-hash" @@ -651,10 +733,30 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.11" +name = "rustix" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "semver" @@ -673,9 +775,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" [[package]] name = "servo-fontconfig" @@ -700,9 +802,16 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "stest" +version = "0.0.0" +dependencies = [ + "clap 4.2.0", +] [[package]] name = "strsim" @@ -711,10 +820,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] -name = "syn" -version = "1.0.103" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" dependencies = [ "proc-macro2", "quote", @@ -723,20 +849,20 @@ dependencies = [ [[package]] name = "term" -version = "0.5.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "byteorder", - "dirs", + "dirs-next", + "rustversion", "winapi", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -751,16 +877,36 @@ dependencies = [ ] [[package]] -name = "unicode-ident" -version = "1.0.5" +name = "thiserror" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +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.11", +] + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -768,31 +914,33 @@ 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 = "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.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "which" -version = "3.1.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ + "either", "libc", + "once_cell", ] [[package]] @@ -827,10 +975,76 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "x11" -version = "2.20.0" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" dependencies = [ "libc", "pkg-config", @@ -860,3 +1074,12 @@ name = "yaml-rust" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix index 8550dde614..1635e383e9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix @@ -2,6 +2,7 @@ , rustPlatform , lib , fetchFromGitHub +, fetchpatch , cargo , expat , fontconfig @@ -18,13 +19,13 @@ # See: https://github.com/Shizcow/dmenu-rs#plugins stdenv.mkDerivation rec { pname = "dmenu-rs"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "Shizcow"; repo = pname; rev = version; - sha256 = "sha256-WpDqBjIZ5ESnoRtWZmvm+gNTLKqxL4IibRVCj0yRIFM="; + sha256 = "sha256-6yO2S6j/BD6x/bsuTFKAKvARl1n94KRiPwpmswmUOPU="; }; nativeBuildInputs = [ @@ -51,21 +52,19 @@ stdenv.mkDerivation rec { lockFile = ./Cargo.lock; }; - # The rust-xcb dependency dynamically generates rust code at build time. - # This derivation uses nixpkgs rust functions that vendor each cargo - # dependency's source code into the READ-ONLY nix store. To avoid the code - # generation step failing, we copy the rust-xcb source out of the nix store - # and make it writeable. Also, we remove the build's hardcoded c compiler. - # See: https://github.com/rust-x-bindings/rust-xcb/tree/v0.8.2 + # Fix a bug in the makefile when installing. + # See https://github.com/Shizcow/dmenu-rs/pull/50 + patches = let + fix-broken-make-install-patch = fetchpatch { + url = "https://github.com/Shizcow/dmenu-rs/commit/1f4b3f8a07d73272f8c6f19bfb6ff3de5e042815.patch"; + sha256 = "sha256-hmXApWg8qngc1vHkHUnB7Lt7wQUOyCSsBmn4HC1j53M="; + }; + in [ + fix-broken-make-install-patch + ]; + + # Copy the Cargo.lock stored here in nixpkgs into the build directory. postPatch = '' - substituteInPlace config.mk --replace "clang" "" - - chmod +w "$NIX_BUILD_TOP/cargo-vendor-dir" - mkdir -p "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" - cp -r --no-preserve=mod "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2/." "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" - unlink "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" - mv "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2-readwrite" "$NIX_BUILD_TOP/cargo-vendor-dir/xcb-0.8.2" - cp ${./Cargo.lock} src/Cargo.lock ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix index ab6b992d5d..de12d97512 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-AJ6pFtTM4ViZ9dB41wzHoPSHDdmu+SOzD5fkoAiRLzQ="; + sha256 = "sha256-ErDHrdD9UZxOIGwgN5eakY6vhNvE6D9SoRYXZhzmYX4="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix index d4bd7c63a7..753ff769a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6x1t/PLs1dqlY5XQ1F0PDqZ/TofZ0h1hTc0C1sjn3fA="; + sha256 = "sha256-SP8n9PGfn4Oe+3+i7gT4i2WKgO35igPu+86SGp65R7g="; }; - vendorSha256 = "sha256-rOBwhPXo4sTSI3j3rn3c5qWGnGFgkpeFUKgtzKBltbg="; + vendorSha256 = "sha256-gA545IqG3us0mmWxbw3fu3mFLqJzluH/T6d3ilfnLyM="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix index 2173c12461..f4989b2c3f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-ipcv1rP4DDjBEybmntsfw2ubjCgm1cGDlYM7sN0jeVo="; + sha256 = "sha256-hvnOB6cTL+VffwtBulrEzujxVZEQMSDoJx2HjivJ9z8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index 4f3859e2e2..e6b384904b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.12-da9418f3/Hubstaff-1.6.12-da9418f3.sh"; - version = "1.6.12-da9418f3"; - sha256 = "1iz81g0r20215z65mj6bfls7h0dp1k5kk8q10fjbdfj82rpwbfws"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.13-269829b4/Hubstaff-1.6.13-269829b4.sh"; + version = "1.6.13-269829b4"; + sha256 = "0i05d8kivm09hqsc1z6vn7w0bbc3l9dawssqpqsm7kqdyaq0l304"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix new file mode 100644 index 0000000000..c48b30b34d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, libuv +, libX11 +, libXi +, libyaml +, luajit +, udev +}: + +stdenv.mkDerivation rec { + pname = "keyleds"; + version = "unstable-2021-04-08"; + + src = fetchFromGitHub { + owner = "keyleds"; + repo = pname; + rev = "171361654a64b570d747c2d196acb2da4b8dc293"; + sha256 = "sha256-mojgHMT0gni0Po0hiZqQ8eMzqfwUipXue1uqpionihw="; + }; + + # This commit corresponds to the following open PR: + # https://github.com/keyleds/keyleds/pull/74 + # According to the author of the PR, the maintainer of keyleds is unreachable. + # This patch fixes the build process which is broken on the current master branch of keyleds. + patches = [ + (fetchpatch { + url = "https://github.com/keyleds/keyleds/commit/bffed5eb181127df915002b6ed830f85f15feafd.patch"; + sha256 = "sha256-i2N3D/K++34JVqJloNK2UcN473NarIjdjAz6PUhXcNY="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libuv + libX11 + libXi + libyaml + luajit + udev + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=MinSizeRel" + ]; + + meta = { + homepage = "https://github.com/keyleds/keyleds"; + description = "Advanced RGB animation service for Logitech keyboards"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index 125ff56b6a..5e3ffca891 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -5,15 +5,16 @@ , makeWrapper , electron , git +, nix-update-script }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.18"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-tD7uNSgcGMPyiA/HfOOZs3NRbWTrds0AdEXTaHYfUjk="; + hash = "sha256-8jplCIylG1xbpp/VGnU06MwfqWe2E9iVQApZaWbhuVc="; name = "${pname}-${version}.AppImage"; }; @@ -40,9 +41,12 @@ stdenv.mkDerivation rec { rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git chmod -w $out/share/${pname}/resources/app/node_modules/dugite + mkdir -p $out/share/pixmaps + ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ --replace Exec=Logseq Exec=${pname} \ - --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png + --replace Icon=Logseq Icon=${pname} runHook postInstall ''; @@ -54,7 +58,7 @@ stdenv.mkDerivation rec { --add-flags $out/share/${pname}/resources/app ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh b/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh deleted file mode 100755 index eb81dc68e4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts - -version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)" -update-source-version logseq "$version" diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 702a776920..246e579975 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.5.0"; + version = "2.5.1"; nativeBuildInputs = [ cmake @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4="; + sha256 = "sha256-ZeCofpBtsIBPRcjeJSEjOj+yNOOmYQA91/NLZwB2GUs="; rev = "version_${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix b/third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix index 6d80349056..86a596be9b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/river-luatile/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "river-luatile"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "river-luatile"; rev = "v${version}"; - hash = "sha256-eZgoFbat7X/jh5udlNyIuTheBUCHpaVRbsojYLATO18="; + hash = "sha256-flh1zUBranb7w1fQuinHbVRGlVxfl2aKxSwShHFG6tI="; }; - cargoHash = "sha256-Vqyt5bL1lVhy/Wxd+zF7Wugvb7dW1N9Kq2TTFSaodnE="; + cargoHash = "sha256-9YQxa6folwCJNoEa75InRbK1X7cD4F5QGzeGlfsr/5s="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 65fe488ee8..7eaef8b202 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -130,6 +130,10 @@ buildPythonApplication rec { bash dev/test.sh runHook postCheck ''; + postInstall = '' + python dev/zsh-completion.py + install -Dm644 _visidata -t $out/share/zsh/site-functions + ''; pythonImportsCheck = ["visidata"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix index 6149c52e77..290de03f39 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/weather/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.4"; pname = "weather"; src = fetchurl { url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-qJl5rFDk31Fm+tmR6+Iiihcx6qyd9alHz2L672pNJsc="; + sha256 = "sha256-uBwcntmLmIAztbIOHEDx0Y0/kcoJqAHqBOM2yBiRHrU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 05f5b31390..d48c7bd663 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.19.0"; + version = "6.19.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM="; + hash = "sha256-m8ot/IbpxdzHOyJymzZ7MWt4p78GTUuTjYZ9P1oGpWI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index 0a513fc705..56eca76065 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.19.0-mo1"; + version = "6.19.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-+J6gl/R9Yi8V2nYNuIH/oyplWi8vzfdamELHjp6iS7c="; + sha256 = "sha256-wrjn1QhHI/OeSpPkwuwqQAsTOW8O/lNqIgKjkjxSbbA="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix index 13dabe296b..6f56dd8ff4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-1qYHgMp9OZQuKDycvVwp0ADvF8xNY668JvRMVIE/dko="; + hash = "sha256-yqztce6t7VTtrumxbhbikYY54FiyUaegBPYSnF4wTkU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 298d218560..ca5a4684a4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - hash = "sha256-+q6arKZjHVstnbPQhmuxdj/kCPTFf9L0jZYlPS+lksk="; + hash = "sha256-br7VpxkVMZ/TgwMaFbnVMOw9RemNjur/UYnloMoDzHs="; }; - cargoHash = "sha256-mS+yQD7ggQJ/6TYgL54+lLsUbKQaZX9oxT2/GaFoWyI="; + cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 543a4d3d28..9ef5ebe21e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.9.11"; + version = "1.9.16"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-fgjuLQNw5Em+wEJSmote6TuFH8dUVDtkQTgCcGhh2ro="; + hash = "sha256-xskLRQLjLSXXHK39h7e8knP5OtIbcllF7OvefPpIQCU="; }; - vendorHash = "sha256-IxPJBpOSqcramegQ+M/U9p6ls6dStOi0OUdddDj11d0="; + vendorHash = "sha256-lyXP1mkJmHpHHMtH0rXa0orf5u+AbZ4H/MJXt8o49ng="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 1689915b55..b81230559d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,21 +32,21 @@ } }, "dev": { - "version": "113.0.5653.0", - "sha256": "1s1as01javi8z4sax70rx4cn03lwfis75rkv58yk7sfhj3qafzhk", - "sha256bin64": "1i1zkdq8qzm8r5lg10qmqaycx45m2qc9fzjql0si0amy81sdkfsn", + "version": "113.0.5668.0", + "sha256": "0rp43m8n26rs2hiysavr0w65x27i6n94jghx81w92fxbfjkc0qp3", + "sha256bin64": "1xnx8pg0xhbw2va8bm97x092andzzvqxcm9ydi7d6qadhwqam1br", "deps": { "gn": { - "version": "2023-02-24", + "version": "2023-03-18", "url": "https://gn.googlesource.com/gn", - "rev": "fe330c0ae1ec29db30b6f830e50771a335e071fb", - "sha256": "0fj8kfck53hbfz30m8p0mfcqbjs9cjrlfzi03l3h7n7yd88js8i4" + "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4", + "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" } } }, "ungoogled-chromium": { - "version": "111.0.5563.111", - "sha256": "0r03p8m92fwsi8z1i8qjwllbb68gkspnzwynvmag3jy5kyk4vprv", + "version": "111.0.5563.147", + "sha256": "0absyydskz59pxicq4z468sr0cxcmrcanx0yk4lla9hvs05lx7f4", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" }, "ungoogled-patches": { - "rev": "111.0.5563.111-1", - "sha256": "1m8kf8af5zjc5mgdccppyfbl6bxlwcnb6rw58q5020a810x7y6f8" + "rev": "111.0.5563.147-1", + "sha256": "1ynnwrjjdwjlhzpc51rl03dv10bn4dxvwxvd29jksf5brwcr9bzb" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index eb35d599e1..2e20fa8d82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b3"; + version = "112.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ach/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ach/firefox-112.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7e45e3f7a8b985f05fe32c038d8dcf707d4c7f7d544443554923e54222c10f69"; + sha256 = "2243ac96b3207ff374f00da9bbcd4ad5285e476e0ea53f646f87d4ccad5dc640"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/af/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/af/firefox-112.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3ef52da36f6944f458af7730f3a0052f94dafe7daf81996364930dab63208cb5"; + sha256 = "5ae81c6eecc9cdec47fff2e5ca0483d097fb5b574d36aadacac073decaf855a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/an/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/an/firefox-112.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c9d4d16d7b6035babc3ca12149dcce628ceea7c6caa05663ca9d7e4a61570cd5"; + sha256 = "71c159677d1234d041b5b8a9d471f1c01c352104e8a2a4d249ccb9a4cffde9f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ar/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ar/firefox-112.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d5dcaa8b76a9699eb9af6cc30c6de560c9b8e7ceaa96d0d208f2e30b29471dd6"; + sha256 = "608f93efe2c76b875d6a1b0799aec2d1a71ee609d3cd75b1c6c8fe0ddefce504"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ast/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ast/firefox-112.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d61ba0ee0079683a47163644fd5abbd0dda0c6387c6f30d0de90abfba4f5261f"; + sha256 = "425259d3b90127a51bf08b6f354eab7364d2ff58c5d6b8845afde1513c64feb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/az/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/az/firefox-112.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3cf3a5bf77bce607b26b8cf34aa3d148d9e09b0de9010b7ee6032553e165e6c1"; + sha256 = "0e4b1e1b78dc599547fbda1db6762761301874f571df9b5ced8bcfa73edb4cba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/be/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/be/firefox-112.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bbbdd7092f34e116d9974303dc224fdbc6cf510413ff45f15d8036e27f2a8bf2"; + sha256 = "5a3de39ce38855472cc345a88ac6460da4ea61f0b97bdc079930e31855b7e682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bg/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/bg/firefox-112.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "47bf112189e74f5d4e87864a695915e0ecbfd454890b0f709f229869bf15bd7f"; + sha256 = "8fd4506a0ce7427758404e04132d4b32a7543f076eb1c473ef368089e51e6795"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/bn/firefox-112.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8d4a77d3eed954c442c91e1f43f83c1abedcd394fa26b3b55594f6879cbfb564"; + sha256 = "0b41e7c3c068ceb02612fc3d4277059e2640fd1708163c6b9695aca849164c76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/br/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/br/firefox-112.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "99464a0825965bf95fc20f3f02c5263e6adb9ffe95c5457724d708d7cf35345b"; + sha256 = "e5a8c2a3b4168b3eeb99ebaf42909c99e23d5f774a71af2a9fd13782a4914753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/bs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/bs/firefox-112.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d508c6cd95261589e597c3d38555d8182f1d6bb7df3fee6bf51d69ff62bb4ba6"; + sha256 = "a510f6c220c55ded84d6f0da98c872aa1aab3dbd7d09567d76b4217a0235b14c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ca-valencia/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ca-valencia/firefox-112.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "66c160faefc80ea3a4d7bdb8bd4ec415d6e6880decc0ae8b785ba41245fe7788"; + sha256 = "a224c3afa85b8e2e664b7cb0180bc8c5368403d9f14308f7a605401afe3af793"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ca/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ca/firefox-112.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "81aa78e972989fcfcd36f46698863806853d92514afaac7adf567aa55bd6a60e"; + sha256 = "a4aa1296fd1590612b63a1063409b0779ff9b6e3f4e871c4480a51940c6dcc45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cak/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/cak/firefox-112.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d9631a4c750b65377210266c8461c529e2ab5fa625b78e971d11a0116ab9d1a3"; + sha256 = "f0e65232445effbf458ac05546824591346d2ce264452159bc1854a154831648"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/cs/firefox-112.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7f90dc968b6d4c25ffef4708adf2031b29fe4b0b11a694a4d3c4c35c071a73da"; + sha256 = "f92da7c25745e8262c4ac16f2bd7ad0e45689d89ec4b8e8a354f9163e130c075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/cy/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/cy/firefox-112.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "1a9e15ad5733a86000a31f93a403cbb43578de54c05a97b0e6e40a8f3fd244ac"; + sha256 = "4cfea6a733a9120d866f28bc74f932cc2beec57d316a4be0f3e22adac92cc9c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/da/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/da/firefox-112.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ebf834bcae918981e89795434ae40768b826b13371acc7ec9ba08dc72aaa73b1"; + sha256 = "a296ed20aa46f5a53df7860390eaa8d69f0ba4e651a18d6ac004cfd9edaf6e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/de/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/de/firefox-112.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "666dbf7af58657fe9b0b7f99bfbc8d46ae02305d1289e8a91be8f4aea9b46006"; + sha256 = "c530ff97db3fd4760994ee6ce3536a4ba3a1853bd46588dfbb1b92fcf4f43411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/dsb/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/dsb/firefox-112.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "236a9920e1f6800d5625ce580cbc631a42fd30e5bf25dafe154708a0fbdc677f"; + sha256 = "e9bf3073a0503e00a3b5100d4040491a8028fd526b8b1468d3f3cfe3b7be1117"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/el/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/el/firefox-112.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0c93516a4c1902ff9be2f1e3a0e782246f6105142ce0fa2bb77401ce271efb76"; + sha256 = "acdd96bf7d68eb8a0bf62f5c3250fc4258d0dda674358d5443219ae51472b9d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-CA/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/en-CA/firefox-112.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "18e1068a3b3cbac8db7ea9525f2baca3cac3daeb817143069a92ae8684868ae8"; + sha256 = "de462bc27449e62dca1689c190adfcf72551d44385523672d6326c31727ba32e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-GB/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/en-GB/firefox-112.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ff19e3ac8ddfcf24c32f497576a5df245846b09242ced4a9da4354597b6d19c2"; + sha256 = "c9afc752f399b57d0624bcced35621a2936c4e6e92cf1ce18ec6e0e281941a0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/en-US/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/en-US/firefox-112.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "96c66b52507aff413b5acaf9bc146908cd6725397189cb535a2e6b411ec5cf25"; + sha256 = "69808b4f2b9af48e157c80c8e8580c2043afb0e631ca34cf23a1d45c1673ae11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/eo/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/eo/firefox-112.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "150b2447d458eb34ca6139aa0046c843971749de0359503c8cbef7106b6a7838"; + sha256 = "b32f9d5ce30d36bccdd2ba28639de181b01fca64c2ce41057f84e323fa2ba6a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-AR/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/es-AR/firefox-112.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "33870347b2573594f7118b53d535c4100e3aa5dfd79ead8e3e98594e35f02c44"; + sha256 = "ed67849de6484b356b5d659acc7ca915f69f08bc12960535f4b5607ba5224860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-CL/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/es-CL/firefox-112.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f6a885941ea044b02823c7ee3e7e59eb7edf9fbd916c207c03a3adb1ac5e9532"; + sha256 = "10e1f2e3b8a5cd124445981b5f0fd18fd8063d6b8d8021356890702e0e094087"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-ES/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/es-ES/firefox-112.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "388d1759395e920f60fc1cdb6b93a936ac59e80cbea18ecab1bd48274ec64241"; + sha256 = "711e9b95f45385df0797228f7f07cb72e0a611fb2875be2a421be4e51e8a8946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/es-MX/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/es-MX/firefox-112.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "fc35234ccd7428a0d16a9ed8403912d2f20a145efc89a74c743ba6e187b1a1b5"; + sha256 = "05c03963bbc7082a233e44f3e85de66b626ad97e27b073e5c95283d95af403db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/et/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/et/firefox-112.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "12116fb38aba397c30b61ba0d13f1eb334a2240e0cc16e303dfdb4274678ce00"; + sha256 = "f5aec804e97baac99e0c7263d9914f2d74dd38054e8998ba6729d7a5e0aeb286"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/eu/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/eu/firefox-112.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c0c3e164e67e31ce5686479f0494749b5eb1badc157ec3b7148afe490a4296a3"; + sha256 = "4b4ebf32dbe6a6e987066f4ba246b04fe60d7bbbb6dc981b735628a4a46c4ff7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fa/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/fa/firefox-112.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b0bd2b70aca166e66d102ab263fa9532dbff40c563ae463aeb2302d7b958e1ff"; + sha256 = "3a52687d057445e3edbffb654f0fdf40c8e50473788f5d20e7a09a8acf368a9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ff/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ff/firefox-112.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c456cad156aad5c99f49a697266fa67d273b5bccae9704db6a0106e3f3e363bb"; + sha256 = "004d494217951542c6f713695b1a52ed959a405392b12a1555b0d4ca487b3ba7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fi/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/fi/firefox-112.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c63837738b96928de3367fc0a23ba69b339d5ab81f21280681546be5bcc9a03b"; + sha256 = "1343323a3a87b2d94069b53964db05b97f943f567ead44b820de90ed9db23b4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/fr/firefox-112.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d066890f90b57b5f6fc53cb3b4e70630d2f2fc4db6283b4e4c4198a68bdfc556"; + sha256 = "a4c6d695ed474fa40b8879ce79b21e619de538def5620850fad14fbbc11f7558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fur/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/fur/firefox-112.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e081e4e51f0359e41a6ddc27c9d57263c558ea2a7e80f61ce6dac29d9bee6a19"; + sha256 = "79231731bfbdbd248c05c6c13cce105f8e07e7a6dcd65e0852d2855ced4e6d5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/fy-NL/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/fy-NL/firefox-112.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e021fcc87736c1ced1a81de06ceb30100e30a39f6db04789ac48f2d1c95a781d"; + sha256 = "64d0e7e0795e164be84154e147314c6726175d477ba58932cf48c42881668243"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ga-IE/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ga-IE/firefox-112.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ee95f7e8eae3c1a7c9884bb62c96a886bfcffd41dfb7b46515ed9298720d805e"; + sha256 = "5039462f24622eb2f3bd8e34e5de9f9b5bcbc885260efef85e7fb70b4fdaad0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gd/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/gd/firefox-112.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c111e1f78a1050e8b31b86bcdd8814a691c9b9c8a71f0659027f6c5a33fdb4b0"; + sha256 = "67d842a511ada3390e2c0a386cab00180fc610827200acab09fa122f5c4c11f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/gl/firefox-112.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6eb9e74b87d47ddd1d03792067f27252d9980664e78afd661fc60910687b67a5"; + sha256 = "61bbd21e91700c496812cbd7c6481c1f208d937b4df9aff0da840593eace8661"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/gn/firefox-112.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3edb762012527ed2c7c404f3fb3eaac4283bb6a8d199861bec1f2cb24fafa416"; + sha256 = "2ecec3ff0e49f1ff5736842401fa1f896237712894c0d15fea874bfe4e0ca3f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/gu-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/gu-IN/firefox-112.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "db7a2992c6843c7b02686133ebb49cadfdbcb6bbd955a298b3f7b66a73bfc22e"; + sha256 = "7c5314e1a3eaf53dd7a5447187283e4653f7927ac76327880c33dde45f329700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/he/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/he/firefox-112.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e09c49922bce9515d8c7be8c4b3b732856b6aeddcdc10c0e7190c3cf98495cfd"; + sha256 = "c7216746058657ede3cde2032947d52a1453ae3ffbf025a09152245750c202ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hi-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/hi-IN/firefox-112.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6448f743d9a3522dc45c1b6be1e4c984318e37ff40b04b67c491e5131c27285e"; + sha256 = "a5296762e12971d7864110adbe64fce4739a26b4f992996e34f950408fe1638c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/hr/firefox-112.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7cb65061d1bcf2e569ec641c636c5088b9fe345ba06fc228d2080f30591407e1"; + sha256 = "bb157441fea15eca97105cddc18599c815186dd82a9a8d44ba206d5ebc0f8df4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hsb/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/hsb/firefox-112.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "78a03d24c65f074baba3dd4dee539f29a78fd0d5b269f169e7a23959acbe1b1a"; + sha256 = "4a550ca4b0bed05ad91185ec0b4180f6f897005e5ab8f68f9108feb1c3f95bbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hu/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/hu/firefox-112.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "010d3d910887002cdfe0f027192acdbb8ecc020d79ef6533989729ae46233532"; + sha256 = "d7e05859fc491669c30f973732769a5e4866efc2985bbe9421de8728a5d34a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/hy-AM/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/hy-AM/firefox-112.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1bb2a3784e45dcc2dc3569d527137b8aaea2ccca3139801a8060acb37a50558e"; + sha256 = "af91bc85a24fa02eaa55f906195d34f61f3694e47be7376996de0b5bd03d0a3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ia/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ia/firefox-112.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b067c8cf7007fc3f8afab8b254e88c985b116e09bde24b56ca9f67a645d63b85"; + sha256 = "ede077d82196780be9daf0ed69c51332035e5dabbb0ebfbcbba523fc616f8b28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/id/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/id/firefox-112.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "caa1a74846f17d80dd0694b6b5e45f0e67ac19c9dca2d700ec17df12fb517972"; + sha256 = "484126b2310bf64f72044e0aa6a41c03bc3ce6d473571e7cdbe61f8e7093f340"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/is/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/is/firefox-112.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a09d2f36353fe3cb39b69f0420ba5cd63629023c534ce95c7ef438d659161eaa"; + sha256 = "0d15c2e0ec0b74cc4b5c8d0f0ec746b15a57d0ef256952be2dab2514f950f53f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/it/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/it/firefox-112.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6eec2dc4eda3777a040320e85d46b67269f5f3ed455e14cbdeaec7b3183a8c94"; + sha256 = "ca4c479fd98978261c117d8e23e28f78fcba9f78bc279583835a758907da4b20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ja/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ja/firefox-112.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ac6eea4ed4080f64b6e2a4f1e55fec434a8cfd2177e069c38a4700d9ddcaf2fc"; + sha256 = "ac09759334e293939f8e93517512da2499ebdad9d71ffa2bedef9a9d32fd2557"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ka/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ka/firefox-112.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "764b2cd0b531d06845390c84a68707ba3c590325984ad0eb493050e045554538"; + sha256 = "75ac469fc48c945a7ba7f88597028e96392d40edb5a5ef9f808b6307e6728672"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kab/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/kab/firefox-112.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d3e2481e32f3ce0816f73ee194d16267692cb90dfa44bf0af6257d06b2cb1845"; + sha256 = "99f0d057e04a74e77133144d0fa5299c6d9e71328e06999123689932f832b316"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/kk/firefox-112.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ce9b2e0f7badb1e707ca80aeb65bbf918ed9d8affa2052d93acf150610e669a1"; + sha256 = "3c0f35e128d3e3217b5deb31a3b4f4d166f87fc6664a292ae5d600bf69334282"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/km/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/km/firefox-112.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "8f9ff69366b06a06baa60ba36f04423b01f846342318646edb1c05efb20e4da8"; + sha256 = "3620322ecf94efc45b3d3986166d040a81f9a4c44584006d6b068956e9ff71db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/kn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/kn/firefox-112.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c05f319cc0d2f63632968dd0491c9452168e56196c83dd6a19f2e4e1b025888e"; + sha256 = "d46f7f01aa3782eceed107e58622df6ade5db67381564405c295928eaca399d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ko/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ko/firefox-112.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ae3dc7e532dd3defc4ece73f04fa593d4108951e28118e47d22ea4469f90981d"; + sha256 = "4c15d74d7bdb2043b9eff801d9d981e220f5f71dd27dbabdda19e79b83bac406"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lij/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/lij/firefox-112.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2892bb5071818ea646ffb1baef35c1e2afd8a1336ccc61f1ca5c2b16dff898a4"; + sha256 = "8f75913e681841c06c148d1601516ca5c876a4dbe05f05a50d73cbd4da1832da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lt/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/lt/firefox-112.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c1f2f2ac21ac4aa2baf884e2c33e627a122e5be2cfe28abe7b5955b9ccfa0356"; + sha256 = "e81886bd26573d77d6ca1c1751c4eaafd8a8058dd3a27a9a715fe4f8a935a9c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/lv/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/lv/firefox-112.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9e8eefe5d71ec1a8f2584c295e9dbcab46bb5c91647ca54a2e0d8e33e609c598"; + sha256 = "ab9008d20842006c3451a4b2b4f6e92db8a74990a8780979ff0584be9e87fdb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/mk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/mk/firefox-112.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5a63aa725162b1915b16b94a237f4adec1f15c982ee4640ac3f1af9207ccd2fc"; + sha256 = "e3a3a1bfdd12d8df260969071dd439156610bb95f2598843dd1cc2a44ff86319"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/mr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/mr/firefox-112.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b2ada28e6bc7e5805e802aea02ceff5cc84e05716363c1a57cd38ec10fe6a132"; + sha256 = "a054158ce648410c327c448401bf060b5e946505211ac441e3f576c0841668c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ms/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ms/firefox-112.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0205f2ab90af921cd5ba92a1679ef3e2b955f806ab4da4c4817222e25ecbeda3"; + sha256 = "1c53b658ea9ea9922c5f60cf6565e6d79401dc0d0a3a0ec0738bb13b52421bb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/my/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/my/firefox-112.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6c8620a171bb486d5fb110568f2bcdadd31a012a22d886762286724eb4d299f7"; + sha256 = "685e611b048d6c112adfe250f52139208599b0d77f684606c441104e28551743"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nb-NO/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/nb-NO/firefox-112.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d2ff3b33732ecc1693f4c93f63a8b750cb25c02e5f2df91a6266ff1f54c40692"; + sha256 = "b66eca6d42f89a011acfd237f0576bb03efd86c01f9ade8c1fbc446f9b82db44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ne-NP/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ne-NP/firefox-112.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "c3b25f66028043244a8da57d7d9e091c6a8d8cd0c153a157839b4aeaf66e743b"; + sha256 = "1e718aea978c9119b15e2ec398ae21bb1fe538d78e657032a58ee3d64e3322e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/nl/firefox-112.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "66af5afead6aa2b596342d117e6d9aee3df99b5e87a4ff765cd62e98a74c28ee"; + sha256 = "f51e5a6a44d80948345561ee43ecb01b0567cdb5e1813ef68c4229f1df20caab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/nn-NO/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/nn-NO/firefox-112.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fe48675b369b36eebfd6c25907bc12b29540698f8fbd13bc111a85fb80cd710f"; + sha256 = "29b081f1c879a4ad6a97f0e282eecb9f33f7358d925c2e4bbb3722196ea94ebd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/oc/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/oc/firefox-112.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0a1ef700dd183a4d63fa74fd69e633e808b7049dd6594acd39e99d8a10e4eebe"; + sha256 = "77dab4224d6c0de52e5f106f25c0d3ad01bae7245cf416e16c05e11221963be3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pa-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/pa-IN/firefox-112.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d80243b94c87c6746fb905ea87f17309d646207798e5b9641f19da7a63c2d287"; + sha256 = "0efe5e08bad66bd3423ef9ed1b9c68aa9bbb12621831328c259e17100bac5040"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/pl/firefox-112.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7960a3ca66d1298f5c8d42211e59cbf7445f30f61537bb52e3d62819b8e1ba46"; + sha256 = "a76253acf5163d9072b98b3af680d703ee607843b5a45edbeccb489b11c57e89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pt-BR/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/pt-BR/firefox-112.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "239bb21c476967ac08019c463f216a6c0af2ee25a6180f8fea7ddbf98e9e141f"; + sha256 = "8a684ad41338ac94b41a707d222eed00c273bb7dcf7b837ad10d0479984756e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/pt-PT/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/pt-PT/firefox-112.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ace072d1c550e9589ff8fc24d12babb625eb72b87fc8a8dbb772675fffa04a28"; + sha256 = "f4171e6a1bba95d07fbca8ec9a484a2762cb57dc34c4ff7cc2682f8ba10293c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/rm/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/rm/firefox-112.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "933fcbb0cf009af7f6ab8859e935345475a7dbcd64b550ede2ad2ec08b6d349a"; + sha256 = "fb0ae58eb8a6f70cae895aa71ce267fe419ee51df690d53a7860b641be58ca57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ro/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ro/firefox-112.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aafd262fdfd1565babf682ca8f14d536323a56c580cadfc241b85ddbcdcff9e3"; + sha256 = "cd9c0d9b15f879dbc3551cc6907f2bd2dd7ed92d5d27b469cbeb96823a7635fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ru/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ru/firefox-112.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4b0105bf3f127b672caaf6276d7a10484a3d96b1f59d2af08532dd7a7215f002"; + sha256 = "695805e82ece79cfbe226ce3bdfd91fbaa554fb0ba7f3795ea60a61b9e77d610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sc/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sc/firefox-112.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "df94931cc329f8b8ee3013dc95f6636450cc9338a4328d0972fe770b7968aff5"; + sha256 = "8046d5cf96540f50c8b6639bee471996e46073e872dc2fb177240ee98e6464ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sco/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sco/firefox-112.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d456cc9c89b5746a56c5b446a97c6495a55aac8e18a909a55d3403cd6bb1b2e2"; + sha256 = "1b952061abb4a2741e3f279a8013aa01b335689215e4f948ad6303597690937b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/si/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/si/firefox-112.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "99f9511a925b16777df8e1950c56ce68e111bb0ac1eb332e0f7cb6f4de534a3e"; + sha256 = "6eb0d5032391f80ae44f68ab3d2f9cdba3b2c94c4a6d996b32092bc609e478e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sk/firefox-112.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8aadec2e42537328b890bbcaff86d14a194abb2bd850986cac9dcf21ba7f4ff7"; + sha256 = "2070881290efbb99546ddd0255af47856df1829e9cc797de92f9b5828dacbe0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sl/firefox-112.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4af6d8fa4ec9021bddb98b0b97f940f5e8cf3676e1a32549ed52f8dda3101c7c"; + sha256 = "12418dc9321753a3708701f26e57c7ff95b373d77c6ab36746958faab860b1a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/son/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/son/firefox-112.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "77016e2537c61ebbcd17fd72d4ff2164ab6bfa7dd0824245ed088af842381192"; + sha256 = "b7c594000b6f0e226e0fc67847cdee189f12dbcc32eba7b481e2014056e96bd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sq/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sq/firefox-112.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "96f56bee14f7f04bd2996795eb2b805ac45858e7021878aeef9fa4359cfc0435"; + sha256 = "1e1035861d7e43ebd5b92c3066b5709954215b8af64273de52f6cf1b8041f060"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sr/firefox-112.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "732891efa9a44ef318631031ec04e8b7697cb4cb446acbc95ebaa181f3b8f352"; + sha256 = "0d8d9a7ff92ccbc9e45d8d261530d36b7cb80208ba8c47b2e8d6967778dda817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/sv-SE/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/sv-SE/firefox-112.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d36b1964911bf0d9ab1263eaf74aebe6d9c8cf441957758b53e7a89beb95d583"; + sha256 = "ad3c54de9d2c1f242e12cd0d722a766ac028db38657ea01d499ca16ac8b4fa87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/szl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/szl/firefox-112.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4bff66e23e172c3aa559ac30556a4037ad6ed5c677dbdd9600204eea3fc25425"; + sha256 = "cccb19f295dc5b07b52bea083ee783f1a99cc89993e410995d7dc82a3dbc1825"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ta/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ta/firefox-112.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "4903f9b69bb1ca205ea80846cf613bc647895b40af291ed5646678a55e2e18be"; + sha256 = "6a6d808a7738ded579be2e81600cb69fc0a3c2c7450b03f4ee2d278be8417f58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/te/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/te/firefox-112.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a4abc8854330301bc802a3af9cd18417a112f0593dab7d1aecb405dc36ed7af4"; + sha256 = "4b2d3d3836967619f8f2041274070a982357459c101d4131b73f66d50435e2e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/th/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/th/firefox-112.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4763629e8af04123a4e7b8c78d0278865e8d6f89c3f6a3cbe9f651ee4d88e7fc"; + sha256 = "631b7de435649777412b07f11ba1dce788d7bd832684f192bd248d73da17c1d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/tl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/tl/firefox-112.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "497b8b0734acf68dcbcd178b2497cc8ac6035b6149aa6d65d9bb8bbfba9c60c1"; + sha256 = "aa4d57aaa4ff587aa204f73239d68f212ceb12381535b9d5c92d1ed4be649f79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/tr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/tr/firefox-112.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "794523fcee761f9bcb6280b0f128593efdcb09ff9b20d88440a2186119605d8f"; + sha256 = "db6ce989962d930a387b20a15c5a089893550572e502758d2a2a7aa91f1ceed6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/trs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/trs/firefox-112.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "363221e20eca037f4e5634f6d8d4fe5486be98b7f0459357914c55fc6818499f"; + sha256 = "4a0492652933a351943ceb5dc96e4b7f25efedc039d176d61668106257a14468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/uk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/uk/firefox-112.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a32b0eeb5b3129cdae61bcbbb504dcf38642c0e1207a99f548ca6aaf4da4c0e3"; + sha256 = "c18a3f766e06be35fec21617f86e1f1a40e3e05a5d7dfb4a75adb254c4d3fb15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/ur/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/ur/firefox-112.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "fde4b30f65dcf087ea90cdb07fae9a7b25a828de522fd464fa30a6a6e173660c"; + sha256 = "012cff977e3620099a3837bfdc525fb093277c35f91830e886a2cfda7169390f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/uz/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/uz/firefox-112.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8b25e6ee128ca64beeec953984891b771effd17432b5848eccee200cfadfc2be"; + sha256 = "efbc53a94c1e34ae4b36f100d298493431dee41df26901168e2a233229e8c746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/vi/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/vi/firefox-112.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b9c97a1deea781928d37118859211b9294af08e13c816017d0782f454fdb2261"; + sha256 = "43dbef1939a816be4fbead7f7923532485eb70df6a9e8bc4745657b9ebb7889b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/xh/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/xh/firefox-112.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a26e56faa92b9cd893d43db669fb7d48b4451df3e0c7011ba1f37aa509cf3d6b"; + sha256 = "9a1c44a0aaa70a2ab7b7669b8f81712fcdc53673f8d5f262e1c62d2a45217e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/zh-CN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/zh-CN/firefox-112.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "48ad92a48bc034f00b5b100abc8cb548a74afa5330d44e8582d4dc50eaa6c673"; + sha256 = "4df89a6b4c452d9ca32538952ac91758b829eb280db43a5dbecec34b349adc15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-x86_64/zh-TW/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-x86_64/zh-TW/firefox-112.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fc02b6787480605a7e6c388a6e912379918dda5c833a27640ba2b81cd674db06"; + sha256 = "b5b5434fefad06254eb56dc8fc9d953dc9d5c0af92233887119855f7cde0c058"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ach/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ach/firefox-112.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "fd6efbb6835cd3b1940d2767c554b288b947d1621da4ec0f521866ce117d3d1d"; + sha256 = "b970983d12db8f02d710ca3811bfd2509b0b22b493ab5494990534d12fee5150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/af/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/af/firefox-112.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2c8ed270f390281869c1024f2859ed31f8f6eb1cdb25111bcc69a5613c824329"; + sha256 = "c532e7bc844d825163cd41149c52976c6ca81f85d2835e6b2333d8a15fd59ac9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/an/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/an/firefox-112.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "4701be757ce5e6a0cfaa105228cf058393c0dd9b6be17336aa6878fbb51a5bf8"; + sha256 = "3bb4b2e2f9fdd3b5aae43b89d230e245b7dc0cd4e7f47945e90cbe1c87ff22d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ar/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ar/firefox-112.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c4a1fb484d3567a12875c60647526201c181f6caf487d92f344deb7b8175e421"; + sha256 = "bc79bbab6e123f6be02781902a0365ce7089b70858a7b9a914bab1c8f7a3a729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ast/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ast/firefox-112.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "225deefcab138bc85de7692244a3e4a640f1202e28f9471fddc7d3f1dafd9900"; + sha256 = "fb7554cf478257ec1d10a4bf5c10b69dc69a4dd3398dc1f8d0cd40a6886cbfae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/az/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/az/firefox-112.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "cb5974e3710ed6a24a79169daa53bdddbe35942c5bc000d9b3a0ad2fb7664f4b"; + sha256 = "d2c1c8b6ffdf1f7d9f0bebd35b1b7e0b16b4f1351d68340a5dd8e2c9d8c780aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/be/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/be/firefox-112.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "202fb330e07ae5fabe19f4e30fb6e617598b8d79b1485f2355f09c5d4e5e1c4c"; + sha256 = "f50ed8f32389b238593935186a5ffd93505492a156de344f037e19e7c3cc40f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bg/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/bg/firefox-112.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "5a8996968a3bebcfa5dcf9c05f5b819ab0a4463e9e2849a38d301f367f079a25"; + sha256 = "7458787afc0a5364a290708eb443494bc9d2ab32ed098afa22e2eab8966554c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/bn/firefox-112.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1ba44bc65faba2ac0bd66dee11d446caff87ffc45ecaf1a417bcca87ebc6ab66"; + sha256 = "396c8a01c690d6cab7181259092e053e7932216f81debeccdce754b1121300f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/br/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/br/firefox-112.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "36013e74a785dd5f106adcc36721765f6f91ea7553947c63b970f11390d8b5ed"; + sha256 = "659f881e7a56cf971f9b2a4417e8e99f6814b46c4c1ca07e9baf9aa62a7eadb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/bs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/bs/firefox-112.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ca7d6a7ff5694583b20cb10e2e9b5695254245243fe916493bacbc157a8ec027"; + sha256 = "c1ee220a098d587aff9ba5c527459053bcd1029fc2aeef54952bfa84bc3a69f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ca-valencia/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ca-valencia/firefox-112.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3b74ecb0d7a297a11f9f0baa177ef9cdb1bb3c16c0a2f53833c7b247cb52285e"; + sha256 = "9503f081ef3bd96da09565a62ac115e56cb257f77205d780a733ec3f6d114bff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ca/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ca/firefox-112.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c7f258bf9286e5efd49e85dad6483b6bb64f6743d869d5c89ccde1840cb9e737"; + sha256 = "4d5c56c99beba23e0160d8ee55cfdbbc84933007ee454d8af62a211ad2e14a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cak/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/cak/firefox-112.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "75ba9cdf0d382afcb9172c4103ceb14468c0e25f91c1409e233cd471053dd35f"; + sha256 = "5b930a5cc6fabc42cdf959819d62ae3f12cb8cad9ce66a5e97573f427f5465b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/cs/firefox-112.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d9268af6747ae4dd093167d3ae221a5fe91a2c3f78614fed313794727bd0245b"; + sha256 = "fe0cd2d3e820abc55629afca52d4109c940d6bba69d29bf7aaa604dc15ed7c71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/cy/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/cy/firefox-112.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7e51ee320ad6f1f46f9a026cbb38a87d49044b69022faa39a32912c889646175"; + sha256 = "3f5e93445d24765221a94feb938064aa8b64514208a9690dc10ebdef017a31e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/da/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/da/firefox-112.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "574441bb9df851311e86779f0643975266ebf1a8698191c5ae66d06daca6f35a"; + sha256 = "235197b2c87360657afd2f358ed3f0c0f07ce444bc9c85d34585703c301ce8f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/de/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/de/firefox-112.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "402e3a3f52b529e1e16fa5c594235dc80433fc7372024a8e73df57e0597a78bf"; + sha256 = "145a105a27a855f49985bcda9d826cc880aa180b3583d6e1f3f76f0945a6b52c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/dsb/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/dsb/firefox-112.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b7f23e90d48a112fb003829a6f5e7ba26495ba911f80401b7dbfa56da979050c"; + sha256 = "2b9f2b9d16c57dece9c4e9a94603bc4da83fbd76d40de8959f7a7b038f6996c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/el/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/el/firefox-112.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ae6c8b95e69c6ac2055e3055d66e8311f6dfb8712ec9b2103fdb955d351c8a2b"; + sha256 = "50a17dcadef00432c0b28ba15aab55df5c3131e4103b97ee671b4f3c283a236a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-CA/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/en-CA/firefox-112.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e79630b19fddcfafd6be36d9213820feaf6c4f317543495a749699e6c03587f8"; + sha256 = "ff750dc2d42b29d9eef17f29ee9b3d6d0f12cea47d5d644a499efd871f6838a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-GB/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/en-GB/firefox-112.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "56191b9c44c2d8bc6239c01ca9c8de489604bff6b6a38a5d2294f3e71ed9835d"; + sha256 = "6eaaebd3531d3174777bd40abf9b6f920906b7431a662ed7f867f32c5ecbecbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/en-US/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/en-US/firefox-112.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b1d9e8244ddfdfae0d649f874afe2f91e56146ef141287e80d84967e950ae49b"; + sha256 = "4f7e5731799f03e845ba24e9cf459b1580d8013a3ada55e9632feae69ed10485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/eo/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/eo/firefox-112.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e5eb0fbabbcdfa8b833644d5f155faed0345d5aecca49a04c74e6eda618d873f"; + sha256 = "ca610f2eba98a2ff6b6698497d3d1992faf717d517be29321080a1219d860c7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-AR/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/es-AR/firefox-112.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6aca750cd572e1634f76328cb136c40ed6c1b0d95d40af4661c42484b603f15e"; + sha256 = "d0fdbf3021f7acf7d36109799504aed2823b3647cf230c8febf200bccd2c92d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-CL/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/es-CL/firefox-112.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0f05f255ea1f7219ba59b81cb4f955ee85c01aed90b03d2ce6a2594c3fa0b65b"; + sha256 = "8f0f1ea2ff448067d91d279e506580557a5e23b4987887c81d8799dc8535cc5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-ES/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/es-ES/firefox-112.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "b26beacd1f722e1ecec27350a5e426e743c0ac095935704e2a930d2a13ee3f9e"; + sha256 = "433cb4ef6e5c1e367e8b486362af49b470cb45949dc3664f6af319f665b935be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/es-MX/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/es-MX/firefox-112.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8d9239e6ae5f40bf13bb7b097deb0db6d5ba4b85bee304116209e34358ccd3da"; + sha256 = "fbbc4db1fbe96ba2e07c824f5c46a245cfed111ac9e61d823381fa236723e0e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/et/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/et/firefox-112.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8cb6366cd787e45884a381acbf9c0feec34da769c91a13b131ff48552e75d45f"; + sha256 = "3bbcfe864ae19a3f5057ef3f87f2462b40bb71e4f1f5bfe828c36089ab7bbed8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/eu/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/eu/firefox-112.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "06c7856729f040335bfbb88faa933e716d6ebd50e584bc9e036aec05cf62af8f"; + sha256 = "f9f26a6b9a991854694f494057eb4508a4bbc667bcfbf028e6c7a04900f020cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fa/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/fa/firefox-112.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ce29544712a38833c9df54c6de81c3e305de8e12612ce348fba379779c3b3736"; + sha256 = "55057add60209a5539ef7ecf0001e4ba93e2c999dcfa0d8a14d91201f1f753d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ff/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ff/firefox-112.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7b822538f42ac95aefb9ea46e19cd6f5f59b79ad9ee09a6b9d2ddbbdb7ce9a8b"; + sha256 = "98ea5cb9f5dc110efe26c8e8729ab7d63e5bd4ad1d589002e64c5f946fb6e75a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fi/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/fi/firefox-112.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "64e39b57ab5564d5c28cb0332592aedd6d2c793b95e82ece546792d7dfb2687c"; + sha256 = "ff7b43de25f995ba29fafd55aed283f36051037a6390a27f0efdfae392761c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/fr/firefox-112.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "78491283531d63b15b00d980e12d2708be521c2b5a55bd0cabd0d9c293ea8bdd"; + sha256 = "6ec5c36b56cd1f262ed9a23a55d841bff5ecf7688df3cc3ea870b8d8a1acfa42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fur/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/fur/firefox-112.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "e6bf78af33ef8364a50a4de4693eed99ed44da076e5c13ae10d0ba60de313a8a"; + sha256 = "d65d9601dedbf8aa3fe022eaaa824c411b77da9d49cc62422f9487548f7edf29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/fy-NL/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/fy-NL/firefox-112.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "76a511d238f1b1b4bbdaa00442af01d01b561b146c6dffbdbce4ded4052bea0d"; + sha256 = "1e7751bba4321324c5f88b628c43d8690cfcf38083d2d21ed4f26d80de4d26cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ga-IE/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ga-IE/firefox-112.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "39cb4c00166b9b7f460983dde113e59b8a58186400624d563cc0e8eb1e9666a5"; + sha256 = "9f6c1502f939e64c82e244b6d180424cdd1b9c315c7d8a2794d34adcc9aa5487"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gd/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/gd/firefox-112.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "65c7bda40ac1d50b9b07153af2110c50fbbe1fb601426d0ffb4ad176ececfae7"; + sha256 = "e02cacc43e781cc00292aa040d1551c7977c74984508c80f236ff5409ea2dbe3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/gl/firefox-112.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "c8f62afc3c51e4563a06f111019750a0f953abeeb01e2685c93138da6fca1b77"; + sha256 = "7c1d60e0b51d3e8b336e2e1163406ef9a568716216e471ca933309656a4b2420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/gn/firefox-112.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e8c897978b7a943673ce7f45475b5743de57359b4483edfc0e1fc5a39c98c247"; + sha256 = "5d2cf139d73565dd5541f1e0bcccff89f7893b946a3f86241148c932e4c72c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/gu-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/gu-IN/firefox-112.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8bb1463039a243fa72412da9ccd9fb8637c980e48bac95db701380056405ccf5"; + sha256 = "3182a52e21687511dc44c1ed4800a4d374e0a7fd7c10d688c0ebb9fc0ea10af6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/he/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/he/firefox-112.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "453a1e79be7733c1b3e757f63966b66a8e253fe6933d4cdb03078992ad005bb1"; + sha256 = "ff9c300679209cd3441a6b93f1b296a1358a420b233db05335c645eb520f272a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hi-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/hi-IN/firefox-112.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "6e38248bb9c1406c97ac98df120ad13d80d47e84b2038300448bbd248801a114"; + sha256 = "9d252e4264741704f9bd229f0a27e4b645710aa552b3a381f29db4ebe49b8c63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/hr/firefox-112.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "86cf98d857b948f5a154eb0c11eb3c8568cd52b34a1cbc2ebb5317bb4fb1f5a0"; + sha256 = "965a065780922808c4e38c34450419cacaa7e53acd34ff69cfa3b567a2bbbb31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hsb/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/hsb/firefox-112.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "284dfd8803d3b50ca4c872b5823b24719d7a96cd537fa9638404e0568385465a"; + sha256 = "8479363daadcd846f967059c0f141532d958e18c3edaec62b52776eb5ee5b12b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hu/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/hu/firefox-112.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f9c2dcfb3ed57e7edc09b9c3381828b1987b6f7f5fc311ed7bc4d3231ba5dc2d"; + sha256 = "3434a97ef1bcd3f382c88b7ea1e2bb74a94e486f0ce3e27c1a7900d8ed8078c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/hy-AM/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/hy-AM/firefox-112.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fa5474508ade068cf51dd20f3d0ce8fc9e15c5e9df225f4825e93b4ea745d0a5"; + sha256 = "2f572581874b1b160ec399bf575fa972ccca071db75cc8df9bf7e18a432e245a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ia/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ia/firefox-112.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "771273640090beeb82641e79d732ddf37adf84d724b931ad443736c58ff9dd3f"; + sha256 = "1cd6e2e3e3d6ab5b02ed3373d72489ed3258a177170f62e328266b59398341bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/id/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/id/firefox-112.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cf6a81709b810b40aca35f34e81fc9f7a356b83098697980ca9e47fb209797d7"; + sha256 = "a33619620e076879412d6ae8377e2f4d2a4e3ba0d814d4383e7a8226d25dfbf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/is/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/is/firefox-112.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "45b72d161d44e8c84c4938eccfbaeff2fd0bca26132dbafc67bd344bdc0f408a"; + sha256 = "6714432ccb19601d05f81eebca31a990edb785bc7b0e1622ef44d5215d6c6e33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/it/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/it/firefox-112.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f7bcc97abc9fc855c0e63eb36994bcfb0ec7867ec365e4b00c197523f4ea38a5"; + sha256 = "59c4675b245ee7dc31c55d86d203004c0c563340510a3fff42519cbf033c2f68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ja/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ja/firefox-112.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6e0b15e2e06dbf7efce749c78ea4c8e2847b140fb1af0e4fd47cbe24d791c568"; + sha256 = "a0135cb2bdd5e4f5f6ccbdcf789480f1cf8657ebf086438383b199a1d4d05ec1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ka/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ka/firefox-112.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "95d80e66bf4ccc98389eadaa9b4c27a658ee5f3557cba61f222a351f9dd5eb25"; + sha256 = "aa020194e0a2637f77b47a998d2fde77000d13bec4fa734132d2650261e8b137"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kab/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/kab/firefox-112.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5fb3bd857d3ca6f01b70a8b57a01eb0d662e2fa48bfd0384fe83ab504fc63eaf"; + sha256 = "f43944308e1263203e29029f267d15d2818cfc56cd64ff2b7e2967362ff6bcb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/kk/firefox-112.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5291f1066c14bdd2ae0fd4d7ed27587bf3700aaef9d3e492cfd2fa70cc38f4b4"; + sha256 = "0f6f2607eb2d17306a442011ef757ddba8becfb58b52538f459dec4c01b6aee3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/km/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/km/firefox-112.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4f0ea7cc4d8f8cbcb531bf833aefd0cff184f8186edec7f8a9f79863e67ade65"; + sha256 = "0c689a0960f701bc803971cfdb14b678c85f37d3a0309bd7835802c52862536f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/kn/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/kn/firefox-112.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ceef5951674c987373934fda3d9d658f66a4c302eef2cf8048a59ceb6a1ab23a"; + sha256 = "2de4c309f32532312dd634f494cfe2ebaa8581a17b0d3de866821688c72a68ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ko/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ko/firefox-112.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a76f87be07432079ddc9518ac7b6c6ecce4d80ed7d7f9b11b81d4e191a3da33e"; + sha256 = "1ee7d6f40472b17fdbacbf03a4ef4b1b17c0b7f766a18a359edfff38723f9305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lij/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/lij/firefox-112.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "9d128dc913a66b2d4c9723ef96616306c52e2a89fda1c6cf8a84b3e8db5a8c66"; + sha256 = "33ac452d6fcb3dd36e8a950bc8b751ac72e5af4639e48c1e29aca200f1c13531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lt/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/lt/firefox-112.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "8a01dd960b2589f08bb984993b31ab46b424521b00ce05d427759a3dd2623558"; + sha256 = "fba0602a530a9b46a06e527733db7234d50e59bd2e2d523a77d6392020c26c7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/lv/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/lv/firefox-112.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "f8a87f1e0f476764610aa7ffa1f77569f35d6fc191f51da8c0a2d512f881121e"; + sha256 = "c54ef95649e6b7c01a38ade647b04557141857bc6132c48a50523c91c07a77b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/mk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/mk/firefox-112.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "566c249066c839d2927bc8c851fa26e1abbd56b8594220ab0b1b8e2870dba11e"; + sha256 = "b6820814fff826a1fb46cac30c0c9f0943e25ac79e7eeec969122d0104bf7c54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/mr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/mr/firefox-112.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8c13cc845f43a58f417944deadacd95ae097a41b81ae28f80bddeac8464ad7c1"; + sha256 = "1ba298db6f162ba98288655b7755725b1a579192d7f63d96ce35cd0fc9be160b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ms/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ms/firefox-112.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ae4acae5d58a92d6811aa6d3cefc41441a91973d218f719dc1602c6324602923"; + sha256 = "485afb072fb830adf0d0a0b199a4d9a47b0c49e121a1ade0a82e7f2ed9b71ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/my/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/my/firefox-112.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "500ba72bcf205b037638bfad91e852a799b0870ffa79ad7c0dea70a820a41fd1"; + sha256 = "fa6ab9c5b8ad1f785d900d87178550393ac8d82dc9edb591503f35251921387a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nb-NO/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/nb-NO/firefox-112.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "3b46885d4191b2eecd7cd02f014bdc34cc2142913e0dc80af8f967eb6b5a8cda"; + sha256 = "82c0f4324fe3b63253444dd9aa5429bee8ab0fd64da30f6d5b539c672a2896d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ne-NP/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ne-NP/firefox-112.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "c161443c4af482335ba1e92186fe6241d4652be9382f3b6d04dc7e1b5998c800"; + sha256 = "fed05049cb270f84dfdd8701e634ec1a34cae6556032fbe5647d7a03f5ed7d10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/nl/firefox-112.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4c2dff3098bb943b761e00f5f2677b79f4179eb194d1fd09e22c5097e27a0702"; + sha256 = "49a24868626222d8f5c206df8107d2ff84c84dfa3bc5e7785138f35d35c2ade6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/nn-NO/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/nn-NO/firefox-112.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "51de7ca0c7142615f72a60adc7eda0c776c81a4be7298e08ae3577f0d7180d78"; + sha256 = "936eae264ff5786c654fa3f28c44da83f5cf5f10520c1dacc2adf83ecec16feb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/oc/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/oc/firefox-112.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "7bd6b02d7b24f32e5726076b4e1fc4e5872cb12b23d9e3042e26beff07c76f30"; + sha256 = "ea41cc78ed6134ad3d498832cf2a0b839ccfdd51a5550184314ea9e131ddc2da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pa-IN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/pa-IN/firefox-112.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0a7a19e006413bdc77c5230d6c64b523615cc06dd4eb82175beee902c4ad036b"; + sha256 = "e1c3e57b8248c8ef3483fe41502ffe82741eb16aef47bdf0c7a3175aaf95b6c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/pl/firefox-112.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4df4b9e7adb488784f5100d126a4c6ad71bc0d8b4ce0d3ea6e48d7f75d54ef4d"; + sha256 = "49c0f88d7cf6a7e203b7938175af0017f0559d18913a2b074abf987c072f1d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pt-BR/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/pt-BR/firefox-112.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e5546555d191d194a7032547c4fe0bd80b105589306d075afe7a0b22fdbe6d15"; + sha256 = "d337719378272a0a1acd2f304e3ff160d9b57192640f1d0e353f74982aad714d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/pt-PT/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/pt-PT/firefox-112.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "23f09232a8b863eb738af2dabbd1f94567641fc17cba85e3664a2e3182eecc48"; + sha256 = "a8bc6e781c7b182aaf544315f84e2bbf8531eddf0a03c6885e289bd9109d58dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/rm/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/rm/firefox-112.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d01d41c06a2e1772607e6e97396404d19e17d19d3f6cf1ee3c001078ddbabb72"; + sha256 = "4e01c6d3cf70be243440e604a330fd50a77f2cc08838a941c57ff818c847d863"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ro/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ro/firefox-112.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2a3e6306f376242af8cc412ae23abb0cc80b1dd31093680ba89be10496fa4c70"; + sha256 = "07c4d2befa67265e4caa0b8164a5072a8a92b794cc02b86eded81567aa8eada8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ru/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ru/firefox-112.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e541d7b0c8e7c2d808171483ad2b6c074cdea110cb2108161859097657c8c3b8"; + sha256 = "ac2d4ef1052af42ee4ca5a7f3509b373d3c6cf31f74021fe7196d17819f9c12e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sc/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sc/firefox-112.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "eb72cfb24e9f52ded6ad44a3e070f9a6c351a6c1902336b0fa714e3eac7bda2e"; + sha256 = "a05a8caf5782b0d3426159a686a38f7b09e3c7b4d07e6e4a976723a21512441c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sco/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sco/firefox-112.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "07c3eb72214d2b4cac0d47edee71aa46f0b821eb2b6d5bdd0e80c5e12031d160"; + sha256 = "3449a3cbce587d58d34ff82d8a1f57b73de9eacc4bc4b7bbad865bccc5936ac4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/si/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/si/firefox-112.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "07bc2a11048cb769351d1bb9d5a34b8ecb6b9d3c38f9ef678324eb18d223aebc"; + sha256 = "7351bca897aa61dcb258a45d8dc05a3087f6ae648e3db882643aee8768d4aebc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sk/firefox-112.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4ea7716fcc9320d6fd8b760f198bb6ad52129df43395d2b5ccd81a23611d54c2"; + sha256 = "68d384af94ef396c0261030bb5958c51be8578cb4ac1c254b3f46282e939b47a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sl/firefox-112.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4b5aa23325f13265d45527d2f38c14060943a046e3fb0d394dfe2af3903772a9"; + sha256 = "ac34b1450c443a1e0534714a69467392f1ccbbceb3eac3830e66f22f113fa57a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/son/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/son/firefox-112.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "fbbe7a8d06487eb34b2459de48bc0e9f5751e42bbbf3f8e9dd8fd1d99ac45b43"; + sha256 = "c900556a6c84af8accdef8b1a20f811bd26be97665ed89a5a84bdd281d4b3edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sq/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sq/firefox-112.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7daba093868e7636120d0340b0283fcddb7cd88db11c3525771456decb0ae415"; + sha256 = "61d3a8da4dcb987562a1c78b818c4599cf965a1080af0828887b0dc9485b3e53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sr/firefox-112.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15b6c1412c86309a7d86107a771d8c74df497e0a7edc7a6e5bc23b753b47a5d0"; + sha256 = "c03250fc930891c78c87ccf9ce21a16d3d26ee43631f9e01a0d53cad89ae2450"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/sv-SE/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/sv-SE/firefox-112.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "21ffcc5c44079186ffd49ac61c00832118ce39adea2014a6ce79205d16d5a111"; + sha256 = "9ff3baf28c1907f8e41d26721eedaa2a9ab791f53ed6f86c694234e77cc53108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/szl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/szl/firefox-112.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "2d38fe586e4101ac6167080b811f82d8f4cc06c5e5e3e58d5aff2818730c6614"; + sha256 = "d1519b895d5448c2a51cb8319922d4a6c948169c25bc243ec0321d6649e44bf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ta/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ta/firefox-112.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "44137e81b556948cf22ff52b4482185d50ad572410848078854fab6dd1f1ba8a"; + sha256 = "b289fd6cf03eeeb998063a55f0ae1ab1d4bb3b2218311008a72ff7eced4292b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/te/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/te/firefox-112.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b382ab85234da946f364711911efc6152bf7057e8d3a498b1346db815344391f"; + sha256 = "936eb5004e1062a88c7b2293f4de56034a6c53fd456c4af476a2173809e2be10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/th/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/th/firefox-112.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dfa0d72ccddbb62c4ecdb5aaebf2bfe2019293fbb82c4861d496976cbda4328e"; + sha256 = "ee51b633e603e4b712954eb285f597b0a22043aa664f6af92728dd3e3e4f1411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/tl/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/tl/firefox-112.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "84ddccb78c589a725e8c2d607cd7eba65f5dff3fd2acf29d66d0464ff135ed93"; + sha256 = "cffb8d701893ed0c593802bb5cc6d9c32840f6bf3c0463ac84831a348c12ab90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/tr/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/tr/firefox-112.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "041eed5a64b2a2c1638c37fc1a497c976c1c56065f4ce308f46edac9d45f164f"; + sha256 = "e0b9b1dd1fff7f8d271404725e69e620a0638df5f7d8c793b7faf340b4e98c3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/trs/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/trs/firefox-112.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "deff021046e8ea1cbde7d9e8ae2aff834ebcc206f5abf143eb77a3789c191ddf"; + sha256 = "54b97a6cb7abcbd019642e5932deb587836bc70e89f8df9d7be075bf32f2bed1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/uk/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/uk/firefox-112.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c1e55a63ed9cbbf52ab0604d13c4a7e2161c9f1b59a8688a02785cb340e550f0"; + sha256 = "e573cd9026590d288473894b4179472ac8f62bb771fea7ac0a5938741bde603d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/ur/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/ur/firefox-112.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4ea19582fd6b96a2f4617bf499b8c3c07b42ad4cd1b3858cae3698c36efcdecf"; + sha256 = "1f6e02d28e38567be0830075e251390f80d54d083ec84be5f4c7cee94d15d9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/uz/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/uz/firefox-112.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e25aee3dd0d0e219dfc45496022ae52aede9ef757557a532becffaa67f529ac9"; + sha256 = "a636bb65335a32783bf1bd9e0f0814efff83155cc3c04ba32037a51484383987"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/vi/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/vi/firefox-112.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0b292f41a14c89e769aee963d411ed5ca0e29716d2c3793f0525b7f77b1590e1"; + sha256 = "163b7047b8aef031068456ad2fd0f054ca687a475d792b8fda4a63b97d2287a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/xh/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/xh/firefox-112.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "7ff0aa0707c0c4bd448786466cff1d51c38cc00afd88b6582126b4038f109345"; + sha256 = "98996a66340d54d325556a9783b6447d47cb4ad9dafe7bf68e8b952c29cc0318"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/zh-CN/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/zh-CN/firefox-112.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "53f0b6d73fd03fb86283ecb55d144dbb261a1b0d17e1a4a8d3a322bd870d0248"; + sha256 = "06d68807fbd396ae46144c06bf85bb568457a646bca370310745cf3eadfa7e0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b3/linux-i686/zh-TW/firefox-112.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b8/linux-i686/zh-TW/firefox-112.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2f2aa9ba12db48ccfc3fce025e676eee84d23728dd28f2d94ed76ee427410a65"; + sha256 = "8dc10847c3520a2421a088ea1bd5c9c6788985225754f98a92349d1cd3b465fb"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d995760924..b606bdb3be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b5"; + version = "112.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ach/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ach/firefox-112.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "05859db46d62c1c66035a21012f384d7392a42a443f21fae27b1c22519e1a787"; + sha256 = "17af489a91fb1e7aee5cf04b42c1b2991286bfade1e11e7aef59c60bb04b0937"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/af/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/af/firefox-112.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "49f9073e4426000dcdc008a8f9f52edbdcd7f89d0f6af4463e06ad3c70d493af"; + sha256 = "a6978b3206b0df3be81b4b65f4d5982e3b75b56124f570e6660615576b0228f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/an/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/an/firefox-112.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6b07b832993b5142dbd619d8d2e39d7394346be6f1b5580dc6f62fd50226cfd2"; + sha256 = "58b5c298ade02e18b072e95624e275c4080d4a3b45b6cf7065f9db69595edfe2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ar/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ar/firefox-112.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a248911af735ce319b559dd97f87734b54377ad70b22aa51f989433ee809f3df"; + sha256 = "43de9691a3471913f898f0b2fc10918c98338710ebe85b0d79920b91a5cee40a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ast/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ast/firefox-112.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "835f1935904afdd4081d82d6c73ebfe6159fa94acd10dda826ccf0b14b86b54c"; + sha256 = "7e8b92289b007232ee3b11dffe1de397044e8701cd9ee8abf27a86a2c7887305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/az/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/az/firefox-112.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "63f778e01748faa999374a82f72b58342e72fcc159f0b385ad393d96a9bf1001"; + sha256 = "d11d34c740671807b365533905d226430478aab07e782dd3d4565c33794113e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/be/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/be/firefox-112.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1a9652fcd7b34ddddf80d2c4d1f7d13a44e382af722bf5a2d2f3a1a6d328fdb"; + sha256 = "f923e8f985e7cd0f4f1fe099ab616256442e1ea67e31e428fb10971f07c73cf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bg/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/bg/firefox-112.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e90ff246ea24f285a51d10b31957301b6cc9f104d3cbb8913521ed9413449092"; + sha256 = "5f1a36e5e62ae21a98be5f22ee9824476c2eff9eda3d4bc7585323ef818e4eec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/bn/firefox-112.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ee9f1665f8c76806fb8ead80b492ab39756d010ab70703b9a806bd511f5b2e5e"; + sha256 = "21a4855e95ab0d57485dd6d2e8fdf37b6792bfc3b51d0ce87139213c1cca46f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/br/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/br/firefox-112.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4fc531ffe5ee4970e51723f741df9b1a0d32e0e67497c7296302e2aabdb66c3c"; + sha256 = "15c98d831cb8b6edeb43c4a61c309445f6b1f2c2b0aba43ca4c39f33fd7e012b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/bs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/bs/firefox-112.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "374fac7c2633e37e148d75ba8ad919e6f9101d155835f624c3bd3f72a5564c52"; + sha256 = "1574e74d681c4084f59152c6dbe8965de435906787ad47d1cf263538b485514a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca-valencia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ca-valencia/firefox-112.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9a3467b62347a6c022721100f694212b06cdb30d056741bfa393759068352331"; + sha256 = "bb378dd094ec170b93f977772b9f58bd8929811d8e5d2cde79424da8a3ed4398"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ca/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ca/firefox-112.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cfd738a5fcdd6b0fc9f07b8a4c6f85e9f38740af7c797a488aa249d86ce49114"; + sha256 = "4549e130f2e6fe2a836fd04c021554ad94fe9337743944a8f88266965be021ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cak/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/cak/firefox-112.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "0508c53ff3ae20712559c429f676b2dcfc5488f15746a5e802b759ae4b9af92e"; + sha256 = "f85d94fe30f1d2a38be3d1649bb74fd6af39ab9c692b12c5d218c41e952cd42f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/cs/firefox-112.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4f2dac86bc0d29fb86667a93f172a1077e6e18dadc8c9b1c80917cc48d186a5b"; + sha256 = "1da4a1fb77a8497edabc0a61c837380dacf2805e24a4f8c31d2ed06947d4b011"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/cy/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/cy/firefox-112.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "947a766e64dc318162ce24c02a4e53498a8b261807a2e2f02df348aabe6fd203"; + sha256 = "dd858ff9f42d7ec24a7b4798d7ba0a0d16e37cc22cc98b42dda906898fbf1e02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/da/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/da/firefox-112.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "557d3e24d92af23c2d7847aa156fb961ea6d00b677935eb37573e5d10a431e70"; + sha256 = "d6c638422af811a2a9a01a44b24a1dcaf8f4dc918be38d7a0b95d439d594180d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/de/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/de/firefox-112.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b0ace6526a07016e2b8a7413ee27ba282458854eeca0a563977b6a7dc79df517"; + sha256 = "62d60bf0957e43b1a2977a47e010ae78b69b86710a8650badad0ed2d5d4d6357"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/dsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/dsb/firefox-112.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a7d34883dee70a0a1a354b19302af4e0a7dd605294489c3e732322fd9b27d471"; + sha256 = "3ea22409e268745a90cf471ba6f2b40182004d7ae6d87a30d653d76b1ddef12c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/el/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/el/firefox-112.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1dd23fcfa7d21fa0abd534b7fafcde2ebb68cc5d1082849b65ca853e8c97542e"; + sha256 = "dbd5d7828c41a303680ad2cb7abd47f1fe6b147c8c531601867bf8027e75f518"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-CA/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/en-CA/firefox-112.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bb07562373692afbb647ff83293e2c73be125ef3d5865e042f6f068e459df240"; + sha256 = "9254ebdae4e37277a2764c7c36b5aaa0e2ac0b7c99317abf10c80e37192fe6b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-GB/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/en-GB/firefox-112.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b0bd2e1e75672b70e66ddef4d69a30cee469178fea807a76fbd3f4a3b54f8377"; + sha256 = "aea47e6b0ffb720f334f4cc7b9421e630a0f67b81e8b1a91551c4f4737375de5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/en-US/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/en-US/firefox-112.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d367fac2132309c669bb0e4419d27756ad1c500e8f3753d4ea6020eb7f7ad53c"; + sha256 = "f57683aeeb746a9d56babf341a43e90c15aae1942e1781361309d81d539df8f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eo/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/eo/firefox-112.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6fbf9f27f70308525b487d2ae308eeb3c704725113f1c23e03c166c1632452c3"; + sha256 = "70f2375b018e3975c00810e363d364ed774f97d140a8e6750959d7e36d747cbd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-AR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/es-AR/firefox-112.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ff5859cd53d94135463d638ca0ea0cfad310f261dece75342d4860baf9e07832"; + sha256 = "6dc42442a6997dbbaff17f5abca534245aced2646e90f577f10bdd0d73e99f33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-CL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/es-CL/firefox-112.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "22853be89138a70b5a45f1b983bf3d27f872d2ecea8127512848eca9335bc67c"; + sha256 = "ab32d35ff766119d456f0ceef9d63ae88c3ec018d785eb21c7a36e16d08d52a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-ES/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/es-ES/firefox-112.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "495c74d78b711eee03f2d376675547aa1bbcacc93817f1141a1cacb9d7a7b359"; + sha256 = "ffe13c43b3779bb49f544017a6cb9a0b20eb04740259c4b6f6ed6039d9c73814"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/es-MX/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/es-MX/firefox-112.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "cec7c4d65ffd6ce0608f0063c9634f2a9624e0bace5cbe159f9171ae2a0747ec"; + sha256 = "afd8b36f4cc0bee81941bff960559c6f35bfb3e9a754107f92ea2a3e2d0bd489"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/et/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/et/firefox-112.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "99f6dbfce8f79360d5fe9360b5d2f7e8b721ac9de7ddd958e24c8a8c1608a563"; + sha256 = "41033e642e38b08ee338ca2d4f2a7d713bd8f030ad911e8697537750ae267ee5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/eu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/eu/firefox-112.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1198890563e45116380b57ee3ec576458b58935a584ecd561bc05b8750808c1e"; + sha256 = "be2e35990796a7fd15d0bc3afecb26394498969b27a07de7241916d05a451689"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fa/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/fa/firefox-112.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc0bfefb8df93dbf384dd65b23da2ebbc1cc7d3a7c068f72a3ceea58a24e7fd1"; + sha256 = "61d52a82a3c7bdc29ffa3e867dd6020167b52929374cf7f9feda965c8d146569"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ff/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ff/firefox-112.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ad9d500e301fb94c09d3ea334c9590462eacb7732ab3c43ff9184f09d05e3e94"; + sha256 = "d21745467426453ca3e101251459b042a809d34fdbb4b3a2807f31358cae1e83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/fi/firefox-112.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "216540e1c2fc59f946ebb0c3968045f928784fc38873bc96d9f5317bfae56df6"; + sha256 = "9e118fbbc6a5f5b52c15152fa47604cea85dbc73babeca7fd7886b40458be373"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/fr/firefox-112.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "84897d974fcc365287bab6d9e941c03c6aa464fba22b5968e3f5a41d21f8ac7f"; + sha256 = "5685910a6c54908cd523073bf50287f9d1ac928c80b2580f04c48c21c6b1ac64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/fur/firefox-112.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e03d8761e955becb1f6f542e697d7d64aaf90d1abac9ff0dfe0ae698aab91830"; + sha256 = "1259447806fac7cab853299ccc974fd9804d1a36dabc493855fc93962d51ef58"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/fy-NL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/fy-NL/firefox-112.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e0cb84ee39ed5d8b7cd21bd8283e233a0547a98ff703d15ec001bf30049748ed"; + sha256 = "254f91ba6dc56cbc72f154ff098abb4a9030699e567270e1045c48873dbc9288"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ga-IE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ga-IE/firefox-112.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ce2e7c971f787470f38e3b7a96d9670892de6480bb4fe8ac45bcdb0049033265"; + sha256 = "0e8879e4b3a6168317a512c4e1ad514cf90f03a36c6cdc8145f722c39845538f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gd/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/gd/firefox-112.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "461f3d05b8d1b587111c952be55138d54b6747d9340278e0650f4f963cdb378a"; + sha256 = "f4828b8c60b05927fa7b057b9ee2b06ed89013642e8fb7d0baff865ccec03d1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/gl/firefox-112.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "25664e36f13283c637337b94cc7d90c296a854bb21de1f139b6682a2b39503aa"; + sha256 = "687d5d3b2527f039a67cecfa1bb1f9e82e6a6c60edbc68d50b6ad86aaf497efd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/gn/firefox-112.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "360fbd631fdbeb8ebc876920c8346a4f0f4d903ff931014db197b0ed0170512c"; + sha256 = "a5a26eb2740a2cfdcb09c783a4f0d339af0c7999d65254e07688932877aa51f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/gu-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/gu-IN/firefox-112.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "42229ebfea176d3c0bf174115025fe9bd9d0303821618a2843a48364980c87e5"; + sha256 = "7287bc6c3c65a22326d1fa7a52a125b570e4deeb19fafe678b764dc997f0b0cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/he/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/he/firefox-112.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "eef8c9609920d4ab26030e697465c38783f6f8c9688d2f2ead3d6d572d57a8f6"; + sha256 = "5fc656fe148b159f96b7677828299625399a8499a94217f4db3c9a9868c552c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hi-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/hi-IN/firefox-112.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cdf20283ad2698a16c1977c75d1ff424f75008d2166585d41ef92b1293729ed0"; + sha256 = "b3ff74e987dcf5884abf7dd59da541864743f3990a5d4f0af743b2cad5379087"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/hr/firefox-112.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9441a3683dd0a51360ab84d8c0adcf9bad148e37025e6484995bcdc141acdb67"; + sha256 = "4d65ceddd98c1bb5706067ec2b70ea9e9cfae11386f98caa847c9f3762ccedc8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/hsb/firefox-112.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a30c59deb36336392794867d12b4c6fbeaf4c8c2f4e98c843bc96799a877a2e"; + sha256 = "c8fecf26861f75e1887319d07ee2b3bc91cb45f6da4870c70890763a10edfdf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/hu/firefox-112.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4ba34af1efa0f1b52858c200035d696e60417f36ff4884c88fee01e2589eddcd"; + sha256 = "3df8987d32611199d3d8b5de9ed134217b8224ec4eaf9b4655eaca4333038929"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/hy-AM/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/hy-AM/firefox-112.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c20eac2ee61c73b0d5065b7842a4f5daecd3b29d5d508e6aac8512301da428cf"; + sha256 = "162ae6d4296df89b7b70a466b593ae1b3d469c4325f7575284d4d32fb128ceef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ia/firefox-112.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9c5aa72cb38a505f289df411bf458ec0aadca322b19819b6098ff08d74bf9fe3"; + sha256 = "118e51b4d05a62dc0021a90487cece1c528b765477072c6e522da37687bf5982"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/id/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/id/firefox-112.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "46146a6c4fcd09e091202a20b4a352bbc9dacb84d7459a40079f7b95681d6ad2"; + sha256 = "c639987defa98588366bbd6d54ca3893acd03b28558e3eb5672e7e6f1009db8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/is/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/is/firefox-112.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ff47754b70642cc10c151015f67465b4e334945a9d1861f194da6a0ffbd3a549"; + sha256 = "cfab8f71b3dfc5354d5e57f66b9e656c9eb6377ea1cea2e7533559b6784ee664"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/it/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/it/firefox-112.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e67c8c532ddd34cb1dd1195e116e87af8cabae73e4c734614cc8605cf0c2670b"; + sha256 = "74d206cb21ce302d93ec485f76193e4e8b41e0261300b9646215e9ab7acc45c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ja/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ja/firefox-112.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "022aee39de289422088628f9b71de28a3d9b994ad87f489c0f4491e7279106bb"; + sha256 = "c5da22f2ccf61363b2aec0dda134682b7e871c1d0ff0b5609a9467b11b8924a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ka/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ka/firefox-112.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "05ee2bf3ee4c90f879b4410ada592c9feb53df9129df23f711896a5fd9e1d349"; + sha256 = "fb137656c93d6e349978ebe822949fc0f31302337e4293680d358683682f9887"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kab/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/kab/firefox-112.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c50c4992077a7cec127be1c648d431a69bca9f135b247e8d17339716c35c6301"; + sha256 = "d5d7e1066241ad0dbe20cf2bd295956b0b3562a3e2c12208ac72130b99a9f34d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/kk/firefox-112.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "86bb3a893d3a93b54fb7c9de260fce58f33b7157d9ac67f8cf2e1206153d22b5"; + sha256 = "8a2d79dd07373a828e3f756c499ec8db956cb14af4573911f439e007d63f3d11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/km/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/km/firefox-112.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a0b3a731be915fb4a60bd2fc665733bda240596f1a0560139fa2315343b61ece"; + sha256 = "4a2b351fdc09aef91396c3b0bbf1d04bc7c1a0a120a2a0239b17dc985ae64b92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/kn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/kn/firefox-112.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "72a4374de710898854a360c8582c1395bf2956084c0cbaba550c1c0e3f9d6cf7"; + sha256 = "852ecf7e732f544c21535890f6caefc454d3823c22776be9087c971b6dd48821"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ko/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ko/firefox-112.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dccf0da734efcd432d6b3a0f2355e076389abab2195124f47fd718484dc40bdf"; + sha256 = "2083809d4b78d278e07dab56e344027af1d50f7875632c915d162ec2a6c7e711"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lij/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/lij/firefox-112.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5f6be135e9246d5a866c89afab8cd0e97f57153073cb91d9171fc4710a08175e"; + sha256 = "b04bf009c11b574d568233d0b8091bddbacd1c63d17540045e271b87f3c99c33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lt/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/lt/firefox-112.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cbe6953543c0d4ed357e963a4fa224bc93a4a6d7b5df3df6519c10427ea0e296"; + sha256 = "4b9321893129dc1df05b34eb7b0696f0df37d9fc3c43d2adf6489eba8ea05757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/lv/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/lv/firefox-112.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7aa9b425e18a65ea87a1ea8f9c53fdbd6c0cea6c1f8e1de969084a30d4fd3ae9"; + sha256 = "7c155340fcf94d626075c243b1c0c905a187f2d729e9e524a28aec88eb82373e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/mk/firefox-112.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "149e4d575764ad523b63983b36eac28a0966a7c33b0e54e7e525e75f6cad8511"; + sha256 = "4d413977ca0e194e47becb7f5e3f24bf98f4c95b08980399fc36837fb19c91fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/mr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/mr/firefox-112.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7b89022dfa8ec90607844004a82f6c064b768f0ff26bf4bab96c0f46d0c45321"; + sha256 = "967cb11cce490f399d32cc195bc6f986fdade60bc4e537aea0cdcf72a8339485"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ms/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ms/firefox-112.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "efd9c123189f5cba21a1177f245403bd0b40acfef72a8bf696be3221c87c06c2"; + sha256 = "f03287384daa99fd6e665845baecbdedd004e86373a1b810da4f388b9a86e972"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/my/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/my/firefox-112.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7d644179700df173a9111c41f3de5863f5d7d72d0552d2fcd99bbfd129b9a3b1"; + sha256 = "506bbafa9e25d92cb91a4952b3362abd3a6a6ea1da97a78bf71a356e57d5a3c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nb-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/nb-NO/firefox-112.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "233080da37207e934405f033e397d32dee4897b10a96372eafaad1c7c7202b6c"; + sha256 = "480a74d9d2eaed2cb948b670d6ce79f04b1fe79d0bbfd0c35371085b3562418a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ne-NP/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ne-NP/firefox-112.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "df8970e2b5cc7f96f3cbc22ea55d88919737478e1984ff651dc691577bbf27e9"; + sha256 = "68217679f5f888b26cb48f0dc5bc703ea5b55c510b11291159ba0d009255f287"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/nl/firefox-112.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4c36621ccfe5532781bccf8c4b75889db028b4926f955f2f6f69ecea586c0f74"; + sha256 = "5b6052a5848ab13f067e5e0fbd5ec60a4dfcf583d427c0009f5804ddba7a45b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/nn-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/nn-NO/firefox-112.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fb08d40b78af79860daa81c061405375ea119a382abf428c62da5a2688de38aa"; + sha256 = "5787c7b434a4948b14437a2e0582b0434e4a528fb1135f4e0085f4b38cd74872"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/oc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/oc/firefox-112.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "28c50833f976fcd589e842a85e1befdc9272703491bb224048d7ff7ff9c6a83f"; + sha256 = "b76fc6198316c21a6f57cf0935075cb10375192a096fbec0d71ee9663af02f70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pa-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/pa-IN/firefox-112.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e494e1b1e3c2a7847bd45305f98afe3427ba33145f85890ba01664cd383e4590"; + sha256 = "1c0bfec608cd1a5235558c65b8a0c3d76030426bd22823e4545a10a46948c376"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/pl/firefox-112.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "46aa243e6466aad2cf4c9caee954cd420dd5ad095581574d7692f92b7feee57b"; + sha256 = "21599e49147867d566d1cecee76fd94255f889906340817e4b752e9b8076540d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-BR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/pt-BR/firefox-112.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e30ce279396acf88a40ae40ac6831ca3a85d6a1051bc3554b51e8a3285d350ad"; + sha256 = "5734325bbc9ac6c3cb046aaee27ef0fe1b2df96c77e949a3db26cdf46d6204f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/pt-PT/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/pt-PT/firefox-112.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1dbd434d60463d59779a4aea948b7fd694f9c0eeb13d62531c3259b45190018f"; + sha256 = "bcbac61f303a3539a6bf00b6b4effcda03651c1f5cd8ff11fc9e6f5839631b96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/rm/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/rm/firefox-112.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5740e389e978ee285273fb24d12f5fb23b40741c429eecfe44b91f82d27ae414"; + sha256 = "ca8b8a7141bcfe7b6816258abbb16ecdb4640035fa0c32b0c114716ecdad4ddd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ro/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ro/firefox-112.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6c77aed73265b6c74cfc2f8126277c806b2d4f9629cbebcab15ddeae697c5477"; + sha256 = "3d9db81c9d884214c8ec862a4cd26d0db1728d8b7fd1029c265bcbb673cfd14f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ru/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ru/firefox-112.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0b8b9125a9dd6cbbf76e8f1b060ccbbfbae123b537d427a8ec608fef87effa98"; + sha256 = "0898593e4a839fbb1aa93caaccdecfeff86ac1a040734ef60a9e699871771d07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sc/firefox-112.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "08780b4d08bfcfbcb260019e55ceffdce03819e3c50b26f8b0260a854a3f178e"; + sha256 = "e4ac8238c8e14dad49e930b5cb3cc567e5a00f59e23431d9b2ab6ff35dca3507"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sco/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sco/firefox-112.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "f76f8d4975a5803ae59ed8d7429914d0a67782f3c6ebe8de74c21c9b3dc422f7"; + sha256 = "0ef022238a27e40cc32ea18bf71b22af7c40179260c1ea46fb6c84f8077fd392"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/si/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/si/firefox-112.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ddec5b1eda9ff9dadfa28274b237db1e070bba7602445d0659e56b4d83f5c32"; + sha256 = "df054c52cb7525b34b4bd66953814a67a705af695938da812bfe1c8e9d4193f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sk/firefox-112.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7ba092acc5e90f2f0978e3d462946e647e1cfb20fa076f071668ad7e9a575dfe"; + sha256 = "0550a7c651431b0a76c85730363325490926e6c4bde72961b957a888763e0737"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sl/firefox-112.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dbeea39152cfd7515830d7e4a543d6c7bf91768ae39035cf817b2e919c1cc9be"; + sha256 = "5671c6b2d69ff75c86b312316eea458ed69e8a8f775996498694680f194af633"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/son/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/son/firefox-112.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c3b4392bdd6eaf3f7cb4abd769a2389ffd9605b80b52a99a6084973a9c9eed16"; + sha256 = "753bdba1b8820ac13602a333534768c591ec761a2716949b7937094a6403a4ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sq/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sq/firefox-112.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "372d6f5232a746679a3773ba3ee74762427f9b529f9bb681c8359dd0d5adb6c1"; + sha256 = "1007aa39e8332948b1180d1a4b69ae3fb43608a78eaf9552958f6fb9a31ac2b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sr/firefox-112.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "edf3164ba81dae459415f8c41f0fac09372080d3fe413eb282789d3026db8f83"; + sha256 = "52f01f8437fd6ac07ad09a56d22d361dcb00f02af387f951f95463f0802115d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/sv-SE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/sv-SE/firefox-112.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6a5da09f8f5dff0cd147af8b45c341f301b1716b9eebb0cc7bc348124c5fb242"; + sha256 = "9c324d61840eaafe56c72bdab2d46441ba49509a17bf065cd9392da5aabf2f39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/szl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/szl/firefox-112.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "df07280e6be3573342c5421de2e7137e63fbe691590ab9cc442e63827803dcd8"; + sha256 = "983f6e7c5712ac00e578235c2ff176d601d5008cd8b48ca0d796df41645f2c5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ta/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ta/firefox-112.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "44d8ad4cd0dfccef357ef7b2d212a913cafc0433f2aa9a3672fd1df1e2a72c98"; + sha256 = "85331992596010d1e1d7b99858fea5dfee22a253e8e6c6114445b75964c699ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/te/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/te/firefox-112.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "70488686b28265481ddb882ea66ae03309828353a04123d46e33e19edb0f4c60"; + sha256 = "a7370e48ed30489403da41a2c7ee58894964a5c24070cf52094bf5625a60db40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/th/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/th/firefox-112.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "70d3bf27c80954553b88fbdb486b310c19726e5953e91edd159e61fda76de6fc"; + sha256 = "e5aee3fbd315b78a0ca8f132efe8bed0fdab288c6c5f07886bcc61c4bc0042e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/tl/firefox-112.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3126646299c67c74a59801c694e48e5f5402b14a636b4917253259967edbfce3"; + sha256 = "52bf56e9e93fe0779bdb0840ae5de30d668d6827533b51bbee087e9c7e67a47d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/tr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/tr/firefox-112.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2ea8edfff3d4fc495e37d108cd5c8f7d003b929f82d065936a80e6daf4fc7d99"; + sha256 = "2a866984991be3caa0e325698191bb61d6622584346a49a7346f6c2fd0795451"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/trs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/trs/firefox-112.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fb29e43f65dbf2a550c5d25a170be28a05e96a1f4e3e735835be8db111220b06"; + sha256 = "25231c71ad2ba64a01003bd43f2fa5126b4016a87d0ae59a29aaaa7b2199d704"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/uk/firefox-112.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7a3111f74b3bc9333ebd2ce2db0c1d34c55196710bfe628be37924636feccf3e"; + sha256 = "0f1ddd4a25d77298d159287cbb0cd064774d1c6959853556daa2142e9fba6cc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/ur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/ur/firefox-112.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "dcd147e968ce2a97d36a3c2cc8b6c8c224e1f548623c30febf301d1870924315"; + sha256 = "d709c925f899674c749ce9ce26264063602c927546cd5b72d88b67381d0412b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/uz/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/uz/firefox-112.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9421f0b5848d2f15954539d59ae5ec92c4206abb48e608ed26dc5a5c55346b61"; + sha256 = "c0e33667785887eac0f7e72845e4330abe17ef545a1e4cd3c8109e58dc45de32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/vi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/vi/firefox-112.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f3b4f54631e37488ed3444058eed40d060c82eeb67f423ba8a3d500dbfa4ad8f"; + sha256 = "44602876fcce27cc593f87c348221e86f7e0e1670925ed9b947096cfabd0d6ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/xh/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/xh/firefox-112.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ec40e4e8f37f561f8a49a014ef538e7e8d3b78dfa526657cc64f8784ee1f945a"; + sha256 = "baab1cc439d13ea4380d1e4261fa69e014f2982c76df699899bd5451ae551a0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-CN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/zh-CN/firefox-112.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c4f780ebe92916044c71c48cb58e7dc10c08ff0ad7446d01a3ec5fdbf6c04e70"; + sha256 = "d1b72cfa16acfd0d5a7f7e6b4fbab4b9892846cf3d30acf6cc693cf858dfd41c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-x86_64/zh-TW/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-x86_64/zh-TW/firefox-112.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7556349dda4963f88d79a58de2fd2d557411997485bb16dacd90be297c58769d"; + sha256 = "31052fa53e6d6cff9364150ba703780a08608c41e3583b70f83576a0cabb52a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ach/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ach/firefox-112.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8c8d1a43cbb010798570dca68fea1502a8d9ec0711bf3c69c2ddd173a3538317"; + sha256 = "19ba40eac531c96527c501e5dc689bba37626ccd0780ffc722d72effba7a68cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/af/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/af/firefox-112.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7c89e0f7270caf1ef3a69c5514da97cce715f4e3a52ee545ef5aa78cf03dd55c"; + sha256 = "cde55e4c9977bb30d849b8ee793b9ebbd2d3e7eb79ddfe38b893b5d74554614e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/an/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/an/firefox-112.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "355596b7006d114efc0a1c75cde51d01cfda3dfa06bd59fc0dd9ce036a54b77b"; + sha256 = "6702e8e6425664a2effccb37f511c69430e6a0c8763a3ca64c2c01c8f80e0971"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ar/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ar/firefox-112.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c43c434a8f090343dd718d3549860ca6056ea75cd0a805eb74ac44a7475717ce"; + sha256 = "494a53d6f71d6307f9fe315725a2ab1d5a43bea4ced7d294849917a43854ef3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ast/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ast/firefox-112.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c64aca4b338c1633fb0e64f1c5992121dc29908c34d776aa569ebf58fed065fb"; + sha256 = "32228b2fe7b0d5a0466ef3da9ce7fde672e857fbc96cf52d431eaf09b5aa4796"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/az/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/az/firefox-112.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0370b48bd8b3c7f27fa6cc715acfdb0f8d065aaaac00c15250a47bdf7d481faa"; + sha256 = "9d5b9f9e94b0d3b29c1e03a1d9f1d6adf7633c13ae890a69c835379df7ff3e82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/be/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/be/firefox-112.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c12a416339347b843990068f016d1fe199efecffeb57c4555f2fbbe71d6e37d0"; + sha256 = "79d2ada9e2c5060322a90fe0bb1bf43542515b7a697350bc7707c6cc9ef53006"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bg/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/bg/firefox-112.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d0587424301145187f35ce7474485517e9440f3e4c5e92eb3565a97c39c42d1a"; + sha256 = "2eb52eddb7f52c59ebcfd15cb938b82801094f55155f22e7c93d616819072c4b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/bn/firefox-112.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "68cd8fb4716dcb2a10b5c332c10d1f8c47ec79b0fc344275b3ac23086cb0b89a"; + sha256 = "d9ea4347366648b25deb9b6a8a83a40a025cba34a16037fcc84e4f21001b1290"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/br/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/br/firefox-112.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7386b53e5c4eabc0f1ac191b6a93acca5b3fb38ce0f5006a0e94f3050d790281"; + sha256 = "cb2aec673514478bf12ce2a34d908cd1618423d3a6ffdbb7db78ff0d0cdf9ebb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/bs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/bs/firefox-112.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "40686fd813e59c155ca4b08c9bf138be20ec655efdeeea9201f78f7b11615422"; + sha256 = "a1bde0daa1a5f73a3402b4c7857fe8f95655ca02ccc148dbd3cba847dd2cff1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca-valencia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ca-valencia/firefox-112.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b16cd0d27edd8a3477bea72326e9104734c276602b94299b58acdeba10ed1620"; + sha256 = "28be3ec47f35b5a831438b730805b72d15f4ab6e57efd7d5641d731f53cb2f63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ca/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ca/firefox-112.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f0e81d340f00c1ded4df4d0967c1183d4ef18c8f3864fdb520ffa32cec2fabfe"; + sha256 = "9cdefd1ce6ae32cd081fe9598e4e68889af6815bd3551a4997136c66057332bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cak/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/cak/firefox-112.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d6c1545923f780491c3b4d6789b55303c107c533375ffb04401781be56e7315f"; + sha256 = "12d0ab99974502cd1fccd778af3967e653b6c131afa1304571f850b25cbae6eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/cs/firefox-112.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5af2de24992583982afbb684c9c6e58a4d98eb35ee89d6cad6e9bd18bbecb470"; + sha256 = "6db7534e66227a0c51ebaa8e63c8b6c2e26b03d16a89d970d6621982b8cb0d6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/cy/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/cy/firefox-112.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3aa0dfa96a072c9a2a333666e419e000ab36861058b1cbce6abc11d935fa03be"; + sha256 = "1754d144402db4bd231d9cd2a3001945280f107315646b56933484e5dfd14f35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/da/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/da/firefox-112.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6998603e2c5524c38b7b89bec452fc658956b55561c94fc4b0fe08691ec978e3"; + sha256 = "d899f778690a047717c363f4447fffe1c68c425c7ae64a3174ae246a2167afe6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/de/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/de/firefox-112.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d5b59dc00dc63ad988c9db7f770e31f9e5ea68fb15db894dd3fe90d78797932a"; + sha256 = "016888cf4ced56b38c99114f9091c0c36fabdb8db4350bafc06cbe284c68b20b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/dsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/dsb/firefox-112.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "526ac2c06239a7176422bf37757be3117a3b349e3f2c97c379ed797596047b54"; + sha256 = "9f25312ed0687fe6b76052e3b7cadcf00882e066c81ab8fa679f64633cfbc5d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/el/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/el/firefox-112.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9af390e46e28c9a5e3ab3646a04363ae618303d11bdb1661c0d1e5413e5c5b87"; + sha256 = "e9f030b1f1e7225bc175ae0f63a8cd7f3f016db0d48b08a19fc220059115318f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-CA/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/en-CA/firefox-112.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bb012f07f4e13d95d1ab24bebc9c655dabcf5a3d03e2cce578402cbf9274eb2a"; + sha256 = "fe423e6e1ef9bd01d6cac302ff03e8d8593afd0943b1c32884c6e578c6c8a86c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-GB/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/en-GB/firefox-112.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "943f1fe86afa3c0f7ae8d348fc7c80e08a57d5117d1eb4c848b7ca3b75214e1d"; + sha256 = "e5c03cccbf940f00df60d5ba6261ae36248a7ea6a6c1151238c26d3c3cf38372"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/en-US/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/en-US/firefox-112.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ef7b243ce04c41fd438b20522f7f90f47b903c513812606945cf9326ed183cb1"; + sha256 = "790a0ca46dc990cd4d10be661ae593ecf3a862effee72b1249ce36d6f4355b07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eo/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/eo/firefox-112.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3e058915748fa0f50b1b439d5d933ef79f98cc6ff6112fe9a3ea0f9ff34f868f"; + sha256 = "c1ae4807a44e1d70a0db1b4a108ce1c7dd07a3b62efcedd4d95617bceee75ddb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-AR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/es-AR/firefox-112.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e90bfaaa61c2569ecd6090f151cdbf9c2765ef6fe79ec301f23609ee0006f91c"; + sha256 = "0afab6c53c43c37060a887cf8f9b6069038663a6639807379fe27d05c6c4245f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-CL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/es-CL/firefox-112.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9c0a842c4ad9915e2ae03358277dd60e7935c736b1dd04c66795fa99c90a3dfc"; + sha256 = "e44760754abe65ba0dd1d8373108cb2ea7090b2a2320214f55794da48a6e602b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-ES/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/es-ES/firefox-112.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f37a758563eddf6f397785c79bd9233f4dd19a9830562ea821e64123c31cb64"; + sha256 = "a7cb095b06c7e8a471106655fdfa1dafdba772f490bd8e723c98041fe5f1c205"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/es-MX/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/es-MX/firefox-112.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "547f4f9ffce5a7ea5ceabc4ba402eb42ec0ce539e5bd4e51374f2dae17ca7949"; + sha256 = "b0f1b00d4607887e3c7e2ac2f79d80e5fccaf6fb490c02de0b8ae76cd5eb9f2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/et/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/et/firefox-112.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "eff697113a52e31069e4961354eaafe78972dff7a68737fb6153a42780265c43"; + sha256 = "6ffe6e79b41b33dc547d827ac1b04efcfc339e8014ffbc6c9da8cfe1719a173a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/eu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/eu/firefox-112.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b9f9aa5538b44f8365276f54f75bcee5725f915f1d57c2816b09254b8fd1d07e"; + sha256 = "f4c4ba0b68e6be4502ed6dea77640153f2294415c4e9242a36f49d355d80cc3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fa/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/fa/firefox-112.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a48b03b41e7fe9f75b8b596ced9fa45c1f6fd709d67413691b93c53193156e75"; + sha256 = "4e957fcb8a50043838cbcab6b2428dc63ecbb00bb7cad6248b5394359bc0a395"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ff/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ff/firefox-112.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "03b86fe75130b180be97340616f9a5995bcb5e81d9900912fa9a324e0d409182"; + sha256 = "4f7cc3ffa7526d2d22f9bbfe78674a1246501afdb9aada099ef2ce3ac2e0e39d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/fi/firefox-112.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e9c3a886e6491d23631f724058d9d435cc9c0e60de3cb5b33ea3acfa8babb0ce"; + sha256 = "6bc089de770a23b3dad1daeb700955a886475df8fd1095f093075bd008df00e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/fr/firefox-112.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dcb7513622428d5c91f32667a055e61072fe0d5039545bc683194b36d6bb49a3"; + sha256 = "8b811e21c72d0cc554abf95827aa907df88d6cc4002672d7282ca2b5af11de8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/fur/firefox-112.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "33fdd12569cf1b8eec60ded795559286e7cfa41b2db58bfd9c7f4887000a6b82"; + sha256 = "1680f9d84d1737711768ce9ada322fa3ec6bbec79ea1a8c6edf2c4ec85ad9938"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/fy-NL/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/fy-NL/firefox-112.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d95f0bc82184d007d55de86caaf84ac442ba56c840b6798dcfd5b8cc2854c4e6"; + sha256 = "be23299565a467e3e862e6f71844b3aa8f40e264b00443d2e2b840316626dd4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ga-IE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ga-IE/firefox-112.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "48d23034a37bdd46385b9974eaa4569c080b4a873e00e33be0abcc8e945e1f42"; + sha256 = "b5c18bca50a1eacee1f9ebdb7a576b40a6093d8c10b0a5710e513600de4a38c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gd/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/gd/firefox-112.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b1facf79a7b6fc22d75307954dbb189a72644ee665a2d8dba1706b5421c6e96b"; + sha256 = "2e71cd3e17307c3560ae9555036c9f7b679b11f63d762864bc8445415e761700"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/gl/firefox-112.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "769315eb7186ef37227a43a96ee2a67634d9020f47fef673de9dafa66a2d7436"; + sha256 = "9334887af196701f92dc9847107d551fc71a67a73db3832dded090f5996d50d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/gn/firefox-112.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "fb48fe024c20a025084fbe6f261f756b2b609b72ffc59e9645b0bb88ccc00746"; + sha256 = "4c3bfa47d5109a41f0a03623c00ea0278d5d102f5d6a038ca19d77b66b0857a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/gu-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/gu-IN/firefox-112.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5854e070c36bd433025d60c28ddcfd3ae73dd7f4787198dafb6b1e917cb3975"; + sha256 = "70a645e53a8ae5d6d75a1dea9f39fbe98d2b3d9900f7a950dd58dd517d6ad8dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/he/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/he/firefox-112.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b71d3776631872e549ac310638b51828c8b1b7a600943c73d65b5e9121e10b9e"; + sha256 = "8c07417e24fa214a42826ed3a7691ddcac8c68a89002708ad583f7f88caa6626"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hi-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/hi-IN/firefox-112.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "61cb5d112085b4185ba21ce1277aebb43701970404a632cd255d2b010a8ca5dd"; + sha256 = "8b7bbb05a2ad5062fe30ebd9060d60fd0991b7c5bf6860d2f3e26c47b94c580e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/hr/firefox-112.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0b3151de29c64199f4be91dd499f4e5b142dc5832fce7465b5ac709b103d2c06"; + sha256 = "7a43bb2dc5f6559f96674fc6b62518b69b0e18bd06f790b7a885197215c521a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hsb/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/hsb/firefox-112.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7935f0cddb2f8d79fb3295b286a5ac8a62f5dfe54b72aafa7ed4d90cd09e7e81"; + sha256 = "c846bceea79f6fc2d5f473be853716e2043f99e86c2eb6933b82df9616d7db62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hu/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/hu/firefox-112.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ef39a9bd38c4e697b2acfc385e4f4b6bf64ee5196530a1f96d922a80f5e96811"; + sha256 = "52f0cfd6e53b8db6a30755bcdaf8ed9cd3dd6c37f1793c7fd8b762ca24f790d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/hy-AM/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/hy-AM/firefox-112.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e4a35e4eb59270c98784fd5956d7576703b8d6f374e63ff99f859b4618a0e957"; + sha256 = "e8f66e48f27585e6d95b6b2dded296ee9f44a81ab3c8cfd5cec5e2c1198f855b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ia/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ia/firefox-112.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f9f6c8df9633b5b04212ca108115b32b7b7d670e105e5eabf971ab6c87ade854"; + sha256 = "7a3c27576c0a2a50ee16e1dfcc17c8aad8716a7a58439b214dadb79fce141882"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/id/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/id/firefox-112.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fea802d675e2ccd2b389e81d3ef2766fa3083ece7a68450f33914421fe8081b5"; + sha256 = "5ff427d85fae28533e10fba5ce365565bc723a5201324b6d25fd22312e66ce28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/is/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/is/firefox-112.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e2a5ea9a8cfe0d769c9b61f5a452e144973017c2e65d6ad03e190413c04a2430"; + sha256 = "eb6d40a42a7a7a0200a4eff0983f7dbdafd249e3297361ee24da0404e3e547d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/it/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/it/firefox-112.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "211864798e0ff9fb06f10fe9e0c36ab5617ef5447cf24d03b5127f3a456a6249"; + sha256 = "b35e50f348d955adc6d481e3793c18e70deecddc377cc2700b599eed3c4a0028"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ja/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ja/firefox-112.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad7dba75cc991240315eabd9c99a3d643c8cc9d403f679162961be5c7f9da198"; + sha256 = "7c420e49f4fab80048a27566c031011bc04f6bc4e953c3aeccadbbe8406ea063"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ka/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ka/firefox-112.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9a27a1b23da7c17881466ee52f0fd55de6069fbac45721e74c575a65d39924c5"; + sha256 = "7297a55e1510524ae75f3068f91fd4f4f47e5bac7e5d6f788df56a4d506b64e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kab/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/kab/firefox-112.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f9b89268fb6cea643117779d845ca607de48b680c8331123ff9a2213a49c6aab"; + sha256 = "588c879af41b7156f3d392ac52d20462f37a08ed0db813be4654893cfd796a24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/kk/firefox-112.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b3995abef49360a373e73d612683a9de37df9da3172f754855977b2a350f02c2"; + sha256 = "d14b902978d837b67a2e6b03c4b58c1decb7955ff99724251d3a8cdc069621a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/km/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/km/firefox-112.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b113f611be572fad8d707ef089d1113a840f47341960b0180ce8c8d958c0fac1"; + sha256 = "0fefed1e3f6769846a41fc9a3ea7e72af4363836ff5ceab5b3a675a61ef49c6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/kn/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/kn/firefox-112.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "43376fca7535feb95e083abf2cd695d452cb7c3d9e5136d617340f37bfd695e1"; + sha256 = "ba09f158d3ae03955090eefff59324f78ccad9627453710da4f6fd079a8f5840"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ko/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ko/firefox-112.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cab18f93e0ca6b56d5bbd269e33fc80e16e8048a359d81d6e272582c6c6e9a76"; + sha256 = "b92972ca074f3680cd342319383aa32fcf149e543d91e995c31b362ceb1cd83e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lij/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/lij/firefox-112.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "69c0416f559a64bb806ae7e3eca236ec13621cb8ab634e1aea901fdcb80180d6"; + sha256 = "a7e2cdb06f27821ec1ae4f890406ce375efd8aa2f80dc3c79a48bc9342190b0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lt/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/lt/firefox-112.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ab662f5812d14e544255c1e708b9c1961ad6d9d37de25986aa4069beb568d9a2"; + sha256 = "3908be16ccee0924d5a93c2a8f45d1b99f2113c50b8a72b278f50ffbfc2addff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/lv/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/lv/firefox-112.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "39ba8132bb0178ebf707115a2a3c6a6eb2bcda82a3132a21ca8f8fc77f861312"; + sha256 = "b9de936bc8ce2487522ba25101c8ef3a259bfafa43e623c9be880442710d2351"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/mk/firefox-112.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "124b53c31c874fb32f7f006dd48332d44bb9a139947e52952eeb484d17247ddb"; + sha256 = "15baabc1d559ab11bc886e78798662c763c61f30c141053d9867139d1e9e58ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/mr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/mr/firefox-112.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "58e7e6b526f00187cad5e032323c39d4efd58a9fd8e2e0a6ca46eca4f45e1c6f"; + sha256 = "d92bcae2140ca878fc8b8dabd65ce3f757cb80c0db65518e9d3100436e833d81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ms/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ms/firefox-112.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fe19152b27b2ad3ba6bcaa127713a0a9191f7c81529ade02e48817f5f6cc12c4"; + sha256 = "305fe064288cceea5d076979cee54070d312ddd66e268b77c89afd006af0831f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/my/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/my/firefox-112.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6c39c38301d6e5d845c4a4ad34685d8017cb874665aba823e62cce651b388f56"; + sha256 = "7fe5769ebba170c7a1300f8edbe2630da52024d5dc5d70d2d50f762827d7d919"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nb-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/nb-NO/firefox-112.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e297b652111781206672b3c6191897080c3d6dff63e74f7f62c6a0f4292a3389"; + sha256 = "d4c35b1041aec3c0c17ad1b160b979a1f4e525ca3276cf0cee28fdccffbd3b09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ne-NP/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ne-NP/firefox-112.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9d25913a2e07c874ede15a3849b396586a32b614ef29087774f244c40a33225e"; + sha256 = "20e954fd4db01ac3964619b515516951f8451a75d38fad4d25bcaa18d1be6514"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/nl/firefox-112.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ed3398198b475c4c369a340dbdddb687bdd8b5e0c397e981b3f2489d6e575447"; + sha256 = "cfe937d1d66d12be29319ced0843e8f9a7f1056f811940ef402b2cf147b2ec94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/nn-NO/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/nn-NO/firefox-112.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "91376b1de28595e2050fc0c56024cc89ec4143b590c51612218c2a822860834d"; + sha256 = "fa5a38fa4d4f4ef13ecf8a9f38c92b47284447a59a3ae0950499e0df9e31b802"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/oc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/oc/firefox-112.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4ef41fadb4b297b781c8a24fd64302e6e348b455101c5450d9b3011e3bf1d638"; + sha256 = "3118e44232acbd4c683e1a82fa3176dbca95be86969b97e8af13c9abe79e8690"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pa-IN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/pa-IN/firefox-112.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ca8122bcee87fc1384ea0ebebcf501e659987c58bd8a6a2a54f78681ca6df264"; + sha256 = "243b0eb9504cc0302c782fbb49bebd8589ded1e7cf3e45ba7e60e2c11e49a7bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/pl/firefox-112.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6e9835f4ccf62810d4e9500f05bfe7b9be205b8103be642ded328bc85aa84c21"; + sha256 = "92084c1b3433540bfacacdd3f935362040624d1d3caaf9a7c229642ab8816658"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-BR/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/pt-BR/firefox-112.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e9dd785fd994226e747586ab38a2bc503760938180c0aec1e3966ac35776cf85"; + sha256 = "f0f9e02b2bd6f855927590de281d6295c52eae977291db3aa0b26a1a52610fca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/pt-PT/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/pt-PT/firefox-112.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9f37f69dbdf6748da01c3fa9c581e44184091ac0ad85101da7d58f7115a3cdc4"; + sha256 = "7b3ca497bc431e95f7294af77aaf44c0ffb15d64bd300a0d7922c63e28c00db5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/rm/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/rm/firefox-112.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "752b66437a1684c36847ed36f65005e9ca4156b05c93dcadcb842370792ab252"; + sha256 = "e8586d48a3cc34ff65101f2efbd9cd11f7882a1f5b398988897bd3993b760f62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ro/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ro/firefox-112.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3c5e8aed8dddf11964e3070d539377a82e63827ef1517553ae784565a0c241fc"; + sha256 = "3d1e601101adc5bc0a133016aa4a81f031978baf801b954f5111df42f404ca5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ru/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ru/firefox-112.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b626cfce29b6bce883513057dc4571a489f5e0c392c7222e9853cac419923165"; + sha256 = "92cbfea52dbfede42e3f608d76fbb92926f2f434ebb7169918756ad192c7f6dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sc/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sc/firefox-112.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d96abbf55494f33262ba3edf2552b96ba71defb0318a36118a8cbd26dd3ec4a0"; + sha256 = "5cf569eef6215430f0183336793981ad848b5fc3f7d818f977f80a621710c656"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sco/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sco/firefox-112.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b352cf61ef75da6f2ec0c8fd6a16e90aa72961a82ceb7a014dfcb0a9ba35277b"; + sha256 = "958aa0ced431a5439fb00e814a21ded3b4946d000c2b2d6bee01b653b53b4f07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/si/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/si/firefox-112.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a4ebfa843e140b8b7015fc6945dcc166211882662f00a6c4eb27d2334cb2fc97"; + sha256 = "e084915795794b370df66642ab14dc92ec2d58678f97c1028ca9ebfe415b3867"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sk/firefox-112.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "83d58804619b82afc9431d048c16cd3738dfa75bf9d6e069b1f020a2b628df1a"; + sha256 = "5fab3f2d0f74c4cea615f85ed5ae5d117574df580737aa04c7427973719cf387"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sl/firefox-112.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1c36099781dc219b1cca5d9796f3df67f0a10412c7dc494f2a8cfb53e4668ee8"; + sha256 = "388d1668ba5c8dde895fd123843db413eecbbe752f2d8fa0abeef6ad5d1d5ce5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/son/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/son/firefox-112.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4f27373905fed3827c1b74ce3de095d435e4dcc9a163d40690e072cbe42141c5"; + sha256 = "e072e2f4422d6465b6715e9f1c97d391f74b9ddec44aa442b623e71d3ecbfbf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sq/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sq/firefox-112.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5080273f3461bf27473fbd4d435d5efc50f6e15ed7cb382f000db313a4df49d7"; + sha256 = "494afebb067452da4645fa70fee084d8dcae0a093aa877d72afa9e877e8c3785"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sr/firefox-112.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d8589c74b96f1a162d1d37c9e280216af7769cb7f08c151a530fa1d44bf6311b"; + sha256 = "29a3a46ce32271fa6bf561618638f34edc563656dc0a89c389c6e488662f4f24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/sv-SE/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/sv-SE/firefox-112.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4026373c960ffc40beda3f9dd04b13d274d751247abe23631efe517b57ea23d8"; + sha256 = "57a8803cc353be8533b6b7fbd002c10f7c8beba0f3adee65c16175a6f3a1cfed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/szl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/szl/firefox-112.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "697404cbd67c589db561ebc2261fe15af6f272609d17cc5ecd6c434d95cb55e1"; + sha256 = "21e13a69edd7035b8c8de29e6f8f8573ec113e149421dd3cc83d31155c43ce9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ta/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ta/firefox-112.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "187b26a699a3b7f4182433ba6a458420434137ae44fa662eb88e35d592de1dbf"; + sha256 = "db90e7e3c78d4a6ef821f122a43d312d7a62597f5d4b5fe4b0bc5c14cb463576"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/te/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/te/firefox-112.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c21f404ae4626101fa63c7c5fb06a515ad76f5113196f8d5490adb1556808d80"; + sha256 = "f238bf9e63817873afdad8e740020d9d9d024237f3ef9796fafbf7b57b65441f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/th/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/th/firefox-112.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8623f5d172c3148faeb0e67ee22aed2586dba858b3c8283ad8f5a05ab32d493a"; + sha256 = "f1946a59a6ad7fe3d1cf62a47f8893c1f1b51262115e95857c7c675f17bbf6bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tl/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/tl/firefox-112.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b5609b75505ca2a27839ec7519eb4f21f2d84f8eda89b6b76b958b73c7b5e5cd"; + sha256 = "5570570c0bb53643fb04658b57607c8584a738ea732994c52f859ba00461c17c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/tr/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/tr/firefox-112.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8239a21e49341ea63dec6e000d7854925b8885550148f1bdeed190fdacd54627"; + sha256 = "6eb0276bbe9b12e6c76b6f938cf56487ead0e094351b8ad2678973509ceba39b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/trs/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/trs/firefox-112.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e7ecd2309bb66c2b635430e6f001c742d4e67eccc7d3278d64ff0086481ce037"; + sha256 = "da3567165a93b03dbad8333bfa5b3108dac118576a1d3ee7ee994ebb65534207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uk/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/uk/firefox-112.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "15eac212a24278055f27bbf9bb7d2bce298ad40d8474a09a64a8d6a82253a730"; + sha256 = "c1f689e8dcf525055ee96ab7eab28a917fd608493307cebed8f9d42c368e919f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/ur/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/ur/firefox-112.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "5d59b25da307aef5d9baacb68059d04e5125e9f8c9ad72d229b6f59aed2cc856"; + sha256 = "28b79ab763cad9d6f8625c6f79ac1858f40e339ac2f4278c605070e93a7fba85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/uz/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/uz/firefox-112.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b66c8cc522829e6415bf452542d792946c62d6911ecdd8977dc36854a96bb59a"; + sha256 = "2ef98d582aa77f0175f1e2e18428ce66b16518e839095f9ae9d3d7a80758db4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/vi/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/vi/firefox-112.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b24e0038f2f8147c9dfa79acfd195e5ce8cfe27f5d7ace9a591a21dcda8889a5"; + sha256 = "40b16fcd14d3f31c4996be68b23986665d410a51989b474fec47d434787fc856"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/xh/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/xh/firefox-112.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ba5d40a5cd4653e3f3381b25dee1c7a579986fa187e6a1c9fd6d81bd29c0a73e"; + sha256 = "5ad3e7a48251b4d905b99cd2110db5a2533c27d53c3dfe757680b4e1cda1f37d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-CN/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/zh-CN/firefox-112.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5b978f0f36e894eda54f0f690edc7e1fa156b898d550e747a8c5b712bbe2846b"; + sha256 = "4f01df45be46c709c78765d851c69acb970ded5648d334ad7588ee4e3e2e6668"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b5/linux-i686/zh-TW/firefox-112.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b8/linux-i686/zh-TW/firefox-112.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7d4b52012de5cd28dd21b89c04f2ed1f392fa8637c07747e34619812daf40146"; + sha256 = "a18112b679d66367cb1acbcceb3ada2740ec468e3bcf1931ddbd48f0d3567405"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index d3231f98ce..0faef12c0d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ rec { firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "112.0b6"; + version = "112.0b8"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg=="; + sha512 = "6f63380e9b6ccf5d1c17bf4d9ee6997744354c1bc818fad7555cc1761ca798a0493cee5f451c477d32a9acdc04134d8f7bdbc40e83e001d671188e74af1db8d0"; }; meta = { @@ -56,12 +56,12 @@ rec { firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "112.0b6"; + version = "112.0b8"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "sha512-UJjZ4HFaO6XUpFt+d61KXdliN3FW0BDHFpwt4f6/pv6Rv10mxeRUnGKZDomoLwv+yCgN3EKDZ+iPA9FzkLxZCQ=="; + sha512 = "a77504bd80022bd0c908d2c6b59781f0d71d65e92be001bce993935b6a55775369bf36829c2979912f4d920e29e63c043b93c5e932669674ff47140e13a9519f"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 3e66ac90e9..831dd2c81e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nix-update-script , cmake , pkg-config @@ -18,23 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.6"; + version = "1.15.7"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-V9zrwSAflatGcN5cOOzHyyW73FN3rU+l5xUlPwy8Huk="; + hash = "sha256-p6L2Ak8QaRsSs2/Xjbbod9UFy79vjO5C+YcArofe2Ck="; }; - patches = [ - # https://github.com/skyjake/lagrange/issues/589 - (fetchpatch { - url = "https://github.com/skyjake/lagrange/commit/e8a4dad6930d16aa0811d04d06432cd6b59b472e.patch"; - hash = "sha256-60YPmZPalnoo9AjwqKpswHkKAM/hKSIOapgPwSi4Qzk="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ the-foundation ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index 63cf728a0c..8b05992828 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "111.0-3", + "packageVersion": "111.0.1-1", "source": { - "rev": "111.0-3", - "sha256": "09vb9vi9rrm5y8ym21g52lrbbp6w4k6qpk9q13k0vxzf26wmwk5n" + "rev": "111.0.1-1", + "sha256": "045nisl000ll0pzir9zhrkbbkl87bsd38mygx7gz9kv6p0pppl7i" }, "firefox": { - "version": "111.0", - "sha512": "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82" + "version": "111.0.1", + "sha512": "b16c9399a19cb1de2d865a023d54fbe71c23a363ea4d36cd58f41f64f7ad04bc1b9d8a8448943417516e17337e0ee2afd370c29a72b51b0947161f4ffab6935f" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 685bd7e42a..a2eda0dc3c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation rec { libGLESv2 = lib.makeLibraryPath [ xorg.libX11 xorg.libXext xorg.libxcb wayland ]; - libsmartscreen = lib.makeLibraryPath [ - libuuid stdenv.cc.cc.lib - ]; libsmartscreenn = lib.makeLibraryPath [ libuuid ]; @@ -131,10 +128,6 @@ stdenv.mkDerivation rec { --set-rpath "${libPath.libGLESv2}" \ opt/microsoft/${shortName}/libGLESv2.so - patchelf \ - --set-rpath "${libPath.libsmartscreen}" \ - opt/microsoft/${shortName}/libsmartscreen.so - patchelf \ --set-rpath "${libPath.libsmartscreenn}" \ opt/microsoft/${shortName}/libsmartscreenn.so diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 7a9e694214..c60a867055 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { + stable = import ./browser.nix { + channel = "stable"; + version = "111.0.1661.44"; + revision = "1"; + sha256 = "sha256-ePViYQZUteMBkV7AkvsoQwPVxibMB68LDWgg7d82iIE="; + }; beta = import ./browser.nix { channel = "beta"; - version = "108.0.1462.20"; + version = "112.0.1722.15"; revision = "1"; - sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm"; + sha256 = "sha256-Ba6f5MOBTtY8bUxCcMySQCWqDvOiI1hLnuwcIspReq8="; }; dev = import ./browser.nix { channel = "dev"; - version = "109.0.1495.2"; + version = "113.0.1741.1"; revision = "1"; - sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw"; - }; - stable = import ./browser.nix { - channel = "stable"; - version = "107.0.1418.52"; - revision = "1"; - sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day"; + sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 231a858ef4..c361fbd07e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "32.0.1"; + version = "32.1.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-lz9Ok8i95pVfl4UHy2zWFe9vwJocUvDbueiWdZuz4Bo="; + sha256 = "sha256-yfXcHoPdTknryYFV8mBWHvzs68oELqsJjTC/nT4SMB8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index b955f2ebdf..f14201eab0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.5"; + version = "2.6.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-+3d20bD2sxck8fCrMv6Z9O70g7iWdHA5FdFVoLDtY2k="; + sha256 = "sha256-KvnKz+NxCiCqX/lDsm4YdrUmtK028D9KM9Ke9mxiZQw="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 020277a33e..0b36e75d9b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-r3cSHiNlWrP7JCqYOy86mn6ssfDEbm6DYerVCoARz7M="; + sha256 = "sha256-gC7HdOrmOIYTaksx/CxXMt4wIly3RBL1SsQRbwQWLi8="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-9QQuFrICfYLkoObNFsIn3H6brcv3qXL3FIguQMZ02HY="; + vendorHash = "sha256-BGUaU8p0C6kN8l3b27WQjfWP1e2LWD1KLWNsJdyEuRc="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index e27ebb58bd..dd389a374c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.5"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-e6rs7cCSZiklMtPiFozea6EqRylepD2gfoDqQaUuly4="; + hash = "sha256-K67TpHpA4gCyJbdTKKRGnHzY+gM3wN6GIxxfFW+zyYI="; }; - vendorHash = "sha256-VPeaT4vPhBa6V+Ir+vNRIWgyVBzEgTDSnDtGrxxdZ0c="; + vendorHash = "sha256-b3bvLkBl8I/MJe16fRvjpYX2MbZhuG3loACArtZ5mg0="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix index b75f850f73..10db281796 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/eks-node-viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eks-node-viewer"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-utn0OJX3NLCyAV4F01GIkvh/KFPv7vfLQMwso7x7yCw"; + sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8="; }; - vendorSha256 = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A"; + vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A="; meta = with lib; { description = "Tool to visualize dynamic node usage within a cluster"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 016eb40745..5433622c16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-b8U7zVvzewSxqX7RG7+FMAVytW4s2apNxR3krNJuiro="; + hash = "sha256-ccP3t+Q4aZviYw8by2JDiuKHt7o6EKFxBxlhEntmV5A="; }; - vendorHash = "sha256-z4hNGswxRMU40qkgwY3n516FiyaoeDaAE+CCla3TMkk="; + vendorHash = "sha256-4x/8uDCfrERC+ww+iyP+dHIQ820IOARXj60KnjqeDkM="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix index b52cb70ca9..f795f53bcd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -47,10 +47,10 @@ # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.2+k3s1"; # k3s git tag - k3sCommit = "ea094d1d497b26538b61b5cbc27c1a4a1f2f3f24"; # k3s git commit at the above version - k3sRepoSha256 = "13jrxr0imgkwl7bay4rrq9iv7ipak9hlmn82x9shr63hihlw7z9l"; - k3sVendorSha256 = "sha256-4uIOjHStU/DZk6YBdfC0F4L9z+csekMTjENJKpMmgx0="; + k3sVersion = "1.26.3+k3s1"; # k3s git tag + k3sCommit = "01ea3ff27be0b04f945179171cec5a8e11a14f7b"; # k3s git commit at the above version + k3sRepoSha256 = "1wpciikmr4l2nw92i3wlz301vxjiyz8rlzkn8jhzcaiifykc565s"; + k3sVendorSha256 = "sha256-1HFLj3zSHV7RvA0fsQ/dPzwnkSRqE9TXXDA4m8OhwZE="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 @@ -67,8 +67,8 @@ let k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.15-k3s1"; - containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd"; + containerdVersion = "1.6.19-k3s1"; + containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.26.0-rc.0-k3s1"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix index 6bae729791..a34c8634e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/GoogleContainerTools/kaniko"; license = lib.licenses.asl20; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jk superherointj ]; + maintainers = with lib.maintainers; [ jk ]; mainProgram = "executor"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix index d9a8e0693e..4ac7a163b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubernetes-metrics-server"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "metrics-server"; rev = "v${version}"; - sha256 = "sha256-TTI+dNBQ/jKt6Yhud3/OO+zOkeO46CmUz6J6ByX26JE="; + sha256 = "sha256-hPI+Wq0mZ2iu4FSDpdPdGEqgFCeUdqeK5ldJCByDE4M="; }; - vendorSha256 = "sha256-lpSMvHYlPtlJQUqsdXJ6ewBEBiwLPvP/rsUgYzJhOxc="; + vendorHash = "sha256-BR9mBBH5QE3FMTNtyHfHA1ei18CIDr5Yhvg28hGbDR4="; preCheck = '' # the e2e test breaks the sandbox, so let's skip that diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index ade54ae4b7..288e51a5db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-FHSvouD/7jZ70O3td6HLqXlOhMDbKPwqTy41Xwijyk4="; + sha256 = "sha256-R+08s8oQ/ZbaDwyYBshtot+g9OM7XAM6wZPf287wngg="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index adafa76ddb..18dfd6f2d3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-wVgfT/1o5Hz7xbX3OOfjF2P5bhV7kPxnXZOU/3erRpk=", + "hash": "sha256-dOdq/At0aUTaivvm557sgPwxC9EfRBexYrtpri8tzg4=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.1.3", + "rev": "v4.2.0", "spdx": "MIT", - "vendorHash": "sha256-wz1Wy/4GI8/Wlu828RX7OE+XJHzCS/X45tW3Jb7Tx3E=" + "vendorHash": "sha256-QDO/xE9ZK7+UscjVBV06BMGavExD248PhLIrDB5oROU=" }, "akamai": { "hash": "sha256-j9KQWgcBjZiQrWjRdhQp82GawF/U6Y469MKN5V2R6xU=", @@ -73,13 +73,13 @@ "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-nxNZ0W8tcnnUhqf2S8tM6CvupYS4ALamYg3zYZQScA8=", + "hash": "sha256-fmIbmjXOwIvtNMNQHtg3ucKzwXdh0do8DW5c6iYlil0=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v5.0.0", + "rev": "v5.0.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-KgEX0h+WgcVjMMgNb5QJJNQjqAxQ8ATolVXZBro+adQ=" + "vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk=" }, "auth0": { "hash": "sha256-y2pjk+rSLAM7H4XjwvwZSNFW4+9EhN3fb01cml6RTb0=", @@ -182,12 +182,12 @@ "vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI=" }, "buildkite": { - "hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=", + "hash": "sha256-Sy0MbPbTunc2WmSLTuek72hg+PP+2YE3RO/J4dEm65k=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", - "rev": "v0.11.1", + "rev": "v0.12.2", "spdx": "MIT", "vendorHash": "sha256-C7bm9wDNEO7fJuqssUxQ4t9poVkPkKd8MU7S9MJTOW4=" }, @@ -228,13 +228,13 @@ "vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24=" }, "cloudfoundry": { - "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", + "hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.5", + "rev": "v0.50.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-2ulAzgDBdcYTqGRmEL9+h9MglZ9bt5WRXzNP099g2kk=" + "vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE=" }, "cloudinit": { "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=", + "hash": "sha256-hJHErQ8vDY9c1uaqiLYdxBns3U3XvAGKsobH8fit4HI=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.1.0", + "rev": "v4.1.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -438,24 +438,24 @@ "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g=" }, "google": { - "hash": "sha256-RLWfaJX7ytU8xKcXUp+ON2//rO6R0cw0beXdiH9E3SU=", + "hash": "sha256-44Jbh9PiSNJNpshL0G4zz/5U73Y28C/eLGlJ1GTMITk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.58.0", + "rev": "v4.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" + "vendorHash": "sha256-ztoWOiqyOrusSo0peigEV9wy2f387gVGfcolkYoJvhw=" }, "google-beta": { - "hash": "sha256-O0BQSeS+XDCq82q0aGwM0GlSfByMugoOQLWXenlO8fk=", + "hash": "sha256-5ywjtlJCCw+Vzj22op7tm5xVj+QOqGIg4Paw8t8jFAg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.58.0", + "rev": "v4.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2dJAoDisGQOE21NBTjbFPM0hAYjHqo6QH/ONiHQU6hk=" + "vendorHash": "sha256-ztoWOiqyOrusSo0peigEV9wy2f387gVGfcolkYoJvhw=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -485,13 +485,13 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-ebkd9YbbK2nHjgpKkXgmusbaaDYk2bdtqpsu6dw0HDs=", + "hash": "sha256-FrZdypcyjF3DMWHIb4ijYfbI2VcFeZMu5QJlZt4EMSg=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.36.2", + "rev": "v1.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/dsiIxgW4BxSpRtnD77NqtkxEEAXH1Aj5hDCRSdiDYg=" + "vendorHash": "sha256-WDnaUBTf8KTCuTdjKd598azjCg4hPDzrrijRknkVV2g=" }, "helm": { "hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=", @@ -765,11 +765,11 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-Ibc53R68QOGGcFFXkMZXCPFo6H8nvQ5VYq/DXdLnBEA=", + "hash": "sha256-TVWV3RRd3onNTHfWNbJpxm35LKdTjzN0bu2LX3ZDuAM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.18.1", + "rev": "v3.19.0", "spdx": "MPL-2.0", "vendorHash": "sha256-dEbJTeHWhfR+8o/s4fi4I0sio1uuh6OIzJhVF5Rup04=" }, @@ -820,13 +820,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-O4ZTGYM9r3XFzr2Nx/Tt2Fs7WOqQuQWfo+ZMmZyg+mo=", + "hash": "sha256-j4tOWcY3x4FpfCEdB7x5XP7Pqms97tYtEvGDn8Fjst8=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.44.0", + "rev": "v3.45.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KYOzbbBjE2C7+1St62rs9mlJFhpIlWQJ0reh5V5tQsk=" + "vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -1027,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-cgh93oDVlV+Om17UdJyxzHqhKwy4d41TBcPV5Z3FJig=", + "hash": "sha256-rNKb1jmpVmId2ftuQ/+cCYyRNGmdsQj5UswRrVxlMe0=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.59.0", + "rev": "v0.60.0", "spdx": "MIT", - "vendorHash": "sha256-vxJGQkrbGITool/45JpBqdqrlSeP3xeWMkSLmFh4K+s=" + "vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" }, "tencentcloud": { - "hash": "sha256-N6x3CKpLL62lc+V038740EGBicjroc07KhkvyCYgn24=", + "hash": "sha256-Lf6IKNdl7eiFBdCSbuXaawMno7grlIQBwM99sg75sS0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.18", + "rev": "v1.79.19", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 215e3a7818..4fc379ae23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -9,6 +9,7 @@ , writeText , terraform-providers , fetchpatch +, installShellFiles }: let @@ -28,12 +29,38 @@ let ldflags = [ "-s" "-w" ]; + subPackages = [ "." ]; + postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ --replace "/bin/stty" "${coreutils}/bin/stty" ''; + nativeBuildInputs = [ installShellFiles ]; + + preCheck = '' + export HOME=$TMPDIR + export TF_SKIP_REMOTE_TESTS=1 + ''; + + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 + completionBash = "complete -C terraform terraform\n"; + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/zsh.go + completionZsh = "complete -C terraform terraform\n"; + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/fish.go#L56 + completionFish = '' + function __complete_terraform + set -lx COMP_LINE (commandline -cp) + test -z (commandline -ct) + and set COMP_LINE "$COMP_LINE " + terraform + end + complete -f -c terraform -a "(__complete_terraform)" + ''; + + passAsFile = [ "completionBash" "completionZsh" "completionFish" ]; + postInstall = '' # remove all plugins, they are part of the main binary now for i in $out/bin/*; do @@ -41,32 +68,19 @@ let rm "$i" fi done + + installShellCompletion --bash --name terraform $completionBashPath + installShellCompletion --zsh --name terraform $completionZshPath + installShellCompletion --fish --name terraform $completionFishPath ''; - preCheck = '' - export HOME=$TMPDIR - export TF_SKIP_REMOTE_TESTS=1 - ''; - - subPackages = [ "." ]; - - meta = with lib; { + meta = { description = "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = with maintainers; [ - Chili-Man - babariviere - kalbasit - marsam - maxeaubrey - timstott - zimbatm - zowoq - techknowlogick - ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ Chili-Man babariviere kalbasit marsam maxeaubrey techknowlogick timstott zimbatm zowoq ]; }; } // attrs'); diff --git a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix index 5f857caee9..1366bfa7fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-O6dTbhnZPWd7BKMwaPfUOPwcvwzQoHUKR9Zj7uKqtGM="; + hash = "sha256-i0mLyTeosGlnTpKvAUS3wDvBRFpgmnfmKXAtCnAGqE0="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-nJA83SfMv+5xKKyJTtaSRsro1XR+3sNiszBeXRRY5NA="; + vendorHash = "sha256-zX1rQ9RDBkzZIbqCDlFEgseYyKYUHYyGFApZqhOrkGU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix index a45fc62cf1..9aaf19d75e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.21.1"; + version = "4.22.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-mzCtZE4mira/ZeyfujBh+cONq1YbCyLIypiIX0kTVJg="; + sha256 = "sha256-MM2fTONdgvCOrVlMlBgpaoaZLbuSMVG/ENOx2egug98="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index a84a0d8c28..23d07bf8cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.29.0"; + version = "3.29.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G6vDHnHb7IYQZxSZTBOTDcTcVB8LTvFCBB9Um7TWqdA="; + sha256 = "sha256-sfmdOwwB3X3GFTg7NNAh7mi+fu4YZy9+c5Co3qaVo1o="; }; vendorHash = "sha256-nOgb8UNDhumMyYu1v55qflYrU9HE8cWSGdfLqIAm/w4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index a93391bbbb..e2ef900ffb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.30.1"; + version = "2.31"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro="; + hash = "sha256-e06QsfcAo/iYlvtdYZ8hX0EIMCDcwRrsJGjUxCrthUo="; }; - cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78"; + cargoHash = "sha256-MJkiC+UoiO4DiSvHLAklBdla+RmMYaxA/8oXNblYMF4="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://newsboat.org/"; + changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 5bc6e9be80..e7c548c67d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -17,16 +17,20 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "GNS3"; repo = "gns3-server"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = sha256Hash; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "psutil==" "psutil>=" \ - --replace "jsonschema>=4.17.0,<4.18" "jsonschema" \ - --replace "sentry-sdk==1.10.1,<1.11" "sentry-sdk" - ''; + pythonRelaxDeps = [ + "aiofiles" + "jsonschema" + "psutil" + "sentry-sdk" + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; propagatedBuildInputs = with python3.pkgs; [ aiofiles diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix index c9b2c4a212..9a8062521f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.58.2"; + version = "8.65.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-z6GjIR9K4OWFuQTGBbP05aYFNa2sD1UW4e/GW01xj78="; + sha256 = "sha256-/1qYC2JCbgiR8fGL9R0mnRm8fY1DbAKhkjkDwEENWsA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 807444696f..d8f7e72b9d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY="; + hash = "sha256-AvYM8++PqKmm7CJN5hmg9GSC72IoHX+rRxuT3GflvjU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 804deb10eb..b7becb715b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.25"; - ptb = "0.0.39"; + ptb = "0.0.41"; canary = "0.0.150"; } else { stable = "0.0.273"; @@ -18,7 +18,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "LoDg3iwK18rDszU/dQEK0/J8DIxrqydsfflZo8IARks="; + sha256 = "AhiZXgkXG/lroG7XAgcvJ7r5PSvzMFhamsxB1cXJOak="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index 92164bc068..c3de82e62e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.25"; + "version" = "1.11.26"; "hashes" = { - "desktopSrcHash" = "Fd9I/tYp0ArXo73zfA85JZxZ0MvmVFkgEUi56e19zNA="; + "desktopSrcHash" = "4dRKqmwXngIQk10ahhZfl6LHw/4bvBOJPgdiTd77XDI="; "desktopYarnHash" = "0zlh75f2k1yd9mc9zq2lrm53n91npl771ds79n3m04nbihn23xzy"; - "webSrcHash" = "AYZJMGO53usAH2MiS5BeKt1en3XRncE/zUqkd3gWPx8="; - "webYarnHash" = "0kkyqgyc8k8rih024r72iagbj66f5x3h6b3c1cij474sk7ab2x1c"; + "webSrcHash" = "visqcaWzrzRCu0Vky7wjRdwhTbPXsiv5QeQRatNbc34="; + "webYarnHash" = "07q4gdn8dsh5w862a99v9c0cbryajznjcsm1wvqcs18wpf200xd7"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index d80d2b2f4d..a9e27186fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -7,7 +7,6 @@ , python-magic , markdown , pillow -, urllib3 , aiofiles , notify2 , dbus-python @@ -17,13 +16,13 @@ buildPythonApplication rec { pname = "matrix-commander"; - version = "3.5.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; rev = "v${version}"; - sha256 = "sha256-/hNTaajZTyeIcGILIXqUVbBvZ8AUNZKBDsZ4Gr5RL2o="; + sha256 = "sha256-NSoMGUQjy4TQXdzZcQfO2rUQDsuSzQnoGDpqFiLQHVQ="; }; format = "pyproject"; @@ -45,7 +44,6 @@ buildPythonApplication rec { python-magic markdown pillow - urllib3 aiofiles notify2 dbus-python diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix index 4fe0cc054b..58b8d0d731 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nchat"; - version = "3.17"; + version = "3.39"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; rev = "v${version}"; - hash = "sha256-BtWKt8paI0gCGSzLYN8x3Yp5MUpwCb2vBGcGQG2aumY="; + hash = "sha256-ZV2vpXztvBDN66OPLpO/ezLB4+/3NOOs1Eky8uXxBbc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix index dcfe5424a9..32d34787d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -20,15 +20,15 @@ }: let - version = "3.1.0-9572"; + version = "3.1.1-11223"; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb"; - sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb"; + sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY="; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb"; - sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb"; + sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index 91a424d9eb..d449ae7db8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -23,12 +23,12 @@ assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.9"; + version = "2.2.10"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "+lMbIx1Y/h8wztoO1iZoPqnr37ds5H74uyfC93Qiz/s="; + sha256 = "sha256-TXc/IkIveQlve5S1e+5FZUrZolFl27NkY8WClbTNPYg="; }; patches = lib.optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch new file mode 100644 index 0000000000..572619d515 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch @@ -0,0 +1,21 @@ +diff -pru liferea-1.14.3-orig/src/common.c liferea-1.14.3/src/common.c +--- liferea-1.14.3-orig/src/common.c 2023-03-23 20:36:21.000000000 +0100 ++++ liferea-1.14.3/src/common.c 2023-03-24 23:34:08.971922545 +0100 +@@ -85,6 +85,8 @@ common_init_paths (void) + common_check_dir (g_build_filename (g_get_user_config_dir(), "liferea", NULL)); + common_check_dir (g_build_filename (g_get_user_data_dir(), "liferea", NULL)); + ++ pathsChecked = TRUE; ++ + /* Install default stylesheet if it does not yet exist */ + filename = common_create_config_filename ("liferea.css"); + if (!g_file_test (filename, G_FILE_TEST_EXISTS)) +@@ -95,8 +97,6 @@ common_init_paths (void) + umask (077); + + g_free (lifereaCachePath); +- +- pathsChecked = TRUE; + } + + gchar * diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 7a3802a596..f67bb6e416 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,13 +24,18 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "aXgw3MwleHDw2yNbs5Cin687xVTLxeNwBt94c1b4fXQ="; + sha256 = "VmEyGXrePdnRzRldSOOfiB55KBu7w9x4Y9vA8gufot4="; }; + patches = [ + # https://github.com/lwindolf/liferea/issues/1217 + ./bug-1217-segfaults.patch + ]; + nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix index ac0aeba972..ebc105147d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/opentracker/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "opentracker"; - version = "unstable-2018-05-26"; + version = "unstable-2021-08-23"; src = fetchgit { url = "https://erdgeist.org/gitweb/opentracker"; - rev = "6411f1567f64248b0d145493c2e61004d2822623"; - sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; + rev = "110868ec4ebe60521d5a4ced63feca6a1cf0aa2a"; + sha256 = "sha256-SuElfmk7zONolTiyg0pyvbfvyJRn3r9OrXwpTzLw8LI="; }; buildInputs = [ libowfat zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index 8f44d79f81..403b0bc9e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { ''; homepage = "http://www.transmissionbt.com/"; license = lib.licenses.gpl2Plus; # parts are under MIT - maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ]; + maintainers = with lib.maintainers; [ astsmtl vcunat ]; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 5dc7779e12..3cac4a2dcd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.0.18"; + version = "3.0.21"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-0gQnMhjwW2NEJwafqndStQ33dIu82lW6ntXFRCpbmm4="; + hash = "sha256-aRzVXmAWRifIGCAPWYciBhK9XMvsmtHc67XRoI19VYU="; }; - vendorHash = "sha256-lHMcVcaoBwjE2ikEZPeZexC5XvhkAtvHnDci7UAa4vg="; + vendorHash = "sha256-zCE4LO6m4uyOvSzhUbzH2F9EgDs0UZH4eCl6lfRjIRQ="; nativeBuildInputs = [ pkg-config ]; @@ -38,7 +38,7 @@ buildGoModule rec { ]; postInstall = '' - mv $out/bin/Desktop-Bridge $out/bin/bridge # The cli is named like that in the upstream repo + mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge # The cli is named like that in other distro packages ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 7c0b8dc074..ec920bf37d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.53.0"; + version = "2.53.2"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; + sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 952851b08d..0ddf1fc8f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -1,4 +1,13 @@ -{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: +{ pkgsBuildBuild +, go +, buildGoModule +, stdenv +, lib +, procps +, fetchFromGitHub +, nixosTests +, autoSignDarwinBinariesHook +}: let common = { stname, target, postInstall ? "" }: @@ -15,6 +24,15 @@ let vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic="; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + # Recent versions of macOS seem to require binaries to be signed when + # run from Launch Agents/Daemons, even on x86 devices where it has a + # more lax code signing policy compared to Apple Silicon. So just sign + # the binaries on both architectures to make it possible for launchd to + # auto-start Syncthing at login. + autoSignDarwinBinariesHook + ]; + doCheck = false; BUILD_USER = "nix"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix index e73f438f76..52d3c56617 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "unstable-2022-12-07"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "dc0c98d22423b496faf0a86296a6ec0bb3b3e11a"; - hash = "sha256-z0xD11CB7Vt8k0dPXE+E5ZD9XAFwWNxjnUs25/Gd7zI="; + rev = "33402b7c545c5a92b7042369867e7eb75ef32a59"; + hash = "sha256-duSEpd2GBBskoKNFos5X9wFtsjRct1918VhZd1T2rvU="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { requests six wxPython_4_2 + yattag ]; # "running build_ext" fails with no output diff --git a/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix index defed4dc43..f4f049818e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dump1090/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "A simple Mode S decoder for RTLSDR devices"; homepage = "https://github.com/flightaware/dump1090"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/calcmysky/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/calcmysky/default.nix index 3b66284e8b..bff3f39e89 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - rev = "v${version}"; - hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4="; + rev = "refs/tags/v${version}"; + hash = "sha256-QVKyPyod0pxoFge/GAcle9AWXPCLR/seBVWRfs9I9tE="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 89ba8bf0e9..c3880b0b1d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "stellarium"; - version = "1.2"; + version = "23.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-0/ZSe6QfM2zVsqcbyqefl9hiuex72KPxJvVMRNCnpZg="; + hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 3740d4e392..81fab07ecb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -53,7 +53,7 @@ let "8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd"; "8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is="; "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; - "8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc="; + "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/glucose/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/glucose/default.nix index 5a0873b53f..512f0414f1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/glucose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/glucose/default.nix @@ -1,26 +1,29 @@ { lib , stdenv , fetchurl +, unzip , zlib , enableUnfree ? false }: stdenv.mkDerivation rec { pname = "glucose" + lib.optionalString enableUnfree "-syrup"; - version = "4.1"; + version = "4.2.1"; src = fetchurl { - url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz"; - hash = "sha256-Uaoc8b7SsU8VQ7CZ6FpW3RqSvjfm4+sMSh/Yg9XMUCk="; + url = "https://www.labri.fr/perso/lsimon/downloads/softwares/glucose-${version}.zip"; + hash = "sha256-J0J9EKC/4cCiZr/y4lz+Hm7OcmJmMIIWzQ+4c+KhqXg="; }; - sourceRoot = "glucose-syrup-${version}/${if enableUnfree then "parallel" else "simp"}"; + sourceRoot = "glucose-${version}/sources/${if enableUnfree then "parallel" else "simp"}"; postPatch = '' substituteInPlace Main.cc \ --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" ''; + nativeBuildInputs = [ unzip ]; + buildInputs = [ zlib ]; makeFlags = [ "r" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 1b5a0622f4..057b242e60 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-wks3oecJ9mDQl4eH6GszSAPNKOwXaJzzbd/zgAc+omE="; + sha256 = "sha256-ALMgsRFsrlt7QzZNv/t5EkcdFx9ITYJ2RgXXFYWNl1s="; }; propagatedBuildInputs = [ cln ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix index 8fd2644ba1..ee6b781d7d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.6"; + version = "7.7"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-x9sXLuHd3nfVM6sL/5yAzIoTVkf1LIUnbhx2WlD/OS8="; + hash = "sha256-6Q9DPnlGKb31QYEGpm78ISfbj90MeLD0/2k2fDZm7cM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix index 3caf160108..70f5a4a61d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0="; + sha256 = "sha256-0aUm7sgBLTPNSJuH6/xsTDZKUzAI87wPI2G3WSi5SGA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/system/booster/default.nix b/third_party/nixpkgs/pkgs/applications/system/booster/default.nix index dda41f2453..f1e55644fa 100644 --- a/third_party/nixpkgs/pkgs/applications/system/booster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/booster/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "booster"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "anatol"; repo = pname; rev = version; - hash = "sha256-kalVFVBb+ngoUpm+iiIHGS6vBVLEvTVyKuSMSMbp7Qc="; + hash = "sha256-mUmh2oAD3G9cpv7yiKcFaXJkEdo18oMD/sttnYnAQL8="; }; - vendorHash = "sha256-GD+nsT4/Y2mTF+ztOC3N560BY5+QSfsPrXZ+dJYtzAw="; + vendorHash = "sha256-czzNAUO4eRYTwfnidNLqyvIsR0nyzR9cb+G9/5JRvKs="; postPatch = '' substituteInPlace init/main.go --replace "/usr/bin/fsck" "${unixtools.fsck}/bin/fsck" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix index 4189822d26..69b1f299f5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "git-stack"; - version = "0.10.12"; + version = "0.10.14"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-stack"; rev = "v${version}"; - hash = "sha256-ghH3wmXLPzJZ4lNXFwEGKD89r7xaRMXUe9kGHm7MC4s="; + hash = "sha256-DAvvVI3npHM7ln/EAr0RjtUCqCoKx9QHsCw69F8C8p4="; }; - cargoHash = "sha256-5FXcReXgq5LFysPGBuYawFdkYAgRHsW+p2Ytin4+ZxI="; + cargoHash = "sha256-KDVHSCQx7qIS/Gwx/wlpdIMgirPSfG535dvu33gjF7c="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix index a39a1fd79d..8532231ac8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/src/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "src"; - version = "1.29"; + version = "1.31"; src = fetchurl { url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-Tc+qBhLtC9u23BrqVniAprAV8YhXELvbMn+XxN5BQkE="; + sha256 = "sha256-m00CG96w5olzxitxzTE2RLAQniUm1hhHpFmSaVgvDt0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix index 7a163040f9..7d64d97889 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go2tv/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "v${version}"; - sha256 = "sha256-jzQLQCD5kAl7G8S8ihW52JuQ/d5Ma+LQwznBGLI3+Ac="; + sha256 = "sha256-t+T3zerFvEdMYoe8GYSCGgwiXw528Lrs/EjPsXr6I98="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index c156ac288b..a3acd60b43 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-xtIcIT9lWw73Et9WgyEUznwy1X947Rv5nTiM+t0qYaM="; + hash = "sha256-4rEUA8V5WgAVyBeUT0ALVmj14HaAgeASYd2YiBn8MC0="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix index 49aa6c00e7..d4da46cfc8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix @@ -1,34 +1,35 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, cmake , alsa-lib +, cmake , ffmpeg , game-music-emu +, libXv , libass , libcddb , libcdio , libpulseaudio , libsidplayfp , libva -, libXv -, taglib +, pkg-config , qtbase , qttools +, taglib , vulkan-headers , vulkan-tools , wrapQtAppsHook }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (self: { pname = "qmplay2"; - version = "22.08.21"; + version = "23.02.05"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; - rev = version; - sha256 = "sha256-UQf1aJGoUlXBo2lejw8A3lF6rFOKK6LUGDxRY9207Dw="; + rev = self.version; + sha256 = "sha256-ZDpUgD9qTvjopGFVrwTBSEmrXn+4aKq2zeqoTnXwmI8="; fetchSubmodules = true; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { pkg-config wrapQtAppsHook ]; + buildInputs = [ alsa-lib ffmpeg @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/QMPlay2 $out/bin/qmplay2 ''; - meta = with lib; { + meta = { homepage = "https://github.com/zaps166/QMPlay2/"; description = "Qt-based Multimedia player"; longDescription = '' @@ -69,8 +71,9 @@ stdenv.mkDerivation rec { files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 browser. ''; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${self.version}"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix index 82a09bbaca..b20d73d7c0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix @@ -16,6 +16,7 @@ , gst-plugins-bad , gst-plugins-ugly , wayland +, pipewire , wrapQtAppsHook }: @@ -41,6 +42,7 @@ mkDerivation rec { qtmultimedia qtx11extras wayland + pipewire gst-plugins-base gst-plugins-good gst-plugins-bad diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index d5fb7df67f..dced2dca53 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -6,17 +6,18 @@ , installShellFiles , util-linux , nixosTests +, kubernetes }: buildGoModule rec { pname = "containerd"; - version = "1.6.19"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-Us7NEv2BngV1Q/Bkuv4XOjVjpqThL0LnIH+yciPG3L8="; + hash = "sha256-OHgakSNqIbXYDC7cTw2fy0HlElQMilDbSD5SSjbYJhc="; }; vendorHash = null; @@ -42,7 +43,7 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests = { inherit (nixosTests) docker; }; + passthru.tests = { inherit (nixosTests) docker; } // kubernetes.tests; meta = with lib; { changelog = "https://github.com/containerd/containerd/releases/tag/${src.rev}"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 073237f421..cd27ceef5a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.26.2"; + version = "1.26.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw="; + sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 9b910fcea3..7cc4f13d79 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.17.0"; + version = "2.17.2"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-4gKVKnAMuwDv+PYbfFjl+8lO2ObuRb2Iflz5Xa/SNgA="; + sha256 = "sha256-cPvbPvrTUMN/JYGXLat2obsulicCn0uasPdiRxtuJRg="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-xvyIEOyRCpd6xshyMMaRWQczhUVvI5wIN91wVpbT65s="; + vendorHash = "sha256-XQZZEfS9ZrR/JKa11YWowsWhO8f4MVBmGkDhptMs43E="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix index 64c933a5d3..66ab59e58b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/firectl/default.nix @@ -1,19 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "firectl"; - # The latest upstream 0.1.0 is incompatible with firecracker - # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82 - version = "unstable-2022-07-12"; + version = "0.2.0"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = pname; - rev = "ec72798240c0561dea8341d828e8c72bb0cc36c5"; - sha256 = "sha256-RAl1DaeMR7eYYwqVAvm6nib5gEGaM/t7TR8u1IpqOIM="; + rev = "v${version}"; + hash = "sha256-3MNNgFRq4goWdHFyqWNMAl2K0eKfd03BF05i82FIzNE="; }; - vendorSha256 = "sha256-dXAJOifRtzcTyGzUTFu9+daGAlL/5dQSwcjerkZDuKA="; + vendorHash = "sha256-rD+QCQKgCZU5ktItV8NYqoyQPR7lk8sutvJwSJxFfZQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 2de8989830..4143c21218 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eAniM4o7TshGhO5jGrCZz+Rs5n5Q24tvIWMWebKAWAs="; + sha256 = "sha256-q+NMV0GagcGeUb+WD8BoFjAKJWgzBSq/POqwPUADAUI="; }; - cargoHash = "sha256-0Y4hHuWB7NY7rRJImNIrxlEffrT9055ThQGqJlMeDMM="; + cargoHash = "sha256-m9CvMorM7uX6OOfVCtM2pZPgRcKm7fVoTk/SCt8FXyU="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index b060c62904..f60c9626c5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.1.5"; + version = "12.2.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - hash = "sha256-CffJg29qM9ex1RAq5t2dE/GX8ud9TylQbYiwBkh8nxE="; + hash = "sha256-ikodKEvlg+QU0af8IjiMjhMyQSV6icHVUczf0rWfVaI="; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix new file mode 100644 index 0000000000..e574bb32ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, yarn +, fixup_yarn_lock +, nodejs +, makeWrapper +, copyDesktopItems +, desktopToDarwinBundle +, electron +, makeDesktopItem +}: + +stdenv.mkDerivation (self: { + pname = "podman-desktop"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-desktop"; + rev = "v${self.version}"; + sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${self.src}/yarn.lock"; + sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA="; + }; + + patches = [ + # podman should be installed with nix; disable auto-installation + ./patches/extension-no-download-podman.patch + ./patches/fix-yarn-lock-deterministic.patch + ]; + + postPatch = '' + for file in packages/main/src/tray-animate-icon.ts extensions/podman/src/util.ts packages/main/src/plugin/certificates.ts; do + substituteInPlace "$file" \ + --replace 'process.resourcesPath' "'$out/share/lib/podman-desktop/resources'" \ + --replace '(process as any).resourcesPath' "'$out/share/lib/podman-desktop/resources'" + done + ''; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + yarn + fixup_yarn_lock + nodejs + makeWrapper + copyDesktopItems + ] + ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; + + configurePhase = '' + runHook preConfigure + + export HOME="$TMPDIR" + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline run build + yarn --offline run electron-builder --dir \ + --config .electron-builder.config.cjs \ + -c.electronDist=${electron}/lib/electron \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/podman-desktop" + cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/podman-desktop" + + install -Dm644 buildResources/icon.svg "$out/share/icons/hicolor/scalable/apps/podman-desktop.svg" + + makeWrapper '${electron}/bin/electron' "$out/bin/podman-desktop" \ + --add-flags "$out/share/lib/podman-desktop/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + + runHook postInstall + ''; + + # see: https://github.com/containers/podman-desktop/blob/main/.flatpak.desktop + desktopItems = [ + (makeDesktopItem { + name = "podman-desktop"; + exec = "podman-desktop %U"; + icon = "podman-desktop"; + desktopName = "Podman Desktop"; + genericName = "Desktop client for podman"; + comment = self.meta.description; + categories = [ "Utility" ]; + startupWMClass = "Podman Desktop"; + }) + ]; + + meta = with lib; { + description = "A graphical tool for developing on containers and Kubernetes"; + homepage = "https://podman-desktop.io"; + changelog = "https://github.com/containers/podman-desktop/releases/tag/v${self.version}"; + license = licenses.asl20; + maintainers = with maintainers; [ panda2134 ]; + inherit (electron.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch new file mode 100644 index 0000000000..89633b5729 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/extension-no-download-podman.patch @@ -0,0 +1,13 @@ +diff --git a/extensions/podman/package.json b/extensions/podman/package.json +index 5f86bbe9..92c0ef3b 100644 +--- a/extensions/podman/package.json ++++ b/extensions/podman/package.json +@@ -86,7 +86,7 @@ + } + }, + "scripts": { +- "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && npx ts-node ./scripts/download.ts && node ./scripts/build.js", ++ "build": "rollup --bundleConfigAsCjs --config rollup.config.js --compact --environment BUILD:production && node ./scripts/build.js", + "watch": "rollup --bundleConfigAsCjs --config rollup.config.js -w", + "test": "vitest run --passWithNoTests" + }, diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch new file mode 100644 index 0000000000..5b69f5e4e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/patches/fix-yarn-lock-deterministic.patch @@ -0,0 +1,13 @@ +diff --git a/yarn.lock b/yarn.lock +index ae340d04..5acc3fed 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -12753,7 +12753,7 @@ ws@^7.3.1: + resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== + +-ws@^8.11.0, ws@^8.4.2: ++ws@^8.11.0, ws@^8.12.0, ws@^8.4.2: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 8298469e1d..52a20bb57f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -61,13 +61,13 @@ let in buildGoModule rec { pname = "podman"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-s0aGZN4rnyyNLoO3nnAO7KbeD7MYxE9VMOHrQsKGNBk="; + hash = "sha256-rLXq+sveSxeoD3gyXSnfgGFx6alOBKSRCdDHGwwvPm4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 5ea14cae03..65d3770438 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + sha256 = "sha256-r5as3hb0zt+XPfxAPeH+YIc/n6IRlscPOZMGfhVE5C4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix new file mode 100644 index 0000000000..42cc3ab07a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitHub +, makeRustPlatform +, hostPlatform +, targetPlatform +, lld +}: + +let + arch = targetPlatform.qemuArch; + + target = ./. + "/${arch}-unknown-none.json"; + +in + +assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; + +let + cross = import ../../../.. { + system = hostPlatform.system; + crossSystem = lib.systems.examples."${arch}-embedded" // { + rustc.config = "${arch}-unknown-none"; + rustc.platform = lib.importJSON target; + }; + }; + + inherit (cross) rustPlatform; + +in + +rustPlatform.buildRustPackage rec { + pname = "rust-hypervisor-firmware"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "cloud-hypervisor"; + repo = pname; + rev = version; + sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; + }; + + cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; + + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + lld + ]; + + RUSTFLAGS = "-C linker=lld -C linker-flavor=ld.lld"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/cloud-hypervisor/rust-hypervisor-firmware"; + description = "A simple firmware that is designed to be launched from anything that supports loading ELF binaries and running them with the PVH booting standard"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-none" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json new file mode 100644 index 0000000000..f42155ae32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json @@ -0,0 +1,20 @@ +{ + "llvm-target": "x86_64-unknown-none", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "arch": "x86_64", + "target-endian": "little", + "target-pointer-width": "64", + "target-c-int-width": "32", + "os": "none", + "executables": true, + "linker": "rust-lld", + "linker-flavor": "ld.lld", + "panic-strategy": "abort", + "disable-redzone": true, + "features": "-mmx,-sse,+soft-float", + "code-model": "small", + "relocation-model": "pic", + "pre-link-args": { + "ld.lld": ["--script=x86_64-unknown-none.ld"] + } +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix index 6bcd15dc52..035fc9ceb2 100755 --- a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -16,6 +16,7 @@ , vulkan-loader , alsa-lib , libpulseaudio +, libxcrypt-legacy , libGL , numactl , libX11 @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { vulkan-loader alsa-lib libpulseaudio + libxcrypt-legacy libGL numactl libX11 diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix similarity index 98% rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix rename to third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index c4d967a11c..0d98c0a2bc 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: -{ name, profile ? "" +args@{ name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] , extraBuildCommands ? "", extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] @@ -216,4 +216,8 @@ in stdenv.mkDerivation { ''; preferLocalBuild = true; allowSubstitutes = false; + + passthru = { + inherit args multiPaths targetPaths; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 74a22566d5..ce807b932a 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -20,9 +20,9 @@ args @ { with builtins; let - buildFHSEnv = callPackage ./env.nix { }; + buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - env = buildFHSEnv (removeAttrs args [ + fhsenv = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent" "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "version" @@ -104,7 +104,7 @@ let ro_mounts=() symlinks=() etc_ignored=() - for i in ${env}/*; do + for i in ${fhsenv}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then : @@ -117,8 +117,8 @@ let fi done - if [[ -d ${env}/etc ]]; then - for i in ${env}/etc/*; do + if [[ -d ${fhsenv}/etc ]]; then + for i in ${fhsenv}/etc/*; do path="/''${i##*/}" # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we # don't want to override it with a path from the FHS environment. @@ -221,6 +221,7 @@ in runCommandLocal nameAndVersion { echo >&2 "" exit 1 ''; + inherit args fhsenv; }; } '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix index 81f1010e46..7b602e2507 100644 --- a/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/third_party/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation ({ runHook preInstall dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} \ ${if lib.versionAtLeast Dune.version "2.9" - then "--docdir $out/share/doc --man $out/share/man" + then "--docdir $out/share/doc --mandir $out/share/man" else ""} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index d8b4ae5dd9..e4c2ffb703 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -511,8 +511,8 @@ rec { '' mkdir -p $out for i in $(cat $pathsPath); do - ${lndir}/bin/lndir $i $out - done 2>&1 | sed 's/^/symlinkJoin: warning: keeping existing file: /' + ${lndir}/bin/lndir -silent $i $out + done ${postBuild} ''; diff --git a/third_party/nixpkgs/pkgs/build-support/writers/default.nix b/third_party/nixpkgs/pkgs/build-support/writers/default.nix index ca0184beeb..2c26f350fb 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/default.nix @@ -71,12 +71,12 @@ let let name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.str.check content) then { + pkgs.runCommand name ((if (types.str.check content) then { inherit content; passAsFile = [ "content" ]; } else { contentPath = content; - } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { # post-link-hook expects codesign_allocate to be in PATH # https://github.com/NixOS/nixpkgs/issues/154203 # https://github.com/NixOS/nixpkgs/issues/148189 diff --git a/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix index a01b02bdfa..de14c9213f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -94,9 +94,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Color emoji font with a flat visual style, designed and used by Twitter"; longDescription = '' - A bitmap color emoji font built from the Twitter Emoji for - Everyone artwork with support for ZWJ, skin tone diversity and country - flags. + A bitmap color emoji font built from Twitter's Twemoji emoji set + with support for ZWJ, skin tone diversity and country flags. This font uses Google’s CBDT format making it work on Android and Linux graphical stack. ''; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 71c87c15ea..3930777b88 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "083bd4855df26eb1db1c38c31fdf79ccf67c2f13", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/083bd4855df26eb1db1c38c31fdf79ccf67c2f13.tar.gz", - "sha256": "0m0d33xd1zfpcdbyhq7akq73dpgwggi39l1wp99vpfgpi220ad5a", - "msg": "Update from Hackage at 2023-03-01T16:43:25Z" + "commit": "4a67d2eace63deeaec7dd3553d04e892b39b63a7", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4a67d2eace63deeaec7dd3553d04e892b39b63a7.tar.gz", + "sha256": "12y659k8qs0rnajcfdwwwwz5ywcnf3ygxi2kmv8b31x4znll1gfs", + "msg": "Update from Hackage at 2023-03-13T08:59:39Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index 67c3dc7a3c..e563c21331 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20221130"; + version = "20230308"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-opVMrXob7yZ5lJmHxjiI8eCBsJ4R+3JQVDcvA37HcX8="; + sha256 = "sha256-VGugTsxekzui1/PztDM6KYDUrk38UoSYm5xUdY8rkIg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 7de6ba8aa2..622a2247b2 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202303230043"; + version = "202303272340"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "163f6f7caad67d43b51a9c342a72e34feeccb4d0"; - sha256 = "sha256-hwKRwCu/LHbjqzgpwG8YcTX4C+eEkonCDqVq36FIprQ="; + rev = "0473ff6f84b7bb926af68238489d05f683b87e1d"; + sha256 = "sha256-76SsWF3jOi+I975C9WNVMGrLqvgtdM48n9bV0jevx3Q="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 42be4e5302..a16cf43cfe 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "16.2"; + version = "17"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE="; + sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index 3e9a3e81eb..f9f08b35d6 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.6.4"; + version = "5.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-zvELN9ggfmfIEPeD0VEWM25kRi8RWA/aKlrdO5dKX1k="; + sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix index 1c4330221a..719a8dd396 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , gtk3 @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.4.2"; + version = "2.4.3"; outputs = [ "out" "dev" ]; @@ -31,18 +30,9 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM="; + hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg="; }; - patches = [ - # xapp-sn-watcher crashes on cinnamon with glib 2.76.0 - # https://github.com/linuxmint/xapp/issues/165 - (fetchpatch { - url = "https://github.com/linuxmint/xapp/commit/3ef9861d6228c2061fbde2c0554be5ae6f42befa.patch"; - sha256 = "sha256-7hYXA43UQpBLLjRVPoACc8xdhKyKnt3cDUBL4PhEtJY="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix new file mode 100644 index 0000000000..9252224488 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qttools +, pkg-config +, qtbase +, wrapQtAppsHook +, dtkwidget +, qt5integration +, qt5platform-plugins +, libuuid +, parted +, partclone +}: + +stdenv.mkDerivation rec { + pname = "deepin-clone"; + version = "5.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-ZOJc8R82R9q87Qpf/J4CXE+xL6nvbsXRIs0boNY+2uk="; + }; + + postPatch = '' + substituteInPlace app/{deepin-clone-ionice,deepin-clone-pkexec,deepin-clone.desktop,com.deepin.pkexec.deepin-clone.policy.tmp} \ + --replace "/usr" "$out" + + substituteInPlace app/src/corelib/ddevicediskinfo.cpp \ + --replace "/sbin/blkid" "${libuuid}/bin/blkid" + + substituteInPlace app/src/corelib/helper.cpp \ + --replace "/bin/lsblk" "${libuuid}/bin/lsblk" \ + --replace "/sbin/sfdisk" "${libuuid}/bin/sfdisk" \ + --replace "/sbin/partprobe" "${parted}/bin/partprobe" \ + --replace "/usr/sbin" "${partclone}/bin" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + dtkwidget + qt5platform-plugins + libuuid + parted + partclone + ]; + + cmakeFlags = [ + "-DDISABLE_DFM_PLUGIN=YES" + ]; + + strictDeps = true; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "Disk and partition backup/restore tool"; + homepage = "https://github.com/linuxdeepin/deepin-clone"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix new file mode 100644 index 0000000000..ffa77afa6c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -0,0 +1,140 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, deepin-pw-check +, udisks2-qt5 +, cmake +, qttools +, qtbase +, pkg-config +, qtx11extras +, qtmultimedia +, wrapQtAppsHook +, wrapGAppsHook +, gsettings-qt +, wayland +, kwayland +, qtwayland +, polkit-qt +, pcre +, xorg +, libselinux +, libsepol +, libxcrypt +, librsvg +, networkmanager-qt +, glib +, runtimeShell +, tzdata +, dbus +, gtest +}: + +stdenv.mkDerivation rec { + pname = "dde-control-center"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-/gzS+IbopIDRpufsa9cEfFBOqehPUnF4IozvwW8UEbY="; + }; + + patches = [ + # UserExperienceProgramLicenseAgreement comes from a non-open source component(deepin-deepinid-client) + # If we don't block it, only an empty page will be displayed here + # Remove this patch when dde-control-center is upgraded to 6.0.0 + ./dont-show-endUserLicenseAgreement-for-deepinos.patch + ]; + + postPatch = '' + substituteInPlace src/frame/window/{mainwindow.cpp,insertplugin.cpp} com.deepin.controlcenter.develop.policy \ + --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" + + substituteInPlace src/frame/modules/datetime/timezone_dialog/timezone.cpp \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + + substituteInPlace src/frame/modules/accounts/accountsworker.cpp \ + --replace "/bin/bash" "${runtimeShell}" + + substituteInPlace dde-control-center-autostart.desktop \ + --replace "/usr" "$out" + + substituteInPlace com.deepin.dde.ControlCenter.service \ + --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ + --replace "/usr/share" "$out/share" + + substituteInPlace include/widgets/utils.h src/{reboot-reminder-dialog/main.cpp,frame/main.cpp,reset-password-dialog/main.cpp} \ + --replace "/usr/share/dde-control-center" "$out/share/dde-control-center" + + substituteInPlace dde-control-center-wapper \ + --replace "qdbus" "${qttools.bin}/bin/qdbus" \ + --replace "/usr/share" "$out/share" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + wrapGAppsHook + ]; + dontWrapGApps = true; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + deepin-pw-check + qtbase + qtx11extras + qtmultimedia + gsettings-qt + udisks2-qt5 + wayland + kwayland + qtwayland + polkit-qt + pcre + xorg.libXdmcp + libselinux + libsepol + libxcrypt + librsvg + networkmanager-qt + gtest + ]; + + cmakeFlags = [ + "-DCVERSION=${version}" + "-DDISABLE_AUTHENTICATION=YES" + "-DDISABLE_ACTIVATOR=YES" + "-DDISABLE_SYS_UPDATE=YES" + "-DDISABLE_RECOVERY=YES" + ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}" + ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Control panel of Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-control-center"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch new file mode 100644 index 0000000000..491007ea2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-control-center/dont-show-endUserLicenseAgreement-for-deepinos.patch @@ -0,0 +1,29 @@ +From adcc5eb58e2dcd06810a40c237bc7984c2c5af4b Mon Sep 17 00:00:00 2001 +From: rewine +Date: Sun, 8 Jan 2023 13:46:17 +0800 +Subject: [PATCH] dont show endUserLicenseAgreement for deepinos + +--- + src/frame/window/modules/systeminfo/systeminfowidget.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/frame/window/modules/systeminfo/systeminfowidget.cpp b/src/frame/window/modules/systeminfo/systeminfowidget.cpp +index 8e62604fb..0f443ee20 100644 +--- a/src/frame/window/modules/systeminfo/systeminfowidget.cpp ++++ b/src/frame/window/modules/systeminfo/systeminfowidget.cpp +@@ -78,6 +78,12 @@ void SystemInfoWidget::initData() + m_listView->setRowHidden(i, true); + } + } ++ ++ if (IsNotDeepinUos) { ++ if (m.gsettingsName == "endUserLicenseAgreement") { ++ m_listView->setRowHidden(i, true); ++ } ++ } + } + + if (InsertPlugin::instance()->updatePluginInfo("systeminfo")) +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix index 96c3d08b65..de924812f7 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -30,6 +30,7 @@ let udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; #### CORE + dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; @@ -39,6 +40,7 @@ let deepin-calculator = callPackage ./apps/deepin-calculator { }; deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-clone = callPackage ./apps/deepin-clone { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index dc5728791b..5fa1a17c42 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -19,6 +19,7 @@ , kdeclarative , plasma-framework , plasma-wayland-protocols +, plasma-workspace , kio , qtbase }: @@ -45,5 +46,6 @@ mkDerivation { kdeclarative plasma-framework plasma-wayland-protocols + plasma-workspace ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix index 2fa9766f8d..e7873eaa0b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix @@ -19,9 +19,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screensaver"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-W9rEssR6jHMBM2m1lCBvj7YMOGOTaqBAOP7grQ01880="; + sha256 = "sha256-d72m2dW8jvM/EjgNSVaKsP5Ip7ioguB61/hy2cWw+dw="; buildInputs = [ dbus-glib diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix index 656ff4ba5e..21d53e117c 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/garcon/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "garcon"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-l1wGitD8MM1GrR4FyyPIxHSqK+AqKKyjTIN7VOaVzpM="; + sha256 = "sha256-0EcmI+C8B7oQl/cpbFeLjof1fnUi09nZAA5uJ0l15V4="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 668d626f60..eef6fe0f72 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.18.2"; + version = "4.18.3"; - sha256 = "sha256-h9D0boBCCC4txnSRc6VcdNbrm8D21LwE63Q/LsExFNE="; + sha256 = "sha256-Wb1nq744HDO4erJ2nJdFD0OMHVh14810TngN3FLFWIA="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index c5489cc880..ee46950b2e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.2"; + version = "4.18.3"; - sha256 = "sha256-kqc+5pClmAPEkyNWKj4uPgwFFKBDWrwFHqRDWjYrwa4="; + sha256 = "sha256-NSy0MTphzGth0w+Kn93hWvsjLw6qR8SqjYYc1Z2SWIs="; nativeBuildInputs = [ gobject-introspection diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix index 116d4d574a..b4391f7645 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-mG+tyQ319fvQpitT6sb46R+8AF+3gxqPHMiGMAaqnSo="; + sha256 = "sha256-EyDMHGFjZWux7atpiUoCMmJIN2PGlF9h2L5qaFAzrKU="; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 320eb92805..179a3672ab 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -16,8 +16,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.5"; - sha256 = "sha256-oRkvKSDEEepNwWIMDYLH/a034xxFhhOx+vp8O2UfTos="; + version = "0.4.6"; + sha256 = "sha256-P1ln0cBskRAPsIygKAZeQLvt51xgMOnm0WZoR5sRvsM="; nativeBuildInputs = [ automakeAddFlags diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix index f88ea619da..8c1d3f72c7 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix @@ -2,12 +2,12 @@ rebar3Relx rec { pname = "erlfmt"; - version = "1.1.0"; + version = "1.2.0"; releaseType = "escript"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "erlfmt"; - sha256 = "sha256-diZCyw4eR+h/Pc73HDfnFaXnNXwqu3XabTbeiWVPNPI="; + sha256 = "sha256-mma4QH6GlayTG5I9hW9wNZph/IJcCXjiY7Ft3hfxaPg="; rev = "v${version}"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index 4970d02e32..6637b769dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -28,18 +28,18 @@ let in stdenv.mkDerivation rec { pname = "bluespec"; - version = "2022.01"; + version = "2023.01"; src = fetchFromGitHub { owner = "B-Lang-org"; repo = "bsc"; rev = version; - sha256 = "sha256-ivTua3MLa8akma3MGkhsqwSdwswYX916kywKdlj7TqY="; + sha256 = "sha256-kFHQtRaQmZiHo+IQ+mwbW23i3kbdAh/XH0OE7P/ibd0="; }; yices-src = fetchurl { url = "https://github.com/B-Lang-org/bsc/releases/download/${version}/yices-src-for-bsc-${version}.tar.gz"; - sha256 = "sha256-ey5yIIVFZyG4EnYGqbIJqmxK1rZ70FWM0Jz+2hIoGXE="; + sha256 = "sha256-pyEdCJvmgwOYPMZEtw7aro76tSn/Y/2GcKTyARmIh4E="; }; enableParallelBuilding = true; @@ -50,8 +50,7 @@ in stdenv.mkDerivation rec { patches = [ ./libstp_stub_makefile.patch ]; postUnpack = '' - mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 - tar -C $sourceRoot/src/vendor/yices/v2.6/yices2 -xf ${yices-src} + tar -C $sourceRoot/ -xf ${yices-src} chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 ''; @@ -94,7 +93,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "release" - "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo) + "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices-src instead of the subrepo) "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 "STP_STUB=1" diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index 05e145c48f..036d72a653 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,7 +1,6 @@ { type , version , srcs -, icu # passing icu as an argument, because dotnet 3.1 has troubles with icu71 , packages ? null }: @@ -15,7 +14,7 @@ assert if type == "sdk" then packages != null else true; , autoPatchelfHook , makeWrapper , libunwind -, openssl_1_1 +, icu , libuuid , zlib , libkrb5 @@ -61,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: rec { zlib icu libkrb5 - # this must be before curl for autoPatchElf to find it - # curl brings in its own openssl - openssl_1_1 curl ] ++ lib.optional stdenv.isLinux lttng-ust_2_12; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix index 930339d8db..62076a5e16 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix @@ -10,7 +10,7 @@ in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_3_1 aspnetcore_5_0 + sdk_6_0 aspnetcore_7_0 ];`'' ; buildEnv { name = "dotnet-core-combined"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index c0764ed951..40ed81a4ed 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -1,11 +1,11 @@ /* How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspnetcore_5_0 ]; +dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; -Hashes and urls below are retrieved from: +Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ callPackage, icu70, icu }: +{ callPackage,}: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAttrs = { @@ -14,6 +14,11 @@ let buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); }; + ## Files in versions/ are generated automatically by update.sh ## + dotnet_6_0 = import ./versions/6.0.nix buildAttrs; + dotnet_7_0 = import ./versions/7.0.nix buildAttrs; + dotnet_8_0 = import ./versions/8.0.nix buildAttrs; + runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; "aarch64-linux" = "linux-arm64"; @@ -25,12 +30,6 @@ let # Convert a "stdenv.hostPlatform.system" to a dotnet RID systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - - ## Files in versions/ are generated automatically by update.sh ## - dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); - dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); - dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); - dotnet_8_0 = import ./versions/8.0.nix (buildAttrs // { inherit icu; }); in rec { inherit systemToDotnetRid; @@ -41,5 +40,6 @@ rec { sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; -} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 +} // dotnet_6_0 // dotnet_7_0 // dotnet_8_0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh index 84bf37c3c8..617dfa7433 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/update.sh @@ -219,36 +219,30 @@ sdk_packages () { "runtime.win-x86.Microsoft.NETCore.DotNetHost" \ "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" \ "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \ + "Microsoft.NETCore.App.Composite" \ + "Microsoft.NETCore.App.Host.linux-musl-arm" \ + "Microsoft.NETCore.App.Host.osx-arm64" \ + "Microsoft.NETCore.App.Runtime.linux-musl-arm" \ + "Microsoft.NETCore.App.Runtime.osx-arm64" \ + "Microsoft.NETCore.App.Ref" \ + "Microsoft.NETCore.App.Runtime.Mono.linux-arm" \ + "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \ + "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \ + "Microsoft.NETCore.App.Runtime.Mono.linux-x64" \ + "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \ + "Microsoft.NETCore.App.Runtime.Mono.osx-x64" \ + "Microsoft.NETCore.App.Runtime.Mono.win-x64" \ + "Microsoft.NETCore.App.Runtime.Mono.win-x86" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \ ) - # Packages that only apply to .NET 6 and up - if ! version_older "$version" "6"; then - pkgs+=( \ - "Microsoft.NETCore.App.Composite" \ - "Microsoft.NETCore.App.Host.linux-musl-arm" \ - "Microsoft.NETCore.App.Host.osx-arm64" \ - "Microsoft.NETCore.App.Runtime.linux-musl-arm" \ - "Microsoft.NETCore.App.Runtime.osx-arm64" \ - "Microsoft.NETCore.App.Ref" \ - "Microsoft.NETCore.App.Runtime.Mono.linux-arm" \ - "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \ - "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \ - "Microsoft.NETCore.App.Runtime.Mono.linux-x64" \ - "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \ - "Microsoft.NETCore.App.Runtime.Mono.osx-x64" \ - "Microsoft.NETCore.App.Runtime.Mono.win-x64" \ - "Microsoft.NETCore.App.Runtime.Mono.win-x86" \ - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \ - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \ - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \ - "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \ - "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \ - "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \ - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \ - "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \ - ) - fi - # Packages that only apply to .NET 7 and up if ! version_older "$version" "7"; then # ILCompiler requires nixpkgs#181373 to be fixed to work properly @@ -273,8 +267,8 @@ main () { Get updated dotnet src (platform - url & sha512) expressions for specified versions Examples: - $pname 3.1.21 5.0.12 - specific x.y.z versions - $pname 3.1 5.0 6.0 - latest x.y versions + $pname 6.0.14 7.0.201 - specific x.y.z versions + $pname 6.0 7.0 - latest x.y versions " >&2 exit 1 fi @@ -311,7 +305,7 @@ Examples: buildAspNetCore = { ... }: {}; \ buildNetRuntime = { ... }: {}; \ buildNetSdk = { version, ... }: version; \ - icu = null; }).sdk_${major_minor_underscore}" | jq -r) + }).sdk_${major_minor_underscore}" | jq -r) if [[ "$current_version" == "$sdk_version" ]]; then echo "Nothing to update." @@ -325,24 +319,21 @@ Examples: channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v$channel_version ($support_phase) { aspnetcore_$major_minor_underscore = buildAspNetCore { - inherit icu; version = \"${aspnetcore_version}\"; $(platform_sources "$aspnetcore_files") }; runtime_$major_minor_underscore = buildNetRuntime { - inherit icu; version = \"${runtime_version}\"; $(platform_sources "$runtime_files") }; sdk_$major_minor_underscore = buildNetSdk { - inherit icu; version = \"${sdk_version}\"; $(platform_sources "$sdk_files") packages = { fetchNuGet }: [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/3.1.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/3.1.nix deleted file mode 100644 index fa39bd32fa..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/3.1.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: - -# v3.1 (eol) -{ - aspnetcore_3_1 = buildAspNetCore { - inherit icu; - version = "3.1.32"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/39c3ef4c-73c7-4248-8c54-0865d5feb8b2/3420b1ff6b0f36e63044d6f7a794b579/aspnetcore-runtime-3.1.32-linux-x64.tar.gz"; - sha512 = "0aa2aceda3d0b9f6bf02456d4e4b917c221c4f18eff30c8b6418e7514681baa9bb9ccc6b8c78949a92664922db4fb2b2a0dac9da11f775aaef618d9c491bb319"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7a713b60-c2fb-4dc9-ad35-df86c4bfac0c/fff24659d0a2ad9c6b622be1722b8f72/aspnetcore-runtime-3.1.32-linux-arm64.tar.gz"; - sha512 = "34b9ec241cd0047cb23f0b8416d3a009476e511c3dd5854636c11cfd078117faf095f32f06e7c97d810af94fde43621117414f983d3b2041ad40260f50dc330d"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/70cd4d7b-0186-4ce2-a710-f50d6dec246f/84c5b21b8a487127589095336c5158b5/aspnetcore-runtime-3.1.32-osx-x64.tar.gz"; - sha512 = "21f77b64b527af41bbba0f8887c71be631f37d7bbabe9119fe39961c2600a90075f60768173097c9fffe32e40f8db309544837055cb70fe428195682b85fb9a0"; - }; - }; - }; - - runtime_3_1 = buildNetRuntime { - inherit icu; - version = "3.1.32"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fea239ad-fd47-4764-aa71-6a147a82f632/20ee58b0bf08ae9f6e76e37ba3765c57/dotnet-runtime-3.1.32-linux-x64.tar.gz"; - sha512 = "a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/edfb706e-83fe-4a81-804c-23d80b041b70/4f98b067bd2817976a4362c25fbf70e7/dotnet-runtime-3.1.32-linux-arm64.tar.gz"; - sha512 = "ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/09f14240-76bf-43df-bdf1-636aa56cbd5c/4898c400f81d0bac651bcf84dc487b6f/dotnet-runtime-3.1.32-osx-x64.tar.gz"; - sha512 = "9fd385812e770525856d734ca62e5d01ddb534ff317bb09e1091ded38ce2c16dc4bd02b5eebad8ea6e01b21755fe6f5ce6ca5183ebbbee04fa1aed956da4c58a"; - }; - }; - }; - - sdk_3_1 = buildNetSdk { - inherit icu; - version = "3.1.426"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e89c4f00-5cbb-4810-897d-f5300165ee60/027ace0fdcfb834ae0a13469f0b1a4c8/dotnet-sdk-3.1.426-linux-x64.tar.gz"; - sha512 = "6c3f9541557feb5d5b93f5c10b28264878948e8540f2b8bb7fb966c32bd38191e6b310dcb5f87a4a8f7c67a7046fa932cde3cce9dc8341c1365ae6c9fcc481ec"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/79f1cf3e-ccc7-4de4-9f4c-1a6e061cb867/68cab78b3f9a5a8ce2f275b983204376/dotnet-sdk-3.1.426-linux-arm64.tar.gz"; - sha512 = "300e154fba3123644910bbb89a6e61f67569677efa359aa110871cbbb62afad059709dc362f0af27ece0b9a30bc3e6ef57c3cb7c6f75377b20d48636605f30f7"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e45c25b7-623f-4b98-8918-13a671884860/d6e4526d0dd31d388b36a749f90ae6e2/dotnet-sdk-3.1.426-osx-x64.tar.gz"; - sha512 = "be1c29ffe8ddec6051d7529796dae35fe18036af89d5e7285fcdad46316fec557f4b15c15eed4d676071d187b363c2e16cb3bcbf708b920b5614340a6e51ab3d"; - }; - }; - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "3.1.32"; sha256 = "06ws70zb4p4wbxx6f9bxk8dmighk8h57m82bnsss5cajabhrs9ss"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "00ha2sl4gvqv68mbrsizd6ngqy0vv6vamngzjxr338k1w7a276dx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "3.1.32"; sha256 = "0rvyv3mnb2fgj619rnqixfngzybhgqfr5mnw3s43v9mlg45la8hp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "3.1.32"; sha256 = "06xbkmplw7vkcsacrcddnma3hawqgdk2hj9ayjs0mhb31n407j3j"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0ywz63q8vrdp25ix2j9b7h2jp5grc68hqfl64c6lqk26q9xwhp9r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "1crk54a1wvj76s9gnh46pi7wk8ryympm9xh2jq4s4rpp329fqgic"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "3.1.32"; sha256 = "148pspjlx85yk95i6svhv37g483wmbinngd460p1ak2di26qbvk8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "3.1.32"; sha256 = "17hbn0qvnclhhp6pdygia124qi46lm7r3ixkgsnbsmh7a5l02f84"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.32"; sha256 = "0m6qq8va2fd1zns85wlm5arhcg57hf1rfj3801v27hvijfsmcad3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.32"; sha256 = "0868nlkxi7sy74g6xrvlaiqzs2h846gq52wcmgapsq202lirnjzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "3.1.32"; sha256 = "1yip3i79ljg2p23r8ph6p77rdmwm6h6gnlc3q2cikz07vib41042"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "3.1.32"; sha256 = "1cj8wspslr17pbkh50xfbmwcicy9n2z9ha027ssfrah8r488d9sx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "3.1.32"; sha256 = "0r5m0837zx2shp9bfgllnhz85h5792pbsacnk7lmmpgld32crzdx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.32"; sha256 = "08sar3s7j6z1q5prjmz2jrbsq5ms81mrsi1c1zbfrkplkfjpld3a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.32"; sha256 = "186gjn8sbhp4z6pq8fw4g8nqk9dwyaplwvdz2y3fbbvg36lggsh0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "3.1.32"; sha256 = "1pbrqyd43b3fmd6vk2wph726z6yddazp04ycyxbn5dh9zw8f2k55"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "3.1.32"; sha256 = "0i7vv4zvv4aixgdkskza8x8js4bnj5q4mnw0qdb7dmdypf34s2fm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.32"; sha256 = "0fk77ij5k33gjydk51gw7k639mppqkyhgarch2701i5wciap2h32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.32"; sha256 = "1q36zbrkbgwg5wl7gpzmac79xvwd74zzqg13hrsldwfajmnwvdkj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "3.1.32"; sha256 = "16pgzx3gxgvcgb54z2sd48x8jlz4w242gf68s10ghlnqiiggpl4v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.32"; sha256 = "13pcn74z1swz73s72zjl07f118j35wacnzgk7kbjqn83nwgqdgvq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "3.1.32"; sha256 = "1lxvj597rw4srkhmx83p1hnf71dcmgg93k982vnvv89xmyvvyy42"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "3.1.32"; sha256 = "07rmk5l0k66x2ilm3r2cpl7icgdzpqjcnrhw89afm9z9w06zz78g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.32"; sha256 = "0mmc57dl8plrspdxwb7209wz29vhiwqds4nfbdfws7zg35yy70c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.32"; sha256 = "06bk39zcv27cwshjsxfg5d6wzkkzdhfk08sipdc7mr1s8pk7ihi1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "3.1.32"; sha256 = "00n05mi9zws7v88jklyw1a8cjjslx8nnbby1nyxmi6p2acbx6pxp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "3.1.32"; sha256 = "035rs89y8j9v0mshqhaiyydv979x3w1204gcdp2kv2zhvfx1gnp2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.32"; sha256 = "0qsm03gx86fqx8vadnq3nsin3m3falidib94pc3mb3fy87mapvqw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.32"; sha256 = "09r2776wbcmn5jh3nksd5ilzv6rrlic938b87xy77awqg251y017"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1q09dbbx9kd3k4v8wg75llvz4332b5qsvblva7mhslbmyv47vfiq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0biy6p7kvcjxdn67wcmwyrfvv7pmd5249fj3410pw4xi8svjpxnj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1hs2czpqwa92x11d49m5dprjzr8n8zi5cx6cq8rcnacpynr19ldm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1kk8116pvl1jc8k59338hqhbhs8mbnb7kv108xmzbqzygsfgcvb5"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "05yqaxrd981aw4mjg80n19506ls6ni3sy3w0fwiygblaffidj8h3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0p82n92njjahhndawz40jq8bf2smw1c61zm4hq3zi6m5f3x0qc4l"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0x43pjvd7c58c7230i6ga7d4hidd258aahd9d1z9590z4d32v320"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "05mm56j8391rh8zghrdyrnxnbxvrmwqxy3gn4blyf8rb9xgsy78j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1pz1p935k4y06q8v9z44qwnc96anmg1r2kfrs3a0fbyqn0qkc4i3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0vznqq540gb9idxb4f0l26c2g8500z2fkx0sxrmnla91c3yf9f6c"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0844r0h1pvb5mvl5939z37nxjb380kbjjf92g64d110bs8397dw3"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0zr31wppl255hwlhrab78h7r2l4pfz8nz20s66j3xi2w9pvlsprd"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1g3gxzn035gyq7kq2xwn51vz6wk0473qcq0yi3blakfrmjwdbiax"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0a3kq34dk5lj0w7g3v3x78vkcs4jw4wjdxigyc3xwwc29rjwmy0x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0gygjx90ibi3xi514mll2jfnq8siy8gvmkj9ckwc904pvzy3q5z5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0cg209fkmmm0jfr1vj4454v482y4s4971xcnfsyx5ldvqhvq1nj0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "05qrs75q38x0r542cgjyjm2l9nxbxmqp75nd3m2zny2wbm9zfqcl"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0zb3qlb2c8s953ja4s8a3q26ips96czxm9xd16mair3fb8z4yvf2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "05z3rxm7fgsmjmx5lzlihxhfyzvp16r888i4jj5v4kb5hb6y3xfw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "17xyhgf0d3lhvyb0j6mzfv278l9iy800l1l0i5a72ihvjm4ld40r"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "0k0fng7fxssqkcywf4czpiqrfv60qmjf8pw686rmn9gqyd9y6wbw"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1hjxa5rld8b1qx8avkc1gd7492vz51r6zqmbqadv1kklg4bf68zq"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1kdcjy2c02qm0rkqq262iky40vmn1gnz0p1817js4b8a0ha13nl1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1q31a7gwl5nl0m4wizbqdd67k0xgrmdbf2wdsx9vx9i3xfcjj7js"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "11p5g8ar7x1czkl32f2s046zlibqqx28b499yiv7snngjcs9fgzq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1paagjfdsg9q0aknwipcds4chn8nfk2y83yhcz3qhi28pzpgih53"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "028kccjihxlyfv2i988g88fw98lhsidf7jj525w96wf9rgkl3m2d"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1jc46wlga8r2nlmy0rhqcrxa2vp677340wiwl8nskp1sb3ci0p8m"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "1m92b4z727178lnvyh9sq1gx2ncs74q5vwaz4nivjh3fdq1qn9dz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0grk5axlpzwks3p42km6jy0r82ahcmgybgq1vh61xj1nzna1l3fs"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "0hhk71dqy5plq64ml3jc810y2lyq404k4aynv6y4g5j5y1wycx3s"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0j50g2gjb6qsm1mp6g9bkvjjrih6jbisns74mghx92hk8q9cbq6v"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "042bjis2yrvsnaviijlpfi0lgp2ds8igsy8cdhbk3mzi9hcgmilg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "1y7m9awpcg2ilwkn712sg2hbhqq97yf5s0j9bvrpgb6xh0pzk1f3"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "04rspzr88n1dy86v2n5i8vxkyyxqvw9qfgizzxav8dqsvd9yja41"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "105zgdvfx7w1wxbxjxhwjai72gwk1hhi0hjjrky261ga63j5akgg"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "08mizsssb84saw1sd51qvh8inacf6m6xbhpp6dfnmxszpamrzc09"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "02k2fhdb9p6vrn1v4d8fjpqy6a89gmrmlpf477i0pir42kwx7766"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "07jx0syqg5833g3rlmca692cry24iq9mxh6fa3w3p76qxx8aqlmg"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "1lhjckbf4679k8fmg7piqizix6d9rs9dgm83kjd3c9cd3m7xg0ky"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "3.1.32"; sha256 = "03s5x7b38mx5s4684jmdlrh6cj5pjyxhs37bwq5jdsip9a24yk5g"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "3.1.32"; sha256 = "0pa43dy3fmsgwmhp8xxsdvfbm3qagj4wlqcbcdm3rhk4i3ww88p3"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.32"; sha256 = "1mhzxyahgqabc4gxmnxfyjpb7bp4asac1qcjja891fp23w4fg0gn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.32"; sha256 = "0c80n8gwzj5dp1ss1hcb8ah8ah0acx2k277pxzji6i7jxaq9wpdv"; }) - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index d6603aae25..9f91675aee 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -1,9 +1,8 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - inherit icu; version = "6.0.15"; srcs = { x86_64-linux = { @@ -26,7 +25,6 @@ }; runtime_6_0 = buildNetRuntime { - inherit icu; version = "6.0.15"; srcs = { x86_64-linux = { @@ -49,7 +47,6 @@ }; sdk_6_0 = buildNetSdk { - inherit icu; version = "6.0.407"; srcs = { x86_64-linux = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index 824533dbfc..66c92df12b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,9 +1,8 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - inherit icu; version = "7.0.4"; srcs = { x86_64-linux = { @@ -26,7 +25,6 @@ }; runtime_7_0 = buildNetRuntime { - inherit icu; version = "7.0.4"; srcs = { x86_64-linux = { @@ -49,7 +47,6 @@ }; sdk_7_0 = buildNetSdk { - inherit icu; version = "7.0.202"; srcs = { x86_64-linux = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix index be943300c7..afd4186045 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -1,9 +1,8 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: +{ buildAspNetCore, buildNetRuntime, buildNetSdk }: # v8.0 (preview) { aspnetcore_8_0 = buildAspNetCore { - inherit icu; version = "8.0.0-preview.1.23112.2"; srcs = { x86_64-linux = { @@ -26,7 +25,6 @@ }; runtime_8_0 = buildNetRuntime { - inherit icu; version = "8.0.0-preview.1.23110.8"; srcs = { x86_64-linux = { @@ -49,7 +47,6 @@ }; sdk_8_0 = buildNetSdk { - inherit icu; version = "8.0.100-preview.1.23115.2"; srcs = { x86_64-linux = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index 1daeb745e5..ef7ff66e74 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -4,6 +4,7 @@ , runCommand , fetchpatch , cmake +, darwin , ninja , python3 , libffi @@ -16,9 +17,10 @@ , release_version , zlib , which +, sysctl , buildLlvmTools , debugVersion ? false -, doCheck ? stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) && (stdenv.hostPlatform == stdenv.buildPlatform) , enableManpages ? false , enableSharedLibraries ? !stdenv.hostPlatform.isStatic @@ -85,17 +87,122 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - nativeCheckInputs = [ which ]; + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; patches = [ ./gnu-install-dirs.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.patch + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - '' + '' + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # and thus fails under the sandbox: + substituteInPlace unittests/Support/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on x86_64 macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/Support/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" @@ -134,12 +241,6 @@ in stdenv.mkDerivation (rec { ) ''; - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; @@ -216,14 +317,6 @@ in stdenv.mkDerivation (rec { ) ]; - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - postInstall = '' mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 0000000000..32f1d13a9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,26 @@ +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 0242e0b75af3..d732011306f7 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + f.write('@echo off\n') + f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) + else: ++ # This env var is *purged* when invoking subprocesses so we have to ++ # manually set it from within the bash script in order for the commands ++ # in run lines to see this var: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.match(kPdbgRegex, ln) + if match: +@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={}, + return processed + + process = processLine if recursion_limit is None else processLineToFixedPoint +- ++ + return [unescapePercents(process(ln)) for ln in script] + + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000..d824516c0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,79 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: + config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE'] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE) ++ [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment) + except OSError: + print('could not exec llvm-readobj') + return False diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000..1354ad2673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 75314a4b46..7c82cc4330 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -28,7 +28,9 @@ let # Stage 1 # Base - llvm = callPackage ./llvm.nix { }; + llvm = callPackage ./llvm.nix { + isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344 + }; # Projects clang-unwrapped = callPackage ./llvm.nix rec { diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 318a7ac340..5518eb64bb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -3,7 +3,7 @@ { lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub , makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped -, nimble-unwrapped }: +, nimble-unwrapped, Security }: let parseCpu = platform: @@ -94,7 +94,8 @@ in { hash = "sha256-rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI="; }; - buildInputs = [ boehmgc openssl pcre readline sqlite ]; + buildInputs = [ boehmgc openssl pcre readline sqlite ] + ++ lib.optional stdenv.isDarwin Security; patches = [ ./NIM_CONFIG_DIR.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 67beaf6a0a..ecc84c3670 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ kamilchm patternspandemic redvers superherointj ]; + maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix index e47bfd376c..db2473f291 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation ( rec { homepage = "https://www.ponylang.io"; changelog = "https://github.com/ponylang/corral/blob/${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ redvers superherointj ]; + maintainers = with maintainers; [ redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix index a0761dfb51..997fecb0d5 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: +{ lib, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "HoTT"; @@ -6,20 +6,41 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.16"; out = coq.coq-version; } + { case = range "8.14" "8.17"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; - release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; - release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g="; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; + release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g="; + release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; + release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; + # versions of HoTT for Coq 8.17 and onwards will use dune + # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null; + opam-name = "coq-hott"; + useDune = lib.versions.isGe "8.17" coq.coq-version; + patchPhase = '' patchShebangs etc ''; meta = { homepage = "https://homotopytypetheory.org/"; - description = "Homotopy type theory"; - maintainers = with lib.maintainers; [ siddharthist ]; + description = "The Homotopy Type Theory library"; + longDescription = '' + Homotopy Type Theory is an interpretation of Martin-Löf’s intensional + type theory into abstract homotopy theory. Propositional equality is + interpreted as homotopy and type isomorphism as homotopy equivalence. + Logical constructions in type theory then correspond to + homotopy-invariant constructions on spaces, while theorems and even + proofs in the logical system inherit a homotopical meaning. As the + natural logic of homotopy, type theory is also related to higher + category theory as it is used e.g. in the notion of a higher topos. + + The HoTT library is a development of homotopy-theoretic ideas in the Coq + proof assistant. It draws many ideas from Vladimir Voevodsky's + Foundations library (which has since been incorporated into the Unimath + library) and also cross-pollinates with the HoTT-Agda library. + ''; + maintainers = with lib.maintainers; [ alizter siddharthist ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix new file mode 100644 index 0000000000..6951169387 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-apery/default.nix @@ -0,0 +1,23 @@ +{ coq, mkCoqDerivation, mathcomp, coqeal, mathcomp-real-closed, + mathcomp-bigenough, mathcomp-zify, mathcomp-algebra-tactics, + lib, version ? null }: + +mkCoqDerivation { + + pname = "apery"; + + inherit version; + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; } + ] null; + + release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY="; + + propagatedBuildInputs = [ mathcomp.field coqeal mathcomp-real-closed + mathcomp-bigenough mathcomp-zify mathcomp-algebra-tactics ]; + + meta = { + description = "A formally verified proof in Coq, by computer algebra, that ζ(3) is irrational"; + license = lib.licenses.cecill-c; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index d20b637321..4eb721e2f1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.16"; out = "1.8.0"; } + { case = range "8.13" "8.17"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } { case = range "8.8" "8.10"; out = "1.4.0"; } diff --git a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix index 0da71d1de1..ce55ed1bfd 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.2.8"; + version = "0.3.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-x0C+1Ld4RImmS6x9l9jQaZ/sEd3iLFmmwOWNfA+xYsk="; + hash = "sha256-B+G2HIGbuKeiys3bLR2U+P40TD8YpqzAb4oENNb8gYg="; }; - cargoSha256 = "sha256-U1YiQdfk/SgRicAND0X8KdHKgX7wHnYspWNF270WDrE="; + cargoHash = "sha256-W6/LZE98V1teiv9Wp9tsIqlY18MoMiNZ+fqTJ567xrg="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 81cedafdf4..609aabe52e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -20,21 +20,59 @@ with haskellLib; self: super: { + # Make sure that Cabal 3.8.* can be built as-is + Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_17_0; + })); + + # Make sure that Cabal 3.10.* can be built as-is + Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_17_0; + })); + # cabal-install needs most recent versions of Cabal and Cabal-syntax, # so we need to put some extra work for non-latest GHCs inherit ( let # !!! Use cself/csuper inside for the actual overrides cabalInstallOverlay = cself: csuper: - lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { - Cabal = cself.Cabal_3_8_1_0; - Cabal-syntax = cself.Cabal-syntax_3_8_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # GHC 9.2.5 starts shipping 1.6.16.0 + lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { + Cabal = cself.Cabal_3_10_1_0; + Cabal-syntax = cself.Cabal-syntax_3_10_1_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { + # We need at least directory >= 1.3.7.0. Using the latest version + # 1.3.8.* is not an option since it causes very annoying dependencies + # on newer versions of unix and filepath than GHC 9.2 ships + directory = cself.directory_1_3_7_1; + # GHC 9.2.5 starts shipping 1.6.16.0 which is required by + # cabal-install, but we need to recompile process even if the correct + # version is available to prevent inconsistent dependencies: + # process depends on directory. process = cself.process_1_6_17_0; - } // lib.optionalAttrs (lib.versions.majorMinor self.ghc.version == "8.10") { + + # hspec < 2.10 depends on ghc (the library) directly which in turn + # depends on directory, causing a dependency conflict which is practically + # not solvable short of recompiling GHC. Instead of adding + # allowInconsistentDependencies for all reverse dependencies of hspec-core, + # just upgrade to an hspec version without the offending dependency. + hspec-core = cself.hspec-core_2_10_10; + hspec-discover = cself.hspec-discover_2_10_10; + hspec = cself.hspec_2_10_10; + + # hspec-discover and hspec-core depend on hspec-meta for testing which + # we need to avoid since it depends on ghc as well. Since hspec*_2_10* + # are overridden to take the versioned attributes as inputs, we need + # to make sure to override the versioned attribute with this fix. + hspec-discover_2_10_10 = dontCheck csuper.hspec-discover_2_10_10; + # Prevent dependency on doctest which causes an inconsistent dependency - # due to depending on ghc-8.10.7 (with bundled process) vs. process 1.6.16.0 + # due to depending on ghc which depends on directory etc. vector = dontCheck csuper.vector; }; in @@ -62,6 +100,15 @@ self: super: { guardian ; + vector = overrideCabal (old: { + # Too strict bounds on doctest which isn't used, but is part of the configuration + jailbreak = true; + # vector-doctest seems to be broken when executed via ./Setup test + testTarget = lib.concatStringsSep " " [ + "vector-tests-O0" + "vector-tests-O2" + ]; + }) super.vector; # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; @@ -192,10 +239,6 @@ self: super: { pandoc-cli = throwIfNot (versionOlder super.pandoc.version "3.0.0") "pandoc-cli contains the pandoc executable starting with 3.0, this needs to be considered now." (markBroken (dontDistribute super.pandoc-cli)); - # sse2 flag due to https://github.com/haskell/vector/issues/47. - # Jailbreak is necessary for QuickCheck dependency. - vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag "--ghc-options=-msse2" super.vector else super.vector); - inline-c-cpp = overrideCabal (drv: { patches = drv.patches or [] ++ [ (fetchpatch { @@ -495,6 +538,10 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 + # Package exists only to be example of documentation, yet it has restrictive + # "base" dependency. + haddock-cheatsheet = doJailbreak super.haddock-cheatsheet; + # no haddock since this is an umbrella package. cloud-haskell = dontHaddock super.cloud-haskell; @@ -846,12 +893,12 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_9; + hspec = self.hspec_2_10_10; hspec-wai = self.hspec-wai.override { - hspec = self.hspec_2_10_9; + hspec = self.hspec_2_10_10; }; hspec-contrib = self.hspec-contrib.override { - hspec-core = self.hspec-core_2_10_9; + hspec-core = self.hspec-core_2_10_10; }; fsnotify = self.fsnotify_0_4_1_0; }); @@ -1551,16 +1598,18 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_9 = doDistribute (super.hspec_2_10_9.override { - hspec-discover = self.hspec-discover_2_10_9; - hspec-core = self.hspec-core_2_10_9; + hspec_2_10_10 = doDistribute (super.hspec_2_10_10.override { + hspec-discover = self.hspec-discover_2_10_10; + hspec-core = self.hspec-core_2_10_10; }); - hspec-discover_2_10_9 = super.hspec-discover_2_10_9.override { + hspec-discover_2_10_10 = doDistribute (super.hspec-discover_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; - }; - hspec-core_2_10_9 = super.hspec-core_2_10_9.override { + }); + # Need to disable tests to prevent an infinite recursion if hspec-core_2_10_10 + # is overlayed to hspec-core. + hspec-core_2_10_10 = doDistribute (dontCheck (super.hspec-core_2_10_10.override { hspec-meta = self.hspec-meta_2_10_5; - }; + })); # Point hspec 2.7.10 to correct dependencies hspec_2_7_10 = super.hspec_2_7_10.override { @@ -1572,12 +1621,6 @@ self: super: { servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; hercules-ci-agent = lib.pipe super.hercules-ci-agent [ - (appendPatch (fetchpatch { - name = "hercules-ci-agent-support-cachix-1.3.patch"; - url = "https://github.com/hercules-ci/hercules-ci-agent/pull/500.diff"; - sha256 = "sha256-ErrFvzB1NiIJLpsP2wfx5CX8DnH1x5i/ijQZEeuOzeI="; - relative = "hercules-ci-agent"; - })) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; @@ -2248,11 +2291,6 @@ self: super: { # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; - # Temporarily upgrade haskell-gi until stackage advances - # Fixes build of gi-harfbuzz with harfbuzz >= 7.0 - # https://github.com/haskell-gi/haskell-gi/issues/396#issuecomment-1445181362 - haskell-gi = doDistribute self.haskell-gi_0_26_3; - # Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core; hasura-ekg-core = doJailbreak super.hasura-ekg-core; @@ -2491,6 +2529,10 @@ self: super: { editedCabalFile = null; }) super.true-name); + # ffmpeg-light works against the ffmpeg-4 API, but the default ffmpeg in nixpkgs is ffmpeg-5. + # https://github.com/NixOS/nixpkgs/pull/220972#issuecomment-1484017192 + ffmpeg-light = super.ffmpeg-light.override { ffmpeg = pkgs.ffmpeg_4; }; + # posix-api has had broken tests since 2020 (until at least 2023-01-11) # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14 posix-api = dontCheck super.posix-api; @@ -2501,4 +2543,8 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; + + # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). + # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd + tomland = doJailbreak super.tomland; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 82e221af6c..01cb348815 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -118,9 +118,6 @@ self: super: { ormolu = super.ormolu_0_2_0_0; - # vector 0.12.2 indroduced doctest checks that don’t work on older compilers - vector = dontCheck super.vector; - ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6); mime-string = disableOptimization super.mime-string; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 3ed8d155e8..3c59f6b80d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -81,7 +81,6 @@ self: super: { tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; tuple = addBuildDepend self.base-orphans super.tuple; - vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 3efd37a775..0416124a6c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -60,9 +60,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - th-desugar = self.th-desugar_1_14; - vector = dontCheck super.vector; - # Apply patches from head.hackage. language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index e0cae85465..995c520ad5 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -71,9 +71,7 @@ in { # Jailbreaks & Version Updates - # Jailbreak to allow quickcheck-instances-0.3.28 (too strict lower bound) - aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); - + aeson = doDistribute self.aeson_2_1_2_1; assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; @@ -92,8 +90,6 @@ in { hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP); integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms); - indexed-traversable = doJailbreak super.indexed-traversable; - indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; lzma-conduit = doJailbreak super.lzma-conduit; @@ -107,15 +103,19 @@ in { rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; shake-cabal = doDistribute self.shake-cabal_0_2_2_3; libmpd = doJailbreak super.libmpd; - base-orphans = dontCheck super.base-orphans; + generics-sop = doJailbreak super.generics-sop; + microlens-th = doJailbreak super.microlens-th; + # generically needs base-orphans for 9.4 only + base-orphans = dontCheck (doDistribute super.base-orphans); + generically = addBuildDepend self.base-orphans super.generically; # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_9; - hspec-core = self.hspec-core_2_10_9; + hspec = self.hspec_2_10_10; + hspec-core = self.hspec-core_2_10_10; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_9; + hspec-discover = self.hspec-discover_2_10_10; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 @@ -131,12 +131,12 @@ in { syb = dontCheck super.syb; splitmix = doJailbreak super.splitmix; - th-desugar = self.th-desugar_1_14; + th-desugar = doDistribute self.th-desugar_1_15; + th-abstraction = doDistribute self.th-abstraction_0_5_0_0; time-compat = doJailbreak super.time-compat; tomland = doJailbreak super.tomland; type-equality = doJailbreak super.type-equality; unordered-containers = doJailbreak super.unordered-containers; - vector = dontCheck super.vector; vector-binary-instances = doJailbreak super.vector-binary-instances; hpack = overrideCabal (drv: { @@ -209,6 +209,7 @@ in { servant-client = doJailbreak super.servant-client; relude = doJailbreak super.relude; + # Fixes compilation failure with GHC >= 9.4 on aarch64-* due to an API change cborg = appendPatch (pkgs.fetchpatch { name = "cborg-support-ghc-9.4.patch"; url = "https://github.com/well-typed/cborg/pull/304.diff"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 7ac21dd5f3..a7f19e119d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -1,10 +1,15 @@ { pkgs, haskellLib }: +with haskellLib; + let inherit (pkgs) lib; -in -with haskellLib; + jailbreakWhileRevision = rev: + overrideCabal (old: { + jailbreak = assert old.revision or "0" == toString rev; true; + }); +in self: super: { llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; @@ -47,4 +52,108 @@ self: super: { transformers = null; unix = null; xhtml = null; + + # + # Version deviations from Stackage LTS + # + + th-desugar = doDistribute self.th-desugar_1_15; + th-abstraction = doDistribute self.th-abstraction_0_5_0_0; + tagged = doDistribute self.tagged_0_8_7; # allows template-haskell-2.20 + primitive = doDistribute (dontCheck self.primitive_0_7_4_0); # allows base >= 4.18 + indexed-traversable = doDistribute super.indexed-traversable_0_1_2_1; # allows base >= 4.18 + OneTuple = doDistribute (dontCheck super.OneTuple_0_4_1_1); # allows base >= 4.18 + inspection-testing = doDistribute self.inspection-testing_0_5_0_1; # allows base >= 4.18 + tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; + # Too strict bounds on ghc-prim and template-haskell + aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); + # Too strict bounds on ghc-prim + memory = doDistribute self.memory_0_18_0; + + ghc-lib = doDistribute self.ghc-lib_9_6_1_20230312; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_1_20230312; + ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_0; + + # + # Too strict bounds without upstream fix + # + + # Forbids transformers >= 0.6 + quickcheck-classes-base = doJailbreak super.quickcheck-classes-base; + # Forbids base >= 4.18 + singleton-bool = doJailbreak super.singleton-bool; + # Forbids base >= 4.18 + unliftio-core = doJailbreak super.unliftio-core; + # Forbids mtl >= 2.3 + ChasingBottoms = doJailbreak super.ChasingBottoms; + # Forbids base >= 4.18 + cabal-install-solver = doJailbreak super.cabal-install-solver; + cabal-install = doJailbreak super.cabal-install; + # Forbids base >= 4.18 + lukko = doJailbreak super.lukko; + + # + # Too strict bounds, waiting on Hackage release in nixpkgs + # + + # base >= 4.18 is allowed in those newer versions + boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; + some = assert !(self ? some_1_0_5); doJailbreak super.some; + assoc = assert !(self ? assoc_1_1); doJailbreak super.assoc; + these = assert !(self ? assoc_1_2); doJailbreak super.these; + # Temporarily upgrade manually until the attribute is available + doctest = doDistribute (overrideCabal { + version = "0.21.1"; + sha256 = "0vgl89p6iaj2mwnd1gkpq86q1g18shdcws0p3can25algi2sldk3"; + } super.doctest_0_21_0); + + # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 + semigroupoids = doJailbreak super.semigroupoids; + # XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6 + semialign = doJailbreak super.semialign; + + # + # Too strict bounds, waiting on Revision in nixpkgs + # + + # Revision 7 lifts the offending bound on ghc-prim + ed25519 = jailbreakWhileRevision 6 super.ed25519; + # Revision 6 lifts the offending bound on base + tar = jailbreakWhileRevision 5 super.tar; + # Revision 2 lifts the offending bound on base + HTTP = jailbreakWhileRevision 1 super.HTTP; + # Revision 1 lifts the offending bound on base + dec = jailbreakWhileRevision 0 super.dec; + # Revision 2 lifts the offending bound on base + cryptohash-sha256 = jailbreakWhileRevision 1 super.cryptohash-sha256; + # Revision 4 lifts offending template-haskell bound + uuid-types = jailbreakWhileRevision 3 super.uuid-types; + # Revision 1 lifts offending base bound + quickcheck-instances = jailbreakWhileRevision 0 super.quickcheck-instances; + # Revision 1 lifts offending base bound + generically = jailbreakWhileRevision 0 super.generically; + # Revision 3 lifts offending template-haskell bound + hackage-security = jailbreakWhileRevision 2 super.hackage-security; + # Revision 6 lifts offending base bound + parallel = jailbreakWhileRevision 5 super.parallel; + + # + # Compilation failure workarounds + # + + # Add missing Functor instance for Tuple2 + # https://github.com/haskell-foundation/foundation/pull/572 + foundation = appendPatches [ + (pkgs.fetchpatch { + name = "foundation-pr-572.patch"; + url = + "https://github.com/haskell-foundation/foundation/commit/d3136f4bb8b69e273535352620e53f2196941b35.patch"; + sha256 = "sha256-oPadhQdCPJHICdCPxn+GsSQUARIYODG8Ed6g2sK+eC4="; + stripLen = 1; + }) + ] (super.foundation); + + # Test suite doesn't compile with base-4.18 / GHC 9.6 + # https://github.com/dreixel/syb/issues/40 + syb = dontCheck super.syb; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e224bfd4f5..7d65e856ed 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1914,6 +1914,7 @@ broken-packages: - gtksourceview2 - gtksourceview3 - gtk-toy + - guardian # transitive dependency uses doctest, but doctest doesn't build with newer Cabal version - guess-combinator - gulcii - gw @@ -1942,7 +1943,6 @@ broken-packages: - hactor - hactors - haddock-api - - haddock-cheatsheet - haddock-leksah - haddock-test - hadoop-formats @@ -1975,6 +1975,7 @@ broken-packages: - HaLeX - halfs - half-space + - halide-haskell # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/212823532 at 2023-03-22 - halipeto - halive - halma @@ -2246,6 +2247,7 @@ broken-packages: - hfann - HFitUI - hfmt + - hfoil # failure building library in job https://hydra.nixos.org/build/213500290 at 2023-03-26 - hfov - HFrequencyQueue - hfusion @@ -2398,6 +2400,7 @@ broken-packages: - hops - hoq - horizon + - horizon-spec # dependency missing in job https://hydra.nixos.org/build/213500294 at 2023-03-26 - horname - hosc-json - hosts-server @@ -3035,6 +3038,7 @@ broken-packages: - leapseconds - learn - Learning + - learn-physics-examples # dependency missing in job https://hydra.nixos.org/build/213500293 at 2023-03-26 - leetify - lendingclub - lens-datetime @@ -3437,6 +3441,7 @@ broken-packages: - money - mongodb-queue - monitor + - monocypher # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/212811942 at 2023-03-22 - mono-foldable - monoid - monoid-absorbing @@ -3455,6 +3460,7 @@ broken-packages: - morphisms-objects - morte - mortred + - mosaico-lib # dependency missing in job https://hydra.nixos.org/build/212818174 at 2023-03-22 - motor-reflection - mount - movie-monad @@ -4095,6 +4101,7 @@ broken-packages: - pong-server - pontarius-xpmn - pool + - poolboy # test failure in job https://hydra.nixos.org/build/212819440 at 2023-03-26 - pool-conduit - pop3-client - poppler @@ -5336,6 +5343,7 @@ broken-packages: - th-pprint - threadmanager - threadscope + - thread-supervisor # test failure in job https://hydra.nixos.org/build/214156434 at 2023-03-29 - threepenny-editors - threepenny-gui-contextmenu - threepenny-gui-flexbox @@ -5929,6 +5937,7 @@ broken-packages: - YamlReference - yaml-rpc - yaml-union + - yaml-unscrambler # dependency missing in job https://hydra.nixos.org/build/212821989 at 2023-03-22 - yampa2048 - yampa-glfw - yampa-gloss diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f98916e76c..465754bf57 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -44,13 +44,18 @@ default-package-overrides: - shake-cabal < 0.2.2.3 # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 - pandoc-crossref < 0.3.15.0 + # Needs to match hspec which is tracked in stackage + - hspec-api < 2.10 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - - Cabal == 3.2.* # required for cabal-install etc. + - Cabal == 3.2.* # required for cabal2spec - Cabal == 3.4.* # required for cabal-install etc. - - Cabal == 3.6.* # required for cabal-install-parsers etc. + - Cabal == 3.6.* + - Cabal-syntax == 3.8.* # required for cabal-install{,-parsers} + - Cabal == 3.8.* # required for cabal-install{,-parsers} + - directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2 - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - aeson < 2 # required by pantry-0.5.2 - apply-refact == 0.9.* # 2022-12-12: needed for GHC < 9.2 @@ -76,15 +81,18 @@ extra-packages: - ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 + - ghc-lib == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 + - ghc-lib-parser == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 + - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs + - hermes-json == 0.2.* # 2023-03-22: for nix-output-monitor-2.0.0.5 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 @@ -553,6 +561,7 @@ supported-platforms: hsignal: [ platforms.x86 ] # -msse2 HFuse: [ platforms.linux ] HQu: [ platforms.x86 ] # vendored C++ library needs i686/x86_64 + hs-swisstable-hashtables-class: [ platforms.x86_64 ] # depends on swisstable, which Needs AVX2 hw-prim-bits: [ platforms.x86 ] # x86 assembler inline-asm: [ platforms.x86 ] # x86 assembler keid-core: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index eb450fd1d6..332292c587 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.12 +# Stackage LTS 20.14 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -134,7 +134,7 @@ default-package-overrides: - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.8 + - bank-holidays-england ==0.2.0.9 - barbies ==2.0.4.0 - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 @@ -149,7 +149,7 @@ default-package-overrides: - base-compat ==0.12.2 - base-compat-batteries ==0.12.2 - basement ==0.0.15 - - base-orphans ==0.8.7 + - base-orphans ==0.8.8.2 - base-prelude ==1.6.1 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 @@ -174,7 +174,7 @@ default-package-overrides: - between ==0.11.0.0 - bhoogle ==0.1.4.2 - bibtex ==0.1.0.6 - - bifunctors ==5.5.14 + - bifunctors ==5.5.15 - bimap ==0.5.0 - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 @@ -184,9 +184,9 @@ default-package-overrides: - binaryen ==0.0.6.0 - binary-generic-combinators ==0.4.4.0 - binary-ieee754 ==0.1.0.0 - - binary-instances ==1.0.3 + - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.3 + - binary-orphans ==1.0.4.1 - binary-parser ==0.5.7.3 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -215,7 +215,7 @@ default-package-overrides: - blaze-html ==0.9.1.2 - blaze-markup ==0.8.2.8 - blaze-svg ==0.3.6.1 - - blaze-textual ==0.2.2.1 + - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bm ==0.1.0.2 - bmp ==1.2.6.3 @@ -297,7 +297,7 @@ default-package-overrides: - cairo ==0.13.8.2 - calendar-recycling ==0.0.0.1 - call-alloy ==0.4.0.2 - - calligraphy ==0.1.3 + - calligraphy ==0.1.4 - call-plantuml ==0.0.1.1 - call-stack ==0.4.0 - can-i-haz ==0.3.1.1 @@ -332,7 +332,7 @@ default-package-overrides: - Chart ==1.9.4 - Chart-cairo ==1.9.3 - Chart-diagrams ==1.9.4 - - chart-svg ==0.3.2 + - chart-svg ==0.3.3 - ChasingBottoms ==1.3.1.12 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 @@ -383,7 +383,7 @@ default-package-overrides: - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 - commonmark ==0.2.2 - - commonmark-extensions ==0.2.3.3 + - commonmark-extensions ==0.2.3.4 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - comonad ==5.0.8 @@ -449,7 +449,7 @@ default-package-overrides: - core-data ==0.3.9.0 - core-program ==0.6.5.0 - core-telemetry ==0.2.8.0 - - core-text ==0.3.8.0 + - core-text ==0.3.8.1 - countable ==1.2 - country ==0.2.3 - covariance ==0.2.0.1 @@ -574,7 +574,7 @@ default-package-overrides: - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.9 - - deriving-compat ==0.6.2 + - deriving-compat ==0.6.3 - detour-via-sci ==1.0.0 - df1 ==0.4.1 - dhall ==1.41.2 @@ -589,7 +589,7 @@ default-package-overrides: - diagrams-contrib ==1.4.5 - diagrams-core ==1.5.0.1 - diagrams-lib ==1.4.5.2 - - diagrams-postscript ==1.5.1 + - diagrams-postscript ==1.5.1.1 - diagrams-rasterific ==1.4.2.2 - diagrams-solve ==0.1.3 - diagrams-svg ==1.4.3.1 @@ -597,7 +597,7 @@ default-package-overrides: - dictionary-sharing ==0.1.0.0 - di-df1 ==1.2.1 - Diff ==0.4.1 - - digest ==0.0.1.5 + - digest ==0.0.1.6 - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 @@ -713,7 +713,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.8.2 + - esqueleto ==3.5.9.0 - essence-of-live-coding ==0.2.7 - essence-of-live-coding-gloss ==0.2.7 - essence-of-live-coding-pulse ==0.2.7 @@ -817,7 +817,7 @@ default-package-overrides: - ForestStructures ==0.0.1.0 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.2.1 + - formatn ==0.2.2 - format-numbers ==0.1.0.1 - formatting ==7.1.3 - fortran-src ==0.12.0 @@ -858,7 +858,7 @@ default-package-overrides: - generic-constraints ==1.1.1.1 - generic-data ==1.0.0.1 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.14.2 + - generic-deriving ==1.14.3 - generic-functor ==1.1.0.0 - generic-lens ==2.2.1.0 - generic-lens-core ==2.2.1.0 @@ -914,8 +914,8 @@ default-package-overrides: - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghcjs-perch ==0.3.3.3 - - ghc-lib ==9.2.6.20230211 - - ghc-lib-parser ==9.2.6.20230211 + - ghc-lib ==9.2.7.20230228 + - ghc-lib-parser ==9.2.7.20230228 - ghc-lib-parser-ex ==9.2.0.4 - ghc-parser ==0.2.4.0 - ghc-paths ==0.1.0.12 @@ -978,7 +978,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.4 - gnuplot ==0.5.7 - - goldplate ==0.2.0 + - goldplate ==0.2.1.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gotyno-hs ==1.1.0 @@ -1028,7 +1028,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.3.1 - haskeline ==0.8.2.1 - - haskell-gi ==0.26.2 + - haskell-gi ==0.26.3 - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1046,7 +1046,7 @@ default-package-overrides: - hasktags ==0.72.0 - hasql ==1.6.3 - hasql-dynamic-statements ==0.3.1.2 - - hasql-implicits ==0.1.0.5 + - hasql-implicits ==0.1.1 - hasql-migration ==0.3.0 - hasql-notifications ==0.2.0.3 - hasql-optparse-applicative ==0.5 @@ -1206,7 +1206,7 @@ default-package-overrides: - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - htaglib ==1.2.0 - - HTF ==0.15.0.0 + - HTF ==0.15.0.1 - html ==1.0.1.2 - html-conduit ==1.3.2.2 - html-email-validate ==0.2.0.0 @@ -1309,7 +1309,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1 - indexed-traversable ==0.1.2 - - indexed-traversable-instances ==0.1.1.1 + - indexed-traversable-instances ==0.1.1.2 - infer-license ==0.2.0 - inflections ==0.4.0.6 - influxdb ==1.9.2.2 @@ -1333,7 +1333,7 @@ default-package-overrides: - IntervalMap ==0.6.2.0 - intervals ==0.9.2 - intset-imperative ==0.1.0.0 - - invariant ==0.6 + - invariant ==0.6.1 - invert ==1.0.0.2 - invertible-grammar ==0.1.3.3 - io-machine ==0.2.0.0 @@ -1440,6 +1440,7 @@ default-package-overrides: - leancheck ==0.9.12 - leancheck-instances ==0.0.5 - leapseconds-announced ==2017.1.0.1 + - learn-physics ==0.6.5 - leb128-cereal ==1.2 - lens ==5.1.1 - lens-action ==0.2.6 @@ -1452,7 +1453,7 @@ default-package-overrides: - lens-properties ==4.11.1 - lens-regex ==0.1.3 - lens-regex-pcre ==1.1.0.0 - - lentil ==1.5.4.2 + - lentil ==1.5.5.0 - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 @@ -1712,7 +1713,7 @@ default-package-overrides: - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.11 - - network ==3.1.2.7 + - network ==3.1.2.8 - network-bsd ==2.8.1.0 - network-byte-order ==0.1.6 - network-conduit-tls ==1.3.2 @@ -1747,6 +1748,7 @@ default-package-overrides: - non-negative ==0.1.2 - normaldistribution ==1.1.0.3 - normalization-insensitive ==2.0.2 + - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.4 @@ -1756,9 +1758,9 @@ default-package-overrides: - numeric-limits ==0.1.0.0 - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - - numhask ==0.10.1.0 - - numhask-array ==0.10.1 - - numhask-space ==0.10.0.0 + - numhask ==0.10.1.1 + - numhask-array ==0.10.2 + - numhask-space ==0.10.0.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.3 - nuxeo ==0.3.2 @@ -1886,7 +1888,7 @@ default-package-overrides: - persistent-mongoDB ==2.13.0.1 - persistent-mysql ==2.13.1.4 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.5.1 + - persistent-postgresql ==2.13.5.2 - persistent-qq ==2.12.0.2 - persistent-redis ==2.13.0.1 - persistent-refs ==0.4 @@ -2044,7 +2046,7 @@ default-package-overrides: - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - quickcheck-higherorder ==0.1.0.1 - - quickcheck-instances ==0.3.28 + - quickcheck-instances ==0.3.29.1 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 @@ -2091,13 +2093,12 @@ default-package-overrides: - reactive-banana ==1.3.2.0 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - reanimate-svg ==0.13.0.1 - rebase ==1.16.1 - rec-def ==0.2.1 - - record-dot-preprocessor ==0.2.15 + - record-dot-preprocessor ==0.2.16 - record-hasfield ==1.0 - rec-smallarray ==0.1.0.0 - - recursion-schemes ==5.2.2.3 + - recursion-schemes ==5.2.2.4 - recv ==0.0.0 - redact ==0.4.0.0 - reddit-scrape ==0.0.1 @@ -2106,7 +2107,7 @@ default-package-overrides: - refact ==0.3.0.2 - ref-fd ==0.5 - refined ==0.8 - - reflection ==2.1.6 + - reflection ==2.1.7 - reform ==0.2.7.5 - reform-blaze ==0.2.4.4 - reform-hamlet ==0.0.5.3 @@ -2375,6 +2376,7 @@ default-package-overrides: - sox ==0.2.3.2 - spacecookie ==1.0.0.2 - sparse-linear-algebra ==0.3.1 + - spatial-math ==0.2.7.0 - spdx ==1.0.0.3 - special-values ==0.1.0.0 - speculate ==0.4.14 @@ -2419,7 +2421,7 @@ default-package-overrides: - stitch ==0.6.0.0 - stm-chans ==3.0.0.6 - stm-conduit ==4.0.1 - - stm-containers ==1.2 + - stm-containers ==1.2.0.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.9 @@ -2600,8 +2602,8 @@ default-package-overrides: - text-regex-replace ==0.1.1.5 - text-rope ==0.2 - text-short ==0.1.5 - - text-show ==3.10 - - text-show-instances ==3.9.4 + - text-show ==3.10.2 + - text-show-instances ==3.9.5 - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 @@ -2619,7 +2621,7 @@ default-package-overrides: - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.6 - th-lego ==0.3.0.2 - - th-lift ==0.8.2 + - th-lift ==0.8.3 - th-lift-instances ==0.1.20 - th-nowq ==0.1.0.5 - th-orphans ==0.13.14 @@ -2704,7 +2706,7 @@ default-package-overrides: - twitter-types ==0.11.0 - twitter-types-lens ==0.11.0 - typecheck-plugin-nat-simple ==0.1.0.7 - - typed-process ==0.2.10.1 + - typed-process ==0.2.11.0 - typed-uuid ==0.2.0.0 - type-equality ==1 - type-errors ==0.2.0.1 @@ -2767,7 +2769,7 @@ default-package-overrides: - unix-compat ==0.5.4 - unix-time ==0.4.8 - unjson ==0.15.4 - - unliftio ==0.2.23.0 + - unliftio ==0.2.24.0 - unliftio-core ==0.2.1.0 - unliftio-path ==0.0.2.0 - unliftio-pool ==0.2.2.0 @@ -2900,7 +2902,7 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==1.1.6.1 -with-compiler: ghc-9.2.6 +with-compiler: ghc-9.2.7 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -2918,7 +2920,7 @@ with-compiler: ghc-9.2.6 - word-wrap ==0.5 - world-peace ==1.0.2.0 - wrap ==0.0.0 - - wreq ==0.5.3.3 + - wreq ==0.5.4.0 - wreq-stringless ==0.5.9.1 - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 @@ -2970,12 +2972,12 @@ with-compiler: ghc-9.2.6 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 - yesod-alerts ==0.1.3.0 - - yesod-auth ==1.6.11 + - yesod-auth ==1.6.11.1 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.7.0.3 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.1 + - yesod-core ==1.6.24.2 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.4 @@ -3006,7 +3008,7 @@ with-compiler: ghc-9.2.6 - zim-parser ==0.2.1.0 - zio ==0.1.0.2 - zip ==1.7.2 - - zip-archive ==0.4.2.2 + - zip-archive ==0.4.3 - zipper-extra ==0.1.3.2 - zippers ==0.3.2 - zip-stream ==0.2.2.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9ca4158e82..110aea611d 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -247,7 +247,6 @@ dont-distribute-packages: - KiCS-debugger - KiCS-prophecy - LDAPv3 - - LPFP - LPPaver - LambdaHack - LambdaINet @@ -679,7 +678,7 @@ dont-distribute-packages: - ascii-superset_1_3_0_0 - ascii-table - ascii-th_1_2_0_0 - - ascii_1_6_0_0 + - ascii_1_7_0_0 - asic - asil - assert4hs-hspec @@ -741,6 +740,7 @@ dont-distribute-packages: - babylon - backblaze-b2-hs - backdropper + - balkon - ballast - bamboo - bamboo-launcher @@ -1285,6 +1285,9 @@ dont-distribute-packages: - dobutokO3 - dobutokO4 - doc-review + - domain + - domain-aeson + - domain-cereal - domaindriven - dormouse-client - dovetail @@ -2132,7 +2135,6 @@ dont-distribute-packages: - hexpat-iteratee - hfd - hfiar - - hfoil - hfractal - hgalib - hgen @@ -2200,7 +2202,6 @@ dont-distribute-packages: - hoppy-runtime - hoppy-std - horizon-gen-nix - - horizon-spec - horizon-spec-lens - horizon-spec-pretty - hotswap @@ -2570,8 +2571,6 @@ dont-distribute-packages: - ldapply - leaky - lean - - learn-physics - - learn-physics-examples - learning-hmm - legion - legion-discovery @@ -2937,8 +2936,6 @@ dont-distribute-packages: - nomyx-library - nomyx-server - nonlinear-optimization-backprop - - not-gloss - - not-gloss-examples - notmuch-web - now-haskell - nri-env-parser @@ -3073,6 +3070,10 @@ dont-distribute-packages: - peyotls - peyotls-codec - pg-entity + - phladiprelio-general-shared + - phladiprelio-general-simple + - phladiprelio-ukrainian-shared + - phladiprelio-ukrainian-simple - phonetic-languages-common - phonetic-languages-constraints - phonetic-languages-examples @@ -3129,7 +3130,12 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu + - polysemy-account + - polysemy-account-api - polysemy-conc + - polysemy-db + - polysemy-hasql + - polysemy-hasql-test - polysemy-http - polysemy-log - polysemy-log-co @@ -3692,7 +3698,7 @@ dont-distribute-packages: - sparser - spartacon - spata - - spatial-math + - spatial-math_0_5_0_1 - specialize-th - spectral-clustering - speculation-transformers @@ -3708,6 +3714,7 @@ dont-distribute-packages: - sproxy - sproxy-web - sproxy2 + - sqel - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql @@ -4287,6 +4294,7 @@ dont-distribute-packages: - zerobin - zeromq3-conduit - zeroth + - zeugma - zifter-cabal - zifter-git - zifter-google-java-format diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 988d9a9f0b..a44417dbbb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -359,6 +359,13 @@ self: super: builtins.intersectAttrs super { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; }) super.ghcide; + # Tests execute goldplate + goldplate = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/goldplate:$PATH" + ''; + }) super.goldplate; + # At least on 1.3.4 version on 32-bit architectures tasty requires # unbounded-delays via .cabal file conditions. tasty = overrideCabal (drv: { @@ -910,7 +917,7 @@ self: super: builtins.intersectAttrs super { hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }; hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }); hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: { - passthru.nixPackage = pkgs.nixVersions.nix_2_12; + passthru.nixPackage = pkgs.nixVersions.nix_2_14; }); # the testsuite fails because of not finding tsc without some help @@ -1075,14 +1082,6 @@ self: super: builtins.intersectAttrs super { # Wants to execute cabal-install to (re-)build itself hint = dontCheck super.hint; - # Make sure that Cabal 3.8.* can be built as-is - Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({ - Cabal-syntax = self.Cabal-syntax_3_8_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_17_0; - })); - # cabal-install switched to build type simple in 3.2.0.0 # as a result, the cabal(1) man page is no longer installed # automatically. Instead we need to use the `cabal man` diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index bff5cd98c4..8e0e8c6bb7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2137,6 +2137,8 @@ self: { pname = "BlogLiterately"; version = "0.8.8.2"; sha256 = "1m4l5p8qg1mqg612x43gip5gp10x4avrm36b9iw2r2ny32rvwkdy"; + revision = "1"; + editedCabalFile = "0dqdqqbl6hvdpxn6zdcy6yfvjx3q1ch1kfs512rr3nl2kwd6lrs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2923,6 +2925,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal_3_10_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers + , deepseq, directory, filepath, mtl, parsec, pretty, process, text + , time, transformers, unix + }: + mkDerivation { + pname = "Cabal"; + version = "3.10.1.0"; + sha256 = "1vlqrh75s1n82ymd7yxbmy9py1n35fvdhw7hn1ph2y1i9j7apnqb"; + setupHaskellDepends = [ mtl parsec ]; + libraryHaskellDepends = [ + array base bytestring Cabal-syntax containers deepseq directory + filepath mtl parsec pretty process text time transformers unix + ]; + doCheck = false; + description = "A framework for packaging Haskell software"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Cabal-ide-backend" = callPackage ({ mkDerivation, array, base, binary, bytestring, Cabal, containers , deepseq, directory, extensible-exceptions, filepath, HUnit @@ -2981,6 +3003,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "Cabal-syntax_3_10_1_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , deepseq, directory, filepath, mtl, parsec, pretty, text, time + , transformers, unix + }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.10.1.0"; + sha256 = "08pmafs761bk892s2arf8s17wswhxr8ar642vsh6hxrjalihk01v"; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + mtl parsec pretty text time transformers unix + ]; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -3294,6 +3334,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.12"; sha256 = "1vy9yq07p95qiap1pcp2bbbn1mqvp3spyrswpdz0qfcn06656650"; + revision = "1"; + editedCabalFile = "0ra041bg2m04niqzi0y468cfmv2bkjh8ckix2i8xf2shw7v2zn4r"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -9708,44 +9750,6 @@ self: { }) {}; "HTF" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff - , directory, filepath, haskell-src, HUnit, lifted-base - , monad-control, mtl, old-time, pretty, process, QuickCheck, random - , regex-compat, template-haskell, temporary, text, time, unix - , unordered-containers, vector, xmlgen - }: - mkDerivation { - pname = "HTF"; - version = "0.15.0.0"; - sha256 = "16sbz9rr1v8p3b0qi6b9rvzqgbd4rr05qp2wiiy0nc2gh1qca4nq"; - revision = "1"; - editedCabalFile = "1rd9iwchb4pg441hvqi7qn41v0ihd8sh2ma1h8incyswn527m1ml"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal process ]; - libraryHaskellDepends = [ - aeson array base base64-bytestring bytestring containers cpphs Diff - directory haskell-src HUnit lifted-base monad-control mtl old-time - pretty process QuickCheck random regex-compat text time unix vector - xmlgen - ]; - libraryToolDepends = [ cpphs ]; - executableHaskellDepends = [ - array base cpphs directory HUnit mtl old-time random text - ]; - executableToolDepends = [ cpphs ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath HUnit mtl - process random regex-compat template-haskell temporary text - unordered-containers - ]; - description = "The Haskell Test Framework"; - license = lib.licenses.lgpl21Only; - mainProgram = "htfpp"; - }) {}; - - "HTF_0_15_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff , directory, filepath, haskell-src, HUnit, lifted-base @@ -9778,7 +9782,6 @@ self: { ]; description = "The Haskell Test Framework"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; mainProgram = "htfpp"; }) {}; @@ -12709,7 +12712,6 @@ self: { ]; description = "Code for the book Learn Physics with Functional Programming"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "LPPaver" = callPackage @@ -16961,10 +16963,8 @@ self: { }: mkDerivation { pname = "PropaFP"; - version = "0.1.1.0"; - sha256 = "0r69x9i5iq740y6r7v3i86q7vx19qwrad0klmi3iy7a0g7wa5ldy"; - revision = "1"; - editedCabalFile = "0sx7198rx2ajcp6mn0ym474h24fizf1cbw0skyw8fanri7jr2i41"; + version = "0.1.2.0"; + sha256 = "1mp5dw7yhcqazqnlg6wd0ygd7ck869cwsqh6kgkv10cpxjy94v39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25257,6 +25257,8 @@ self: { pname = "adjunctions"; version = "4.4.2"; sha256 = "06354xzgf78jl4g1xw11rp74gi7zh94rgvsji7ma1g0hp26myyql"; + revision = "1"; + editedCabalFile = "0ii8818fr1h3wpyaqwa44gn1kv7lafbw9b4qdj7r86w5k5q00ypp"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -25504,8 +25506,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; - revision = "5"; - editedCabalFile = "01mbxj0cqbf20pwgx2021r79xwp8r3sjpvhxlpay5lk0s9pvn0sh"; + revision = "6"; + editedCabalFile = "0bc55wc1ad5qvaf8kf8gbwvzd4i0qmgwykidcl5gb2bam3scb870"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -25756,18 +25758,21 @@ self: { }) {}; "aeson-decode" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, containers, data-default - , hedgehog, text, time, unordered-containers, vector + ({ mkDerivation, aeson, aeson-qq, base, containers + , data-default-class, hspec, quaalude, text, time + , unordered-containers, vector }: mkDerivation { pname = "aeson-decode"; - version = "0.1.0.0"; - sha256 = "0x5gjp86554p09r8r73wpmv840d6dkc7vmqyq60nj6v6spq5v7bx"; + version = "0.1.0.1"; + sha256 = "0n2bs07v5xb7qmx6rg3dzp0iwf2dwpq3ymg7myhggh1088xkchki"; libraryHaskellDepends = [ - aeson base containers data-default text unordered-containers vector + aeson base containers data-default-class quaalude text + unordered-containers vector ]; testHaskellDepends = [ - aeson-qq base containers hedgehog text time + aeson aeson-qq base containers data-default-class hspec quaalude + text time unordered-containers vector ]; description = "Easy functions for converting from Aeson.Value"; license = lib.licenses.asl20; @@ -32957,10 +32962,8 @@ self: { }: mkDerivation { pname = "api-tools"; - version = "0.10.0.0"; - sha256 = "0hz4pa0n4wf9kd8r98xd0c39p790fn9iaqzjj2m653641acjbm0w"; - revision = "1"; - editedCabalFile = "13c5qg7f1a0hh1x2dmw6hnpi2vkmcasg38wl3lzf2plfcibqb01m"; + version = "0.10.0.1"; + sha256 = "14qmjmxp7bbf94wjkvz2fxvn08vqm1n8l3vjh2rw9mj518lx8ga3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33875,8 +33878,8 @@ self: { pname = "approximate"; version = "0.3.5"; sha256 = "1f168ac9xryrv50k7gvh89xv0mj6c42cxw7pj01pqcbppbs0rm3g"; - revision = "1"; - editedCabalFile = "1dv6jk6hin5bvzdvdz10nlk4xfhn03mdd90f8g94ah4gyqsx6sfk"; + revision = "2"; + editedCabalFile = "1yak9kv090502q8kqszmrjdp13dd737klppp78983yipd9k2h5gv"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens log-domain pointed safecopy semigroupoids semigroups vector @@ -34418,8 +34421,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.6"; - sha256 = "1s6fmz4mz333q8blj0x9c8wl8hh7zxq7b7jz0icdkc53ncghbfhv"; + version = "1.7.7"; + sha256 = "13ixjxzfq3f25an3z7ahrav9nr84f93wb95pwjykybm2vjnn3dkv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -35333,15 +35336,15 @@ self: { license = lib.licenses.asl20; }) {}; - "ascii_1_6_0_0" = callPackage + "ascii_1_7_0_0" = callPackage ({ mkDerivation, ascii-case, ascii-caseless, ascii-char , ascii-group, ascii-numbers, ascii-predicates, ascii-superset , ascii-th, base, bytestring, hspec, text }: mkDerivation { pname = "ascii"; - version = "1.6.0.0"; - sha256 = "0ax8gn1nbb9p6ai8rq48jf98vn952q4xl7h1mxi377rywcpfy9y5"; + version = "1.7.0.0"; + sha256 = "0rwkj0ncsan0r1v70afqwj2mdhdg9qyawp2nm01056iwj88kgg9p"; libraryHaskellDepends = [ ascii-case ascii-caseless ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -36379,8 +36382,8 @@ self: { pname = "async"; version = "2.2.4"; sha256 = "09d7w3krfhnmf9dp6yffa9wykinhw541wibnjgnlyv77w1dzhka8"; - revision = "2"; - editedCabalFile = "1j93w1krkadqijn59yjiws1366yhcn2mad1irqrk50in6l10k51b"; + revision = "3"; + editedCabalFile = "023y75hfcvmjicmq5kxw55h2y729cysh1wlkggmwnv9jr307sdj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -36882,6 +36885,18 @@ self: { license = lib.licenses.asl20; }) {}; + "atomic-modify-general" = callPackage + ({ mkDerivation, base, primitive }: + mkDerivation { + pname = "atomic-modify-general"; + version = "0.1.0.0"; + sha256 = "0xrjnd31aq5ajga5n6lq1rm7wdyxqqnmc90z0zb4zp97b6vjsa2v"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base ]; + description = "Generalizations of atomicModifyIORef"; + license = lib.licenses.bsd2; + }) {}; + "atomic-primops" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { @@ -37159,8 +37174,8 @@ self: { pname = "attenuation"; version = "0.2.0"; sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; - revision = "4"; - editedCabalFile = "1cp14r4i8zv3c93y78d61fxbwn8y2p7fqfp20192xy8zbnn3hdhy"; + revision = "5"; + editedCabalFile = "0269x7gl1a0vca6qd31fv4cdrq77dl1kxwg9dini6cgg2x794kfs"; libraryHaskellDepends = [ base constraints ]; description = "Subtyping relations and variance roles"; license = lib.licenses.asl20; @@ -37172,8 +37187,8 @@ self: { pname = "attenuation-profunctors"; version = "0.1.0"; sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; - revision = "2"; - editedCabalFile = "1vwavg3c478r36qv1sz800b689cmpmldn3lyr9jl0ag1vmrff6y6"; + revision = "3"; + editedCabalFile = "1s6fbn0wy5vxv7kb09ph11m8hjbcxxpr1rfbp3907ggpwfh43zha"; libraryHaskellDepends = [ attenuation base constraints profunctors ]; @@ -40085,6 +40100,29 @@ self: { broken = true; }) {}; + "balkon" = callPackage + ({ mkDerivation, base, bytestring, filepath, harfbuzz-pure, hspec + , hspec-discover, hspec-golden, text, text-icu + , unicode-data-scripts + }: + mkDerivation { + pname = "balkon"; + version = "0.1.0.0"; + sha256 = "0qv3b1y1m7aqnl17g0gpabs24s1h46jnvrpf1n9an2b5mhb41k8q"; + libraryHaskellDepends = [ + base harfbuzz-pure text text-icu unicode-data-scripts + ]; + testHaskellDepends = [ + base bytestring filepath harfbuzz-pure hspec hspec-discover + hspec-golden text text-icu + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Text layout engine built on top of HarfBuzz"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ballast" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, hspec , hspec-expectations, http-client, http-client-tls, http-types @@ -40292,18 +40330,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.8"; - sha256 = "1n2ddf60q2g1yjwq754irxq9nzmx5i2z3r2rnw263bppcldkizkj"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_9" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -40313,7 +40339,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "banwords" = callPackage @@ -40519,12 +40544,12 @@ self: { broken = true; }) {}; - "base_4_17_0_0" = callPackage + "base_4_18_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.17.0.0"; - sha256 = "1ma01nc34knldpp1mb0j5mv07sy28kih6529kfkm1w0c7apc0aiy"; + version = "4.18.0.0"; + sha256 = "0wx6a14k4gp7kmsy3bpz752q5gvnka0k69bi65zn2arpq89s8nsn"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -40542,6 +40567,18 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat_0_13_0" = callPackage + ({ mkDerivation, base, ghc-prim, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.13.0"; + sha256 = "03d3rr7v27giv90dz8128mzfa76qxkbvkzm7fiwh76l4v9sn1xlb"; + libraryHaskellDepends = [ base ghc-prim unix ]; + description = "A compatibility layer for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-batteries" = callPackage ({ mkDerivation, base, base-compat, ghc-prim, hspec, hspec-discover , QuickCheck @@ -40557,6 +40594,24 @@ self: { license = lib.licenses.mit; }) {}; + "base-compat-batteries_0_13_0" = callPackage + ({ mkDerivation, base, base-compat, foldable1-classes-compat + , ghc-prim, hspec, hspec-discover, OneTuple, QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.13.0"; + sha256 = "161g4g8ncnwbqafxp5hdbmv4qfmscf7b3pd88l49nkyns50ays1p"; + libraryHaskellDepends = [ + base base-compat foldable1-classes-compat ghc-prim OneTuple + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -40648,8 +40703,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8.7"; - sha256 = "0iz4v4h2ydncdwfqzs8fd2qwl38dx0n94w5iymw2g4xy1mzxd3w8"; + version = "0.8.8.2"; + sha256 = "14jhh848q3451hqi4knslc7nnvw9dn77vawnhp4qs4l4703fgjk1"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -40657,6 +40712,21 @@ self: { license = lib.licenses.mit; }) {}; + "base-orphans_0_9_0" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.9.0"; + sha256 = "0qkfs49gm0zv946h47bi8nshp6b2d6d5drlslm4adm8y4kcd8gk1"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41442,8 +41512,8 @@ self: { pname = "batching"; version = "0.1.0.0"; sha256 = "1mks6w3zfvkdgi9didf94jp1hac9ps4pli75vn79p9hxjwc2fm27"; - revision = "3"; - editedCabalFile = "1gahl1kia0ivs12hms380fjk1jdpnmrbns2kgf3csznfc7nbkv1c"; + revision = "4"; + editedCabalFile = "1dnh8pv0g1n4wrrvvkm70j04hqna8i6hj4v5w6zgza4hbxc8mp59"; libraryHaskellDepends = [ base primitive short-vec sint ]; testHaskellDepends = [ base primitive QuickCheck short-vec sint test-framework @@ -42989,8 +43059,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.14"; - sha256 = "0r4jd4s66xvnx0bk75rz0cwnf6cr0lgx3dxrqdv3ppkwqk81c0ak"; + version = "5.5.15"; + sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; libraryHaskellDepends = [ base base-orphans comonad containers tagged template-haskell th-abstraction transformers @@ -43004,18 +43074,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "bifunctors_5_5_15" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat + "bifunctors_5_6" = callPackage + ({ mkDerivation, base, bifunctor-classes-compat, comonad + , containers, foldable1-classes-compat, hspec, hspec-discover + , QuickCheck, tagged, template-haskell, th-abstraction + , transformers, transformers-compat }: mkDerivation { pname = "bifunctors"; - version = "5.5.15"; - sha256 = "1dz3v6qdilm6z9vl25xrma2if6i151v6rmgnvd461parsd89sdfn"; + version = "5.6"; + sha256 = "1fjinhbp0pbrnpcpzgbwbvghigq09akz013m0jl5d3kmdypl4fml"; libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers + base bifunctor-classes-compat comonad containers + foldable1-classes-compat tagged template-haskell th-abstraction + transformers ]; testHaskellDepends = [ base hspec QuickCheck template-haskell transformers @@ -43465,31 +43537,6 @@ self: { }) {}; "binary-instances" = callPackage - ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring - , case-insensitive, hashable, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck - , text, text-binary, time-compat, unordered-containers, vector - , vector-binary-instances - }: - mkDerivation { - pname = "binary-instances"; - version = "1.0.3"; - sha256 = "00wwdk744x762p39jkg0azswxj0qy1lxjw8h9z2c0cvfam934987"; - libraryHaskellDepends = [ - aeson base binary binary-orphans case-insensitive hashable - primitive scientific tagged text text-binary time-compat - unordered-containers vector vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary bytestring case-insensitive hashable primitive - QuickCheck quickcheck-instances scientific tagged tasty - tasty-quickcheck text time-compat unordered-containers vector - ]; - description = "Orphan instances for binary"; - license = lib.licenses.bsd3; - }) {}; - - "binary-instances_1_0_4" = callPackage ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring , case-insensitive, data-array-byte, hashable, primitive , QuickCheck, quickcheck-instances, scientific, tagged, tasty @@ -43513,7 +43560,6 @@ self: { ]; description = "Orphan instances for binary"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-io" = callPackage @@ -43565,32 +43611,14 @@ self: { }) {}; "binary-orphans" = callPackage - ({ mkDerivation, base, binary, OneTuple, QuickCheck - , quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "binary-orphans"; - version = "1.0.3"; - sha256 = "0b302hhjaybwbnpzrd8qmdp24g2xj2svib34zfxqqxg67j159rg2"; - libraryHaskellDepends = [ base binary transformers ]; - testHaskellDepends = [ - base binary OneTuple QuickCheck quickcheck-instances tagged tasty - tasty-quickcheck - ]; - description = "Compatibility package for binary; provides instances"; - license = lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_4" = callPackage ({ mkDerivation, base, binary, data-array-byte, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck , transformers }: mkDerivation { pname = "binary-orphans"; - version = "1.0.4"; - sha256 = "08999f7c9l3dck59k1p9jj2nbbdj99i3gwmrqj24la5rywgw8rd0"; + version = "1.0.4.1"; + sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; libraryHaskellDepends = [ base binary data-array-byte transformers ]; @@ -43600,7 +43628,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -46457,8 +46484,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "10"; - editedCabalFile = "0ligm4x3anq0z5nvkm0jql14jbvrim7wh34ih5li4cdwb5nlpyhn"; + revision = "11"; + editedCabalFile = "1dyg4f4ji23lvq8ma7j7423z5ssd4ahbb1qgw1w586abbhziicn2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -46859,15 +46886,15 @@ self: { "blaze-textual" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, double-conversion , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework - , test-framework-quickcheck2, text, time, vector + , test-framework-quickcheck2, text, vector }: mkDerivation { pname = "blaze-textual"; - version = "0.2.2.1"; - sha256 = "0zjnwnjpcpnnm0815h9ngr3a3iy0szsnb3nrcavkbx4905s9k4bs"; + version = "0.2.3.1"; + sha256 = "1chpaynfqiykqdk4jrmwxczj01wph8qfb411600l0gj3g34wlanx"; libraryHaskellDepends = [ base blaze-builder bytestring ghc-prim integer-gmp old-locale text - time vector + vector ]; testHaskellDepends = [ base blaze-builder bytestring double-conversion QuickCheck @@ -48688,16 +48715,15 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time, transformers + , semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.0"; - sha256 = "1b4lbagj0pp19sms4q6p4gq27sf7yrzlcgcgl3zlmh3hh0wrrw14"; + version = "0.9.1"; + sha256 = "1dd82rf1fpmhgryws67phgpfy4kfy4q1anh5l37g162dgy6kyi0z"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time - transformers ]; description = "boxes"; license = lib.licenses.bsd3; @@ -48723,8 +48749,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.4.0"; - sha256 = "0svbqs00db6kvd81b5zk7k6v7fmy12c11d933z12zsslxp8ncp91"; + version = "0.4.1"; + sha256 = "111xbdyavpwjjzyn4y5gmva0izzinjfmb5qs1id4z2qvx43cjk8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49211,14 +49237,13 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "0.2.0.1"; - sha256 = "1rqmpk45fy9w6jqmaxdbg8giv3dv72qd522yz1wsj4zmkfjrhw41"; + version = "1.0.0.1"; + sha256 = "02y7jzvy47ay88c7pc776z2vbsmdljac2avzx0477bg5z99rmyx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers generic-lens microlens optics-core vty ]; - doHaddock = false; description = "Tabular list widgets for brick"; license = lib.licenses.bsd0; hydraPlatforms = lib.platforms.none; @@ -50327,6 +50352,30 @@ self: { broken = true; }) {}; + "build-env" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, optparse-applicative, process, temporary + , text, time, transformers + }: + mkDerivation { + pname = "build-env"; + version = "1.1.0.0"; + sha256 = "07gw9wzyx92as7didf32b6q8nmjifsxg4z27gqb61dnq7hrrjhf4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath process + temporary text time transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath optparse-applicative + text + ]; + description = "Compute, fetch and install Cabal build plans into a local environment"; + license = lib.licenses.bsd3; + mainProgram = "build-env"; + }) {}; + "buildable" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, text }: mkDerivation { @@ -51717,6 +51766,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-trie_0_2_7_1" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-trie"; + version = "0.2.7.1"; + sha256 = "13s973qah41awyh3sa5s2nnpm11q1klz50dasa798q9ciihwzj96"; + libraryHaskellDepends = [ base binary bytestring deepseq ]; + testHaskellDepends = [ + base binary bytestring deepseq QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq QuickCheck + ]; + description = "An efficient finite map from bytestrings to values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-typenats" = callPackage ({ mkDerivation, base, binary, blake2, bytestring, cereal , criterion, cryptohash, deepseq, entropy, QuickCheck @@ -52831,10 +52902,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.8.1.0"; - sha256 = "1rk7xb86c1vgarv1m16d2i82fiig6q119j51gvq2pq8l5rpl7kk1"; - revision = "3"; - editedCabalFile = "14l2jvyrzhgkmgkrkhmb6cb1vy4pgcg3q8dgyg8vszpm0mb1ws77"; + version = "3.10.1.0"; + sha256 = "13c3qx0qw7kizaj2dpgl2y3pj86pgqvmkck20w726jalamlf6pcr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53000,10 +53069,8 @@ self: { }: mkDerivation { pname = "cabal-install-solver"; - version = "3.8.1.0"; - sha256 = "1rzzi3jx5ivxy43vdg460fsbn1p2v5br1havcara65vmqgv6j8yz"; - revision = "1"; - editedCabalFile = "1g487j20pj03pc10yaha18v73wh3ackxjgfpfqaj7xznqcbm5xwm"; + version = "3.10.1.0"; + sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c"; libraryHaskellDepends = [ array base bytestring Cabal Cabal-syntax containers edit-distance filepath mtl pretty transformers @@ -53870,16 +53937,16 @@ self: { }) {}; "cached-io" = callPackage - ({ mkDerivation, base, stm, time, transformers }: + ({ mkDerivation, base, exceptions, stm, time, transformers }: mkDerivation { pname = "cached-io"; - version = "1.1.0.0"; - sha256 = "0c0zg2x85mc3whlrllal4v4wfgb8fyfwxi0wh788wlyyqjznfcim"; + version = "1.2.0.0"; + sha256 = "066ccn6vgrf5s8blqk2wdmm5lkk8rjf4p43ng1i5nhd16z71kc1a"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base stm time transformers ]; + libraryHaskellDepends = [ base exceptions stm time transformers ]; executableHaskellDepends = [ base ]; - description = "A simple library to cache a single IO action with timeout"; + description = "A simple library to cache IO actions"; license = lib.licenses.asl20; mainProgram = "test-cachedIO"; }) {}; @@ -53953,37 +54020,38 @@ self: { "cachix" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , cachix-api, concurrent-extra, conduit, conduit-extra - , conduit-zstd, containers, cookie, cryptonite, dhall, directory - , ed25519, either, extra, filepath, fsnotify - , hercules-ci-cnix-store, here, hnix-store-core, hspec + , cachix-api, concurrent-extra, conduit, conduit-concurrent-map + , conduit-extra, conduit-zstd, containers, cookie, cryptonite + , deepseq, dhall, directory, ed25519, either, extra, filepath + , fsnotify, hercules-ci-cnix-store, here, hnix-store-core, hspec , hspec-discover, http-client, http-client-tls, http-conduit , http-types, inline-c-cpp, katip, lukko, lzma-conduit, megaparsec - , memory, mmorph, netrc, nix, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time, unix - , unordered-containers, uri-bytestring, uuid, vector, versions - , websockets, wuss + , memory, mmorph, netrc, network-uri, nix, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, unix, unordered-containers, uri-bytestring, uuid + , vector, versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.2"; - sha256 = "1fvm565651rd0wlx3rhsrm3x8fa1jjvpkp9xgrcj8pnpi5dsn07w"; + version = "1.3.1"; + sha256 = "0d21m3fy2ncci06l72bmb5l6sbhmc0a7ncimkgynnh4jjpah4c3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring cachix-api - concurrent-extra conduit conduit-extra conduit-zstd containers - cookie cryptonite dhall directory ed25519 either extra filepath - fsnotify hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types inline-c-cpp katip lukko - lzma-conduit megaparsec memory mmorph netrc optparse-applicative - pretty-terminal prettyprinter process protolude resourcet retry - safe-exceptions servant servant-auth servant-auth-client - servant-client servant-client-core servant-conduit stm stm-chans - stm-conduit systemd temporary text time unix unordered-containers + concurrent-extra conduit conduit-concurrent-map conduit-extra + conduit-zstd containers cookie cryptonite deepseq dhall directory + ed25519 either extra filepath fsnotify hercules-ci-cnix-store here + hnix-store-core http-client http-client-tls http-conduit http-types + inline-c-cpp katip lukko lzma-conduit megaparsec memory mmorph + netrc network-uri optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-client-core servant-conduit stm stm-chans stm-conduit + systemd temporary text time unix unordered-containers uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; @@ -54013,8 +54081,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.2"; - sha256 = "1i3z0arn8cwglbsq8kxzcpp2ghypv7i03crpplbn0myk8wzflxdy"; + version = "1.3.1"; + sha256 = "1sp8884lbn86yqjm3f6d43qy3af3hd1zivdbgarvyfxxc16aqd6v"; libraryHaskellDepends = [ aeson async base base16-bytestring bytestring conduit cookie cryptonite deepseq deriving-aeson exceptions http-api-data @@ -54591,8 +54659,8 @@ self: { }: mkDerivation { pname = "calligraphy"; - version = "0.1.3"; - sha256 = "0fkjvvisrnadli5i8l7b8d8n7z3lwhzrihfrl3h9jkgham54f5mp"; + version = "0.1.4"; + sha256 = "02rx9paly04213m314wb85kahf8s6yp1d16ykhsm7v6ia79jh13j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56598,8 +56666,8 @@ self: { pname = "cborg"; version = "0.2.8.0"; sha256 = "07mh5bk61k5dz2x5g7fqw2cv7bjzs7v65yxvzkq7mdbkq8kwhn9f"; - revision = "1"; - editedCabalFile = "13m2shrlpvg5s9d40a2463mmckzg50y8jb47zfd6i1rg6q3q6xx6"; + revision = "2"; + editedCabalFile = "0pvnzanysxiikq3kghhax9v2m693s23v9pas03iaggw0h098yns4"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -57818,8 +57886,8 @@ self: { }: mkDerivation { pname = "chart-svg"; - version = "0.3.2"; - sha256 = "1i2abnjr0nl5kwmb2lspqn80hnfdps3iw3ynzgw7klxm8vk6asvw"; + version = "0.3.3"; + sha256 = "1zfdjk502wi71app9k73igz38ykrgh75qxm9v9906md2wizfdv63"; libraryHaskellDepends = [ adjunctions attoparsec base Color containers cubicbezier foldl formatn lucid mtl neat-interpolation numhask numhask-array @@ -61591,31 +61659,24 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , containers, directory, fgl, fmt, format-numbers, lens, lens-aeson - , mtl, network, text, time + ({ mkDerivation, aeson, attoparsec, base, blitz, bytestring + , conduit, mtl, network, text }: mkDerivation { pname = "clplug"; - version = "0.1.0.0"; - sha256 = "1p8mpk0bk657xcnjxgz9jyv6ihx9l5fykw082ja5i0qsa55xindp"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "1fvbc3ply0kylrplq7d9jfyqin7wax506x9123qfldxwgfq6r2cq"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit mtl network text ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory fgl - fmt format-numbers lens lens-aeson mtl network text time - ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec base blitz bytestring conduit mtl network text ]; description = "Create Core Lightning Plugins"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {}; + }) {blitz = null;}; "clr-bindings" = callPackage ({ mkDerivation, base, clr-host, clr-marshal, clr-typed, pipes @@ -63273,8 +63334,8 @@ self: { pname = "collate"; version = "0.1.0.0"; sha256 = "1fh335mwk51gyhyxilv83z66ilz5ws3ni8cbr4qmpfpgf9m1jp5s"; - revision = "2"; - editedCabalFile = "08jzbmws1mj9cchn59pnbyrkia4kzz02sl8jhp7rmby2irm9vx1x"; + revision = "3"; + editedCabalFile = "1834l0p3brqlsv69cxwb6c4mxh655mmvzcj1sxnrz5zwlqvm7fjx"; libraryHaskellDepends = [ base containers lens primitive transformers vector ]; @@ -64209,8 +64270,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.3"; - sha256 = "009yrsb2xxna73q6nnijfx5ngffaz369mildvqvn91qbrkrzq7pl"; + version = "0.2.3.4"; + sha256 = "0pk6ckpb01pr9i2xyx2bm1sbkzbxy5vfy8l67pca1y0i0glyz150"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -64684,6 +64745,8 @@ self: { pname = "compdata"; version = "0.12.1"; sha256 = "0ksa3bgqjvshkrpd74420z9kkb3asq4flszzwrqswd4qw1yn9f05"; + revision = "2"; + editedCabalFile = "1809imnjf80b080qcmym9vln56pna41w9vv6aiqf7j3dxjhdp4i4"; libraryHaskellDepends = [ base containers deepseq mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -64841,8 +64904,8 @@ self: { pname = "compensated"; version = "0.8.3"; sha256 = "0xigi4pcw581d8kjbhdjkksyz9bgcgvq0j17br9z1x6a3hw1m39a"; - revision = "2"; - editedCabalFile = "0nr81fm5b8pavgyf0n34199jvr2zp18y0cdlzas240xwpgxn6k1p"; + revision = "3"; + editedCabalFile = "0fccjb5q07w1k3pl6x0jrglvbkfycqfjhbd121h3bxg6y5c3fs40"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive hashable lens log-domain safecopy semigroupoids semigroups vector @@ -69148,18 +69211,19 @@ self: { "copilot" = callPackage ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language - , copilot-libraries, copilot-theorem, directory, filepath - , optparse-applicative + , copilot-libraries, copilot-prettyprinter, copilot-theorem + , directory, filepath, optparse-applicative }: mkDerivation { pname = "copilot"; - version = "3.13"; - sha256 = "1a6r3r1q6vqxmwdj89bmvbzrlkfyyzq6i84ydg756wsvm6mipq7a"; + version = "3.14"; + sha256 = "1mmdb07da5hnldg438zaapx9c1j4sf8nay5fjyiqw24bzgilgm54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base copilot-c99 copilot-core copilot-language copilot-libraries - copilot-theorem directory filepath optparse-applicative + copilot-prettyprinter copilot-theorem directory filepath + optparse-applicative ]; description = "A stream DSL for writing embedded C programs"; license = lib.licenses.bsd3; @@ -69172,8 +69236,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.13"; - sha256 = "112lmmylylq9jwcj0diy3fqn9kbs8xkyqc9l7n5jjy5h3yak8d2c"; + version = "3.14"; + sha256 = "0jfy06m8zgk6wqispyi1idcb9f3azajw53hq416glip2j7ld8nby"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -69205,8 +69269,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.13"; - sha256 = "0i05bpiag7prr3xn361psda7ncfyrgbd6rjsy23rkf4ygmb2908p"; + version = "3.14"; + sha256 = "109qy41yajzii5kha2z030g9hq8rwsg3lq0i3fas490909r8b7yd"; libraryHaskellDepends = [ base pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -69240,8 +69304,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.13"; - sha256 = "0z03qlafv53sxp50j9ccp1pgfs3nqm4l7m18cxzflzzn6j3bnrjy"; + version = "3.14"; + sha256 = "0zjy9lr6ndsijvh2rvjm4dbbswrxdnxcb8x7wfnx55z8x237l49j"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -69253,17 +69317,17 @@ self: { "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core - , copilot-interpreter, copilot-prettyprinter, copilot-theorem - , data-reify, HUnit, mtl, pretty, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 + , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl + , pretty, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "copilot-language"; - version = "3.13"; - sha256 = "060lr6m9kp204qyjga6xl879ypv648wm6gh33w10x5jlzghabl4d"; + version = "3.14"; + sha256 = "0aakm38hjp8rwpqnrlccq4pajcb93h6wrsam288y92akys7h9sj9"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter - copilot-prettyprinter copilot-theorem data-reify mtl + copilot-theorem data-reify mtl ]; testHaskellDepends = [ base copilot-core copilot-interpreter HUnit pretty QuickCheck @@ -69278,8 +69342,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.13"; - sha256 = "05ffpp2h83l0wvddfmi6m42c79qsw07dfmx8bmj2zwfhhikp043r"; + version = "3.14"; + sha256 = "0wxifm2x94hvi2c5il3yz16p6y09vmxwkmhd9zmfnpay4ymd00rq"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -69292,8 +69356,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.13"; - sha256 = "04ivmsrb51j7agmb1nimzxp0srkkv52qi49qxishf8gj4jnhm10p"; + version = "3.14"; + sha256 = "1c7ckq7mllfm1ycqsf9h9vm0ckzl5lsi5s2pxrmypj8gyzj8wxfj"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -69323,8 +69387,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.13"; - sha256 = "0q0pfnaayldy1h62qj25ksfc9v2vyp5aiy3b2lxw436lw2brl4jf"; + version = "3.14"; + sha256 = "158s55ybvhw9yiam4kwn02r76mlsvxsw14cxff9bkcryqdx6vlby"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -69527,23 +69591,6 @@ self: { }) {}; "core-text" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq - , fingertree, hashable, prettyprinter, template-haskell, text - , text-short - }: - mkDerivation { - pname = "core-text"; - version = "0.3.8.0"; - sha256 = "1vl463wdgnfb795nbir355w1cgy5ndqnwgfiiyr1j73xmngmvw04"; - libraryHaskellDepends = [ - ansi-terminal base bytestring colour deepseq fingertree hashable - prettyprinter template-haskell text text-short - ]; - description = "A rope type based on a finger tree over UTF-8 fragments"; - license = lib.licenses.mit; - }) {}; - - "core-text_0_3_8_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text , text-short @@ -69558,7 +69605,6 @@ self: { ]; description = "A rope type based on a finger tree over UTF-8 fragments"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-warn" = callPackage @@ -71127,6 +71173,8 @@ self: { pname = "criterion"; version = "1.6.0.0"; sha256 = "1c2jl881bb3g4w037dx4bs3s164s306vayw2jxd9k3hmrnffyaa0"; + revision = "1"; + editedCabalFile = "1sq1izskw1j1dxrdak8zxv22q3cvxg7s9wvxx3l2gj0165xj83bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -75377,8 +75425,8 @@ self: { pname = "data-fix"; version = "0.3.2"; sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs"; - revision = "3"; - editedCabalFile = "0z77i9y86wlc13396akl8qxq39rwpkhhcs5fadzk47bwn7v1gsmx"; + revision = "4"; + editedCabalFile = "1s9xivrnsp5n7jhflz4h4vzwwdcxal7kwchpaa982m8pfr23ayy2"; libraryHaskellDepends = [ base deepseq hashable ]; description = "Fixpoint data types"; license = lib.licenses.bsd3; @@ -75999,8 +76047,8 @@ self: { pname = "data-reify"; version = "0.6.3"; sha256 = "1sacbil9xn1n2085wpa0dq7ikf1wvh2kkddnvmwsp22ssx059h55"; - revision = "1"; - editedCabalFile = "137z993v7af9ym468vprys09416c7l7pys5hrng7k5vafga73y3b"; + revision = "2"; + editedCabalFile = "1ajrndp9251b3pnfm2g56pdp4jynlgbyd8i3qjlsi3wqpngwlhw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79438,29 +79486,6 @@ self: { }) {}; "deriving-compat" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged - , template-haskell, th-abstraction, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.6.2"; - sha256 = "18kpai3jrazcnxcfqqjxkv2ghrz8xyg73rn5x0ipim3z09grj6ki"; - libraryHaskellDepends = [ - base containers ghc-boot-th ghc-prim template-haskell - th-abstraction transformers transformers-compat - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat void - ]; - testToolDepends = [ hspec-discover ]; - description = "Backports of GHC deriving extensions"; - license = lib.licenses.bsd3; - }) {}; - - "deriving-compat_0_6_3" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers @@ -79481,7 +79506,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "deriving-openapi3" = callPackage @@ -80533,8 +80557,8 @@ self: { }: mkDerivation { pname = "dhall-secret"; - version = "0.5.52"; - sha256 = "1dxnn77kjab3vwf6p1pk000aila9m5jgalnba0g54prcj9rgca6q"; + version = "0.5.53"; + sha256 = "0mhq3xdgikkjq7z0cy0ir9mil7nzw57f453ic80v4r65fyyvzs44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81354,10 +81378,8 @@ self: { }: mkDerivation { pname = "diagrams-postscript"; - version = "1.5.1"; - sha256 = "11h2s33y6p1xd1d0kp281nz8iq5rpm0wj63wrzdha874qf79wz9g"; - revision = "2"; - editedCabalFile = "0w662h38pjmxz029ffxzv2cj6hx2mpzzr180m2340phxjflxr07g"; + version = "1.5.1.1"; + sha256 = "1kwb100k3qif9gc8kgvglya5by61522128cxsjrxk5a8dzpgwal4"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -81968,14 +81990,27 @@ self: { ({ mkDerivation, base, bytestring, zlib }: mkDerivation { pname = "digest"; - version = "0.0.1.5"; - sha256 = "1lpj16hazg8yh2rxspc1y7da9vgmz6jw9fx9qrvwv1hzmv8mvnvv"; + version = "0.0.1.6"; + sha256 = "1kygg0zwwgwsmv39hq507dp56389vm8vsam6jbm582gai8dpdwmi"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; license = lib.licenses.bsd2; }) {inherit (pkgs) zlib;}; + "digest_0_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, zlib }: + mkDerivation { + pname = "digest"; + version = "0.0.1.7"; + sha256 = "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ zlib ]; + description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "digest-pure" = callPackage ({ mkDerivation, array, base, bytestring, digest, QuickCheck }: mkDerivation { @@ -82680,6 +82715,19 @@ self: { broken = true; }) {}; + "directory_1_3_7_1" = callPackage + ({ mkDerivation, base, filepath, time, unix }: + mkDerivation { + pname = "directory"; + version = "1.3.7.1"; + sha256 = "1z8frwbr0kdk47x3xasq7ifzcrwl7ryh1aqgf202xv4cakb8a9yw"; + libraryHaskellDepends = [ base filepath time unix ]; + testHaskellDepends = [ base filepath time unix ]; + description = "Platform-agnostic library for filesystem operations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "directory_1_3_8_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { @@ -85376,7 +85424,7 @@ self: { license = lib.licenses.mit; }) {}; - "doctest-parallel_0_3_0" = callPackage + "doctest-parallel_0_3_0_1" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random @@ -85385,8 +85433,8 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.3.0"; - sha256 = "121ql1pygbs1cars5mva7lxa96aq0fhn27n3vnn5zqrvdypn3ys4"; + version = "0.3.0.1"; + sha256 = "17azfkx2hl48gfxhln710lngzbcwfmxv24jqj8h59ydrah9cba11"; libraryHaskellDepends = [ base base-compat Cabal code-page containers deepseq directory exceptions filepath ghc ghc-paths Glob process random syb @@ -85674,6 +85722,7 @@ self: { ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-aeson" = callPackage @@ -85698,6 +85747,7 @@ self: { ]; description = "Integration of domain with aeson"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-auth" = callPackage @@ -85734,6 +85784,7 @@ self: { testHaskellDepends = [ cereal cereal-text domain rerebase ]; description = "Integration of domain with cereal"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "domain-core" = callPackage @@ -86284,16 +86335,16 @@ self: { "downhill" = callPackage ({ mkDerivation, base, containers, hedgehog, reflection, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, th-abstraction - , transformers, unordered-containers, vector-space + , tasty-hedgehog, tasty-hunit, transformers, unordered-containers + , vector-space }: mkDerivation { pname = "downhill"; - version = "0.3.0.0"; - sha256 = "1y4idkv093zlvlr9wc30cmyi7qn16sk73p8cx3ivyvq3j36dgw0l"; + version = "0.4.0.0"; + sha256 = "1qqcp4yybbfvh3r3v53ac42f5lmyy55nfz6mc3c2jsj0r8457a0c"; libraryHaskellDepends = [ - base containers reflection template-haskell th-abstraction - transformers unordered-containers vector-space + base containers reflection transformers unordered-containers + vector-space ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit vector-space @@ -89331,6 +89382,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_2_2_2" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control + , primitive, transformers-base, unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.2.2.2"; + sha256 = "1ykscrp24n6cfwh9n051wj8zcza522jwfcw48fnxh3gvgyn43vaq"; + libraryHaskellDepends = [ + base containers exceptions monad-control primitive + transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra @@ -89349,14 +89417,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-plugin_1_1_0_0" = callPackage + "effectful-plugin_1_1_0_1" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.0"; - sha256 = "13m63lidazn8cp2f0y801nwri48h5mny3azsz5gpz1c7jj072xaa"; + version = "1.1.0.1"; + sha256 = "1clm190xhf9wibck7i5slzchbq926f2xfxij6zxqv656fx9l5vf6"; libraryHaskellDepends = [ base containers effectful-core ghc ghc-tcplugins-extra ]; @@ -89387,8 +89455,8 @@ self: { pname = "effectful-th"; version = "1.0.0.1"; sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; - revision = "1"; - editedCabalFile = "0vj46wzmc2diydx3cfn5sbv25bjcg6gw1cy0q1rqlxbhggm9zk94"; + revision = "2"; + editedCabalFile = "15s8yvxf7sbi1vx5ylnrnxc1b694ndmdac0f5bi8v0cg6sjijkzw"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -89796,6 +89864,8 @@ self: { pname = "either"; version = "5.0.2"; sha256 = "1gl748ia68bldbqb2fl7vjv44g0y8ivn659fjmy1qyypgyb5p95z"; + revision = "1"; + editedCabalFile = "1w2rxrj0gc3a7p74pybji8yy2zsjnhxyi4zhlmx4qsyz6w616ggv"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids ]; @@ -90334,15 +90404,15 @@ self: { broken = true; }) {}; - "eliminators_0_9_2" = callPackage + "eliminators_0_9_3" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons-base, template-haskell, text, th-abstraction , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9.2"; - sha256 = "0j0k1lw6b5yqz7kxckb5s0phqcnzdis0b469nxryawsv12wvv335"; + version = "0.9.3"; + sha256 = "0pmh4ds1xmk464988airlwdj47mbq9xzgvfmpsp7dw84k0226pyg"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -92541,6 +92611,8 @@ self: { pname = "eq"; version = "4.3"; sha256 = "0p3189kq045vxh0h7is81q0qahaghni810x68g31yml05md37giz"; + revision = "1"; + editedCabalFile = "1b2k97n787730p3k4fsp16f2i9ddqf5k90cq4r7s2lddmdq0cshr"; libraryHaskellDepends = [ base semigroupoids ]; description = "Leibnizian equality"; license = lib.licenses.bsd3; @@ -93294,8 +93366,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.8.2"; - sha256 = "058f79z5sm6ifw54a3x0cm6k59cpj78z0p2lxrbcv754z60dms63"; + version = "3.5.9.0"; + sha256 = "0r9p4kg3m9g4cpd9lcw9ljzf9wrl8wwdcp4gqwidg75wbpy3fy47"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -94576,8 +94648,8 @@ self: { }: mkDerivation { pname = "eventuo11y"; - version = "0.9.0.0"; - sha256 = "0ayzk79z2xvkhlmr6yg9q52kdjh68ahsi9hhc0bi58zg46dnq18i"; + version = "0.9.0.1"; + sha256 = "0ihz8j8nfwnsz7a3vg5qbvajyngaph8bby8g942i0kbc24gsrymi"; libraryHaskellDepends = [ base exceptions general-allocate monad-control mtl primitive time transformers transformers-base unliftio-core @@ -94597,8 +94669,8 @@ self: { }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.4.0.0"; - sha256 = "04b1rigdxv5v2j8r7lfbl15a1hr9ifra9lnkxxc1j1symbpq620m"; + version = "0.4.0.1"; + sha256 = "1516005y2qjybil094scnv27446fbm588yhb95n7h2sqbdx183ff"; libraryHaskellDepends = [ aeson base binary bytestring case-insensitive containers eventuo11y eventuo11y-json general-allocate http-media http-types @@ -97236,15 +97308,15 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; - "fast-logger_3_2_0" = callPackage + "fast-logger_3_2_1" = callPackage ({ mkDerivation, array, async, auto-update, base, bytestring , directory, easy-file, filepath, hspec, hspec-discover, stm, text , unix-compat, unix-time }: mkDerivation { pname = "fast-logger"; - version = "3.2.0"; - sha256 = "1f0ac7b3irmc4967jrbjnkh8y89gdv57r6vv7m6fkbbjxyyp4nqp"; + version = "3.2.1"; + sha256 = "1qsy9x14sv1718anmqwj46p2cwjqxbzqnvai47sj9kkfi2r71l49"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -99896,10 +99968,8 @@ self: { }: mkDerivation { pname = "fin-int"; - version = "0.2.0"; - sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; - revision = "4"; - editedCabalFile = "1gs61m3qllgapsn7rhix1c0l91l6878glks6xdwy545byphr92cf"; + version = "0.2.0.1"; + sha256 = "02k1lx5f8vh0acp4ali81y8byvg2fzpyjk24jmk75ci32ljcfzd2"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint @@ -100213,8 +100283,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; - revision = "5"; - editedCabalFile = "0lrpv4nqipdxyd1iw3x6y5fi0bkl28yd0nh1r3m39qzdd8v99b5g"; + revision = "6"; + editedCabalFile = "1ynflgdp9mrl38v9bnfvma2g4bwx3gf89gq1d10354j7jismf8sy"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -102448,6 +102518,8 @@ self: { pname = "foldable1-classes-compat"; version = "0.1"; sha256 = "04pzjppmb195ffgxdzh8dh39z5dalr5wd6sifcnbg9p1b3rw6myh"; + revision = "2"; + editedCabalFile = "05sdpi0c503xgrgg2cg4922r5ja5154lfwzi9mgcmxncsk02a4l5"; libraryHaskellDepends = [ base containers ghc-prim tagged transformers ]; @@ -102604,8 +102676,8 @@ self: { pname = "folds"; version = "0.7.8"; sha256 = "11278546mq05rhyjfmhg0iasqjsn898l44dhp5qgaw1zwzywir2i"; - revision = "1"; - editedCabalFile = "1gxb8469w12afd1adf5cn32wxvnvndavxwr65dyc6icqvalbkirn"; + revision = "2"; + editedCabalFile = "13agcwgdwbs4kclgmrdqlj3m0bndad98wznk363y54psgqqrl9cx"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -103153,8 +103225,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "formatn"; - version = "0.2.1"; - sha256 = "1l6xzwxbddalz33ppyy9wcb0i0n9vz17s0c4j15ji96ql11k3hm7"; + version = "0.2.2"; + sha256 = "0vi29difvl87q7mr088viv3fff2p9nym8gjd20ndh0kwykhjfr8s"; libraryHaskellDepends = [ base containers QuickCheck text ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; @@ -104187,8 +104259,8 @@ self: { pname = "free"; version = "5.1.10"; sha256 = "0whff0r0nvii5l9z9crw7v0rj0wwblwbnfp99515siyxjkzs9phj"; - revision = "1"; - editedCabalFile = "0kpb7vfhl29c15miln3wsgqwjd8bz43v500dyaprwsglmgprwbdw"; + revision = "2"; + editedCabalFile = "1qpn9sy2bpngkr9zdi0dvy5knnhbsli3d0nw1ljvw12pisv6njaq"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -104198,6 +104270,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "free_5_2" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.2"; + sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; + revision = "1"; + editedCabalFile = "0gpz9jlvdnds3988naqxn1dn1hr4zk3md1dhkky4hv0a2b69z7nh"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -106501,15 +106594,15 @@ self: { , futhark-manifest, futhark-server, githash, half, happy, haskeline , language-c-quote, lens, lsp, mainland-pretty, megaparsec, mtl , mwc-random, neat-interpolation, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, process-extras, QuickCheck - , random, regex-tdfa, srcloc, statistics, tasty, tasty-hunit + , prettyprinter-ansi-terminal, process-extras, QuickCheck, random + , regex-tdfa, srcloc, statistics, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, terminal-size , text, time, transformers, vector, versions, zlib }: mkDerivation { pname = "futhark"; - version = "0.23.1"; - sha256 = "0si4si74d8y9dgsqiixj6cfblpr2l02dwijbngwv5xdyfpbdfgq6"; + version = "0.24.1"; + sha256 = "1j459dhh2670p985rsbqjc37vhw87dymk8hy9fhx6gf0yvxkmg08"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106520,9 +106613,9 @@ self: { futhark-manifest futhark-server githash half haskeline language-c-quote lens lsp mainland-pretty megaparsec mtl mwc-random neat-interpolation parallel prettyprinter - prettyprinter-ansi-terminal process process-extras random - regex-tdfa srcloc statistics template-haskell temporary - terminal-size text time transformers vector versions zlib + prettyprinter-ansi-terminal process-extras random regex-tdfa srcloc + statistics template-haskell temporary terminal-size text time + transformers vector versions zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; @@ -106563,8 +106656,8 @@ self: { }: mkDerivation { pname = "futhark-manifest"; - version = "1.1.0.0"; - sha256 = "1y1f3b6rz6m778izvi6n7ylinr6m41fy19h4by0bb6hdmcazaxpn"; + version = "1.2.0.1"; + sha256 = "17sb3598yb88fj3ndffpd7a75vas16vfw6gl6n79rckgibrl8gh6"; libraryHaskellDepends = [ aeson base bytestring containers text ]; testHaskellDepends = [ base QuickCheck quickcheck-instances tasty tasty-hunit @@ -106580,8 +106673,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.1.0"; - sha256 = "0i5jc7lddc8s938qh4jq61i33l13yfknppxi6q9n7yqig0rl3lbv"; + version = "1.2.2.0"; + sha256 = "1b81mgb69fj9sir9zp5a60rqzpvzxwyg8h9cw97njxhaps81ysmd"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -107098,8 +107191,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gambler"; - version = "0.2.0.0"; - sha256 = "0hr3ig4cwlaq09z852lmfmr9sakxyrpfydkslps8zv95pbr15yhz"; + version = "0.4.1.0"; + sha256 = "1r3bn5ijrp3gp0f66pphii4s9nfbnh0507n3kg7r4hcavs1n2h60"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Composable, streaming, and efficient left folds"; @@ -108124,8 +108217,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.1.2"; - sha256 = "0dnv96wnhp648ydhy883i13lsgmirqlrc62ijgisi66dpkwxmcm3"; + version = "0.2.1.4"; + sha256 = "1ds89izz3m53wr8qk4d3x3y3pgw7y1j3na2sy7yjgzy857j6xxp6"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -108341,23 +108434,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.14.2"; - sha256 = "0bxacg6b1vz135x93vf7jk6129m08hdyj7426ymaylfl2w8kapi6"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_14_3" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -108372,7 +108448,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -108818,8 +108893,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generically"; - version = "0.1"; - sha256 = "0w9b7yynq0gk44jvdp1c8760lqpa1c38v5r1qav282yhw602idym"; + version = "0.1.1"; + sha256 = "1ks3pi6mpma83xffplz8vmimyhvzpnhmcgvk3bvl3c64pqva9i84"; libraryHaskellDepends = [ base ]; description = "Generically newtype to use with DerivingVia"; license = lib.licenses.bsd3; @@ -110317,22 +110392,21 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_4_4" = callPackage + "ghc_9_6_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, Cabal , containers, deepseq, deriveConstants, directory, exceptions , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc - , process, stm, template-haskell, terminfo, time, transformers - , unix + , process, stm, template-haskell, time, transformers, unix }: mkDerivation { pname = "ghc"; - version = "9.4.4"; - sha256 = "0s97l24miwwi0i9c1jgf7rqlmlc13qfncvp56d8wax4jzjlaa99c"; + version = "9.6.1"; + sha256 = "1jrcqhg4qc1lj8cfv8apzpw0479g42lv5pw8dr3dvmhg21njp386"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-boot ghc-heap ghci hpc process stm - template-haskell terminfo time transformers unix + template-haskell time transformers unix ]; libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; @@ -110405,14 +110479,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_4_1" = callPackage + "ghc-boot_9_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.4.1"; - sha256 = "0jm28sisgc0sggf3jgbf7v387xllfv0fnm0bdb0m0lfrqr4w3xmc"; + version = "9.6.1"; + sha256 = "1vmlkp0sh5jlqgjj137kz02gb362913bzhvl3ij8vhdvd76r9116"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath @@ -110423,12 +110497,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_4_1" = callPackage + "ghc-boot-th_9_6_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.4.1"; - sha256 = "0qnhnyavbm44aiq8x0cf1q7rylpv6gv4bjfiir7s2g950vdab8il"; + version = "9.6.1"; + sha256 = "1swd7wwjn80fvinfixqavd3akfdsxm7i3ymy1gyccbj03md4wz2b"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -110966,12 +111040,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_4_1" = callPackage + "ghc-heap_9_6_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.4.1"; - sha256 = "0zfz389vv7pwxivlvrf3ykij31saafk9vm32fa9xl2b4kvgc8my2"; + version = "9.6.1"; + sha256 = "1ksbhlddq6s4r5mvg7q8xvpa02rq6al5768ca3qkqha8ssnziw53"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -111123,27 +111197,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, parsec, pretty, process, rts, time - , transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "9.2.6.20230211"; - sha256 = "1f0sf922yh5n8057c14vs362pka7kq0c6h87kmarmrz8mjp19c37"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory - exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty - process rts time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-lib_9_2_7_20230228" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -111162,7 +111215,6 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-lib_9_4_4_20221225" = callPackage @@ -111187,6 +111239,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib_9_6_1_20230312" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.6.1.20230312"; + sha256 = "1g31mjshz4nh552sawffpfjd550qv58s7hy1xw7ylaqhp7dylqgv"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts stm time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_8_10_7_20220219" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, pretty, process @@ -111214,8 +111288,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.6.20230211"; - sha256 = "0q0n9nsi8hxd9pjsrn7vdkwrjvsig8100dd1w5v7hka2dryffi6z"; + version = "9.2.7.20230228"; + sha256 = "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111227,15 +111301,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_7_20230228" = callPackage + "ghc-lib-parser_9_4_4_20221225" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.7.20230228"; - sha256 = "1bny37dny7jv37mpynp3zwdlp8993xikc1c4p6h5f2zwjb7nx2ny"; + version = "9.4.4.20221225"; + sha256 = "0av5c7phk0lc8nnaacm5v0cah1hiihw3kqf7cavphhadw06dixk7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111248,15 +111322,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_4_20221225" = callPackage + "ghc-lib-parser_9_6_1_20230312" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.4.20221225"; - sha256 = "0av5c7phk0lc8nnaacm5v0cah1hiihw3kqf7cavphhadw06dixk7"; + version = "9.6.1.20230312"; + sha256 = "0a2zfsjbw5gip7gp09r41vxgfvssyga9hfrrrv2s58fvscx1k7bh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -111349,6 +111423,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.6.0.0"; + sha256 = "0k84r37xfj9xhx2rl4kxx9imlnwpmxvnf3kadh8ysz3pl4hknnl5"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -115102,6 +115196,8 @@ self: { pname = "github"; version = "0.28.0.1"; sha256 = "16ahq2ng52ypkkgqbbmizr486px3dh709hw3jdn7jzglgvn20712"; + revision = "1"; + editedCabalFile = "1irbqis6iv62nqc75fy87mv1lahrnybq1j8mal15n129sxyyvz56"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -119474,29 +119570,6 @@ self: { }) {}; "goldplate" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff - , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, unordered-containers - }: - mkDerivation { - pname = "goldplate"; - version = "0.2.0"; - sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1"; - revision = "3"; - editedCabalFile = "0h1ayys29md2nbiqshdrhr8kz06dikiwkb4ikcg3wfzb4k1lpzvl"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text - unordered-containers - ]; - description = "A lightweight golden test runner"; - license = lib.licenses.asl20; - mainProgram = "goldplate"; - }) {}; - - "goldplate_0_2_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -119515,7 +119588,6 @@ self: { testHaskellDepends = [ base process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -123264,7 +123336,9 @@ self: { testToolDepends = [ tasty-discover ]; description = "The border guardian for your package dependencies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "guardian"; + broken = true; }) {}; "guess-combinator" = callPackage @@ -123448,8 +123522,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.5.3.1"; - sha256 = "042milcmyimk5xirxhs0f5a8gmawp6d2a718zd0ccs162db4691g"; + version = "4.5.3.2"; + sha256 = "0ni3vw7kd25w5kvvxvpgyq1d1s3c41z1a66zs6dv75mly57svacb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -125028,8 +125102,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.8.1.0"; - sha256 = "05amkgk4yy7b440g8lllz5j91x278f5hwq6kjn9dzbh83qw3ccl0"; + version = "0.8.2.0"; + sha256 = "0wpjr9l5nzggdkqhsw16b5p8gnkaz2pfmh7wab1m5kphyaky88nz"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -125189,8 +125263,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A documentation-only package exemplifying haddock markup features"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haddock-leksah" = callPackage @@ -126450,6 +126522,32 @@ self: { broken = true; }) {}; + "halide-haskell" = callPackage + ({ mkDerivation, base, bytestring, constraints, filepath, Halide + , hspec, HUnit, inline-c, inline-c-cpp, primitive, QuickCheck + , template-haskell, temporary, text, unix, vector + }: + mkDerivation { + pname = "halide-haskell"; + version = "0.0.1.0"; + sha256 = "0glal3f23bvvpilczcvy4wsdcnl23xqavyy0ms8hmqk1nbp5is96"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring constraints filepath inline-c inline-c-cpp + primitive template-haskell temporary text unix vector + ]; + librarySystemDepends = [ Halide ]; + executableHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base hspec HUnit inline-c inline-c-cpp QuickCheck text vector + ]; + description = "Haskell bindings to Halide"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {Halide = null;}; + "halipeto" = callPackage ({ mkDerivation, base, directory, HaXml, pandoc }: mkDerivation { @@ -128619,8 +128717,8 @@ self: { pname = "hash-addressed"; version = "0.2.0.1"; sha256 = "1j4zr63if21g208zyhdk2mz8v3pfp23s33mrqzig0rryw3f0kby7"; - revision = "2"; - editedCabalFile = "0iaaby674182cxwdzpsaz52skzs3klgkid9c7sajz4pi6kh921xl"; + revision = "4"; + editedCabalFile = "0rvij61sng451nh4r17zzjn5gwjr25gw6r5i74njj32gfbzhrrv5"; libraryHaskellDepends = [ base base16-bytestring bytestring cryptohash-sha256 directory filepath gambler mtl pipes quaalude resourcet temporary @@ -128700,6 +128798,8 @@ self: { pname = "hashable"; version = "1.4.2.0"; sha256 = "1y73606pcrs7zi6f4f07a5rkhc6620n1bx0adpa6j7xqhbm00h0v"; + revision = "1"; + editedCabalFile = "12nmnmm2kyjalkvmz0l1l895ikc938lwppx8iykxnhamblrr4msq"; libraryHaskellDepends = [ base bytestring containers data-array-byte deepseq filepath ghc-bignum ghc-prim text @@ -129965,28 +130065,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.2"; - sha256 = "05r84czb05n69g7p7jazljh95yzdh2lpzgjjypgpg75mh83igr2w"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_3" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -130006,7 +130084,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -133561,22 +133638,6 @@ self: { }) {}; "hasql-implicits" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hasql - , network-ip, scientific, text, time, uuid, vector - }: - mkDerivation { - pname = "hasql-implicits"; - version = "0.1.0.5"; - sha256 = "10mfl1sa23zv7hgc0k1xykjxgrs4qjlmwdkxw38y0wn9b7zzpnlh"; - libraryHaskellDepends = [ - aeson base bytestring containers hasql network-ip scientific text - time uuid vector - ]; - description = "Implicit definitions for Hasql, such as default codecs for standard types"; - license = lib.licenses.mit; - }) {}; - - "hasql-implicits_0_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hasql , network-ip, scientific, text, time, uuid, vector }: @@ -133590,7 +133651,6 @@ self: { ]; description = "Implicit definitions for Hasql, such as default codecs for standard types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-interpolate" = callPackage @@ -133802,15 +133862,15 @@ self: { }) {}; "hasql-resource-pool" = callPackage - ({ mkDerivation, base-prelude, clock, hasql, hspec - , resource-pool-fork-avanov, time + ({ mkDerivation, base-prelude, clock, hasql, hspec, resource-pool + , time }: mkDerivation { pname = "hasql-resource-pool"; - version = "0.5.3.2"; - sha256 = "07j293mivq4gfqaaclb80kbr413nwb8f18jf683pjj66d4ql5j01"; + version = "0.6.0.0"; + sha256 = "05xvmcrlxp8gksizsx916awsxhbh4a9svnirhnibn9cp1bqcr11i"; libraryHaskellDepends = [ - base-prelude clock hasql resource-pool-fork-avanov time + base-prelude clock hasql resource-pool time ]; testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql based on resource-pool"; @@ -135881,6 +135941,22 @@ self: { license = lib.licenses.mit; }) {}; + "headed-megaparsec_0_2_1_2" = callPackage + ({ mkDerivation, base, case-insensitive, megaparsec + , parser-combinators, selective + }: + mkDerivation { + pname = "headed-megaparsec"; + version = "0.2.1.2"; + sha256 = "1k89p1kpsf6hgd2z9b9alza0ha8xxwmwn9pwd4iih0211l8bs2c1"; + libraryHaskellDepends = [ + base case-insensitive megaparsec parser-combinators selective + ]; + description = "More informative parser"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "headergen" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, haskeline, time @@ -136424,8 +136500,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.3.0.3"; - sha256 = "1jrzijk8b4hnglsghja1aad482sc7zq0g9g0zyjxgwr4pjj7sc6f"; + version = "0.4.0.1"; + sha256 = "05skqhcf51dv6g171vq29pca48n0hbnl8b5xrzalr77a19s77ba3"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq directory exceptions filepath hedgehog hw-aeson mmorph mtl network process @@ -137484,8 +137560,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.9.10"; - sha256 = "1sbp3jjn54z6hwkfgb83g0zgn1dm8qi9254g2yc8r4msm6n3nzww"; + version = "0.9.11"; + sha256 = "1y0n4vfxf84r5jw02vciwks6snj35zhy789nsixxv8jba6scnf66"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137531,15 +137607,16 @@ self: { "hercules-ci-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cookie - , exceptions, hashable, hercules-ci-api-core, http-api-data + , exceptions, hashable, hercules-ci-api-core, hspec, http-api-data , http-media, lens, lens-aeson, memory, network-uri, profunctors - , servant, servant-auth, servant-auth-swagger, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid + , protolude, QuickCheck, quickcheck-classes, servant, servant-auth + , servant-auth-swagger, servant-swagger, servant-swagger-ui-core + , string-conv, swagger2, text, time, uuid, vector }: mkDerivation { pname = "hercules-ci-api"; - version = "0.7.2.1"; - sha256 = "1nkmiyfmidrfqvlfy9k75y4asrrbrs2511kdzhrpb3zlrlaw4zb8"; + version = "0.8.0.0"; + sha256 = "1ivlh6gxjdrrzgyafwglv145wz8ss77ayjv6lwfanaiq26x25vqk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137555,6 +137632,12 @@ self: { servant servant-auth servant-auth-swagger servant-swagger servant-swagger-ui-core string-conv swagger2 text time uuid ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hashable + hercules-ci-api-core hspec http-api-data http-media protolude + QuickCheck quickcheck-classes servant servant-auth string-conv text + time uuid vector + ]; description = "Hercules CI API definition with Servant"; license = lib.licenses.asl20; mainProgram = "hercules-gen-swagger"; @@ -137571,8 +137654,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.4.6.1"; - sha256 = "07gvmcag36ai945j7bxnvy2x8fsx9apkabcikp6x1a2anvkgws24"; + version = "0.5.0.0"; + sha256 = "0j1yb091i4whlf8brj2n0x0dnqm01p56i2ns4p59xsx6k0z7hprv"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -137629,8 +137712,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.3.5"; - sha256 = "0mk6q6ccgpdpjfc7mdms28dbhh1bawy4jnnqcfcb6vxg4cj83f44"; + version = "0.3.6"; + sha256 = "1wsgjj7asq6a0p8aja6mqcjy1qxpbwbii65fw9w6ilmmacpfh6yy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137669,8 +137752,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.5.0"; - sha256 = "0r70kjn8a1wiw1zndahrg2gc88k52dscm4yjmms2caf22pkh562a"; + version = "0.3.5.1"; + sha256 = "0l4267n0h272snfrbw6phhlrdn8vmiv363b33iv0yh9mnp0d3ya2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ @@ -137699,8 +137782,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.3.3"; - sha256 = "1w4azya8phkk3gmkifcv2pc6jh8zanwk9m2vwqsdgk7kr8zkkzws"; + version = "0.3.3.5"; + sha256 = "0mzpa1apijap1mbfshrw7dan897kikhdp5hpb2r0p1p5w7qxrl9l"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude @@ -137774,7 +137857,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hermes-json" = callPackage + "hermes-json_0_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base , bytestring, containers, deepseq, dlist, hedgehog, mtl, scientific , tasty, tasty-hedgehog, text, time, time-compat, transformers @@ -137795,6 +137878,30 @@ self: { ]; description = "Fast JSON decoding via simdjson C++ bindings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hermes-json" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , bytestring, containers, deepseq, dlist, hedgehog, primitive + , scientific, tasty, tasty-hedgehog, text, time, time-compat + , transformers, vector + }: + mkDerivation { + pname = "hermes-json"; + version = "0.5.0.0"; + sha256 = "0d0vy74z0m9vcs5rngigsqd6642dfx40a8bzh5finwrwgjb9k2dk"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base bytestring containers deepseq + dlist primitive scientific text time time-compat transformers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog scientific tasty + tasty-hedgehog text time vector + ]; + description = "Fast JSON decoding via simdjson C++ bindings"; + license = lib.licenses.mit; }) {}; "hermit" = callPackage @@ -138794,6 +138901,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hfoil"; + broken = true; }) {}; "hformat" = callPackage @@ -139923,8 +140031,8 @@ self: { }: mkDerivation { pname = "higgledy"; - version = "0.4.2.0"; - sha256 = "01hl63wq6rb2wgml850wawq07sn9vl8d2hv1jc3m366dxdqqhy8j"; + version = "0.4.2.1"; + sha256 = "0gwlksxqfngd3ikc5nlbh7jq42l8siriqmgbravkvk1f78p1rcy3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ barbies base generic-lens generic-lens-core named QuickCheck @@ -141716,19 +141824,19 @@ self: { ]; }) {}; - "hledger_1_28" = callPackage + "hledger_1_29" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid , math-functions, megaparsec, microlens, mtl, process, regex-tdfa , safe, shakespeare, split, tabular, tasty, temporary, terminfo - , text, time, timeit, transformers, unordered-containers + , text, text-ansi, time, timeit, transformers, unordered-containers , utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.28"; - sha256 = "0lagm7wk0k8jyk6kqggw7qka0jigqzjyqrrl4pr6cm0wd7x34cd8"; + version = "1.29"; + sha256 = "0f0mz1x54q31y8wbad2maq7rr1wd15msgbg99ldvmqpw760wflcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141736,22 +141844,24 @@ self: { Decimal Diff directory extra filepath githash hashable haskeline hledger-lib lucid math-functions megaparsec microlens mtl process regex-tdfa safe shakespeare split tabular tasty temporary terminfo - text time timeit transformers unordered-containers utf8-string - utility-ht wizards + text text-ansi time timeit transformers unordered-containers + utf8-string utility-ht wizards ]; executableHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default Decimal directory extra filepath githash haskeline hledger-lib math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; testHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers data-default Decimal directory extra filepath githash haskeline hledger-lib math-functions megaparsec microlens mtl process regex-tdfa safe - shakespeare split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards + shakespeare split tabular tasty temporary terminfo text text-ansi + time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; description = "Command-line interface for the hledger accounting system"; license = lib.licenses.gpl3Only; @@ -141963,37 +142073,37 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_28" = callPackage + "hledger-lib_1_29" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec - , cmdargs, containers, data-default, Decimal, deepseq, directory - , doclayout, doctest, extra, file-embed, filepath, Glob, hashtables - , megaparsec, microlens, microlens-th, mtl, parser-combinators - , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit - , template-haskell, text, time, timeit, transformers, uglymemo - , unordered-containers, utf8-string + , cmdargs, colour, containers, data-default, Decimal, deepseq + , directory, doclayout, doctest, extra, file-embed, filepath, Glob + , hashtables, megaparsec, microlens, microlens-th, mtl, pager + , parser-combinators, pretty-simple, regex-tdfa, safe, tabular + , tasty, tasty-hunit, template-haskell, text, text-ansi, time + , timeit, transformers, uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.28"; - sha256 = "098c36vx16xnjs27sn9h2794hyf7py5bhn1kaw8ira6akljgzh4k"; + version = "1.29"; + sha256 = "1k2a9xahp8g99gdvdqj42q6y332x6c7bjdyhjc6lln4szly6xy38"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers + call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout extra file-embed filepath Glob hashtables megaparsec microlens microlens-th mtl - parser-combinators pretty-simple regex-tdfa safe tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string + pager parser-combinators pretty-simple regex-tdfa safe tabular + tasty tasty-hunit template-haskell text text-ansi time timeit + transformers uglymemo unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base blaze-markup bytestring - call-stack cassava cassava-megaparsec cmdargs containers + call-stack cassava cassava-megaparsec cmdargs colour containers data-default Decimal deepseq directory doclayout doctest extra file-embed filepath Glob hashtables megaparsec microlens - microlens-th mtl parser-combinators pretty-simple regex-tdfa safe - tabular tasty tasty-hunit template-haskell text time timeit - transformers uglymemo unordered-containers utf8-string + microlens-th mtl pager parser-combinators pretty-simple regex-tdfa + safe tabular tasty tasty-hunit template-haskell text text-ansi time + timeit transformers uglymemo unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = lib.licenses.gpl3Only; @@ -142077,7 +142187,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_28" = callPackage + "hledger-ui_1_29" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -142086,8 +142196,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.28"; - sha256 = "04jq73ra4gv5q5lj0ivhrabkxkvp278c0sqyv6sa9sks0iwlgm3p"; + version = "1.29"; + sha256 = "0k4zzi8ns15gwwzjm9z3gajczvsk6s0fblxbl5g1hfp9aglf1cxy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142160,7 +142270,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_28" = callPackage + "hledger-web_1_29" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory @@ -142173,8 +142283,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.28"; - sha256 = "143340249wbcq4nsykk2d32xv9r89znzl8fr9yhaab68zlppfyh1"; + version = "1.29"; + sha256 = "04bhnvzn1l58f2g90baj28csksv2dfb16vh2qx5ni1x8r068h2w5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145774,25 +145884,20 @@ self: { "horizon-spec" = callPackage ({ mkDerivation, base, containers, dhall, path, path-dhall-instance - , prettyprinter, sydtest, template-haskell, text, th-lift + , template-haskell, text, th-lift }: mkDerivation { pname = "horizon-spec"; - version = "0.6.4"; - sha256 = "0bxpgx1ybk4klhd193yzli3qqbhlbbx40kj18nz1scvd75yzyah9"; - isLibrary = true; - isExecutable = true; + version = "0.9.0"; + sha256 = "0w183j05qfig31m58wq78glyjjb5zh26zw8ghld53b8x7971127q"; libraryHaskellDepends = [ base containers dhall path path-dhall-instance template-haskell text th-lift ]; - executableHaskellDepends = [ - base dhall prettyprinter sydtest text - ]; description = "Horizon Stable Package Set Type Definitions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "horizon-spec-tests"; + broken = true; }) {}; "horizon-spec-lens" = callPackage @@ -148049,8 +148154,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-awsxray"; - version = "0.1.0.0"; - sha256 = "17qps8qhniq8nzldnhisv0i2d1gc5lfhbzrawhisadgjsbwlxryj"; + version = "0.1.0.1"; + sha256 = "0zd40v359lflyvlw6mas3gcd7wb1sppwaw6q1820x6zm7ww6hwfw"; libraryHaskellDepends = [ base bytestring errors hs-opentelemetry-api hs-opentelemetry-sdk http-types memory microlens random text time unliftio unliftio-core @@ -148617,6 +148722,7 @@ self: { testHaskellDepends = [ base hashtables swisstable ]; description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; license = lib.licenses.bsd3; + platforms = lib.platforms.x86_64; }) {}; "hs-tags" = callPackage @@ -151384,14 +151490,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_9" = callPackage + "hspec_2_10_10" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.9"; - sha256 = "0vbi07wpf7nvg2bxlp91gi7c7hkq29q8va83wawzlb0mzaxbsccl"; + version = "2.10.10"; + sha256 = "1903bm001vh9cxmhh87p3c76136dl6aq82srqgvdb5hpsmimwjws"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -151400,6 +151506,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hspec-api" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "hspec-api"; + version = "2.9.0"; + sha256 = "0a260pjz0fyj51wpdnlb5kzrrwzdam2rxr019c5xrl14gg77a007"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + }) {}; + + "hspec-api_2_10_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "hspec-api"; + version = "2.10.0"; + sha256 = "00yfz30qfzzgb95z6bpq8s65yigqq9zg0b8icpyjk03rff2s44ch"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + testToolDepends = [ hspec-discover ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -151516,7 +151649,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_9" = callPackage + "hspec-core_2_10_10" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -151525,8 +151658,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.9"; - sha256 = "1aby2axr9pqbb75va2n1szkl6jw402kin39xv2m8i6f14fy2hzpz"; + version = "2.10.10"; + sha256 = "1djmiy5xjnx71bjagmvipc5dsnvhakm03y72g3vyg7iggxqr6iv4"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -151607,14 +151740,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_9" = callPackage + "hspec-discover_2_10_10" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.9"; - sha256 = "16ahgiwgj1nkp0bhyvpvz5avaimigja0gz78576066rsgf6kcygj"; + version = "2.10.10"; + sha256 = "0cig2l1l8wgxrg2s2srzsrws5vqa0fgf249gb1g222x91s63h2d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -156098,6 +156231,8 @@ self: { pname = "hurl"; version = "2.3.0.0"; sha256 = "1kmgakji3mp3d1i1jm6w5yh412ajd42klikcz0q8f4q75zprmb6i"; + revision = "1"; + editedCabalFile = "0frzlrdkfb8n99rb9yjw853q14p00kimszz0indmxjmmzk7ciaaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158715,8 +158850,8 @@ self: { pname = "hyperloglog"; version = "0.4.6"; sha256 = "0zwg4dhgasa9sx7pbjjjb9kz2bnhb3r2daij2b572cszv65l91nv"; - revision = "1"; - editedCabalFile = "1vpzs2sj0p4y0dy88fvb0imfks84655ilw1n56dpkfz3kn4dqaq8"; + revision = "2"; + editedCabalFile = "0al93mhfhng8vwvhz8721gkzjjdblycpv4pi9lygbj8ay129djpr"; libraryHaskellDepends = [ approximate base binary bits bytes bytestring cereal cereal-vector comonad cpu deepseq distributive hashable lens reflection @@ -161653,29 +161788,19 @@ self: { license = lib.licenses.bsd2; }) {}; - "indexed-traversable-instances" = callPackage - ({ mkDerivation, base, containers, indexed-traversable, OneTuple - , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers, unordered-containers, vector - }: + "indexed-traversable_0_1_2_1" = callPackage + ({ mkDerivation, array, base, containers, transformers }: mkDerivation { - pname = "indexed-traversable-instances"; - version = "0.1.1.1"; - sha256 = "1c60vhf47y8ln33scyvwiffg24dvhm4aavya624vbqjr7l3fapl9"; - libraryHaskellDepends = [ - base indexed-traversable OneTuple tagged unordered-containers - vector - ]; - testHaskellDepends = [ - base containers indexed-traversable OneTuple QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + pname = "indexed-traversable"; + version = "0.1.2.1"; + sha256 = "1926yzk0gc2vd6p12addj70fnh57504xl29yzvbcgssx5084r1gy"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; - "indexed-traversable-instances_0_1_1_2" = callPackage + "indexed-traversable-instances" = callPackage ({ mkDerivation, base, containers, indexed-traversable, OneTuple , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck , transformers, unordered-containers, vector @@ -161684,6 +161809,8 @@ self: { pname = "indexed-traversable-instances"; version = "0.1.1.2"; sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; + revision = "1"; + editedCabalFile = "1vyfs8xwxm2ipgiinzrp41pl0cy2xrmx7a9iim4vlz1sca1yv4xl"; libraryHaskellDepends = [ base indexed-traversable OneTuple tagged unordered-containers vector @@ -161695,7 +161822,6 @@ self: { ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indextype" = callPackage @@ -163841,30 +163967,6 @@ self: { }) {}; "invariant" = callPackage - ({ mkDerivation, array, base, bifunctors, comonad, containers - , contravariant, ghc-prim, hspec, hspec-discover, profunctors - , QuickCheck, StateVar, stm, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.6"; - sha256 = "07ffgcfpacsdihcmcmx2m1gp8czlg28657bxncxjykjiiiwjlaxm"; - revision = "1"; - editedCabalFile = "0551ll1swnrmq09j89jqnxl4qnirbbpdpsdym23adaf36qdd7v37"; - libraryHaskellDepends = [ - array base bifunctors comonad containers contravariant ghc-prim - profunctors StateVar stm tagged template-haskell th-abstraction - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell98 invariant functors"; - license = lib.licenses.bsd2; - }) {}; - - "invariant_0_6_1" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, hspec-discover, profunctors , QuickCheck, StateVar, stm, tagged, template-haskell @@ -163884,7 +163986,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell98 invariant functors"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "inventory" = callPackage @@ -165059,26 +165160,21 @@ self: { }) {}; "iris" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, colourista - , directory, hspec, mtl, optparse-applicative, process, text - , unliftio-core + ({ mkDerivation, ansi-terminal, base, directory, hspec, mtl + , optparse-applicative, process, text, unliftio-core }: mkDerivation { pname = "iris"; - version = "0.0.0.0"; - sha256 = "15khmxdhc7mxlps2kgr82m29xy9b5nwcxsl3wfw6xiigjw1w2m0b"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.0"; + sha256 = "18nsmpka72597ipy3dijcbaqayykslwszv7ascp83gy7ppfx70l4"; libraryHaskellDepends = [ - ansi-terminal base bytestring directory mtl optparse-applicative - process text unliftio-core + ansi-terminal base directory mtl optparse-applicative process text + unliftio-core ]; - executableHaskellDepends = [ base colourista mtl ]; - testHaskellDepends = [ base hspec text ]; + testHaskellDepends = [ base hspec optparse-applicative text ]; description = "Haskell CLI framework"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - mainProgram = "iris-example"; broken = true; }) {}; @@ -166442,8 +166538,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.1.1.0"; - sha256 = "1qi494yn7krnrlq4g083zj1cw16qa9r1al9wqz4b42s33igiw2is"; + version = "0.1.2.0"; + sha256 = "1wc16b61vbvh2bigcva11qbjpqg7kwvzgc0znxzsilywrl3iv1nf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -170005,6 +170101,8 @@ self: { pname = "kan-extensions"; version = "5.2.5"; sha256 = "08mddsk9v75mahp1jqn28vglygmdil1g37drcj3ivbqc0k6dq55r"; + revision = "1"; + editedCabalFile = "1rbcmvgkw714v3296pdkpk7726ghc43czsaxm8ygvanshzd87qi2"; libraryHaskellDepends = [ adjunctions array base comonad containers contravariant distributive free invariant mtl profunctors semigroupoids tagged @@ -171570,8 +171668,8 @@ self: { pname = "keycode"; version = "0.2.2"; sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan"; - revision = "8"; - editedCabalFile = "1a8a51sz670cfh73q9l2dckfqgv59lpxk8dg5xd9fnvi2ba7wdf1"; + revision = "9"; + editedCabalFile = "17k52bhfyx2vpj6wpsmfjw9gbxwhc1zi1jq005lfa7hgc4ly5iw2"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -171699,8 +171797,8 @@ self: { pname = "keys"; version = "3.12.3"; sha256 = "0ik6wsff306dnbz0v3gpiajlj5b558hrk9176fzcb2fclf4447nm"; - revision = "2"; - editedCabalFile = "1sb7ii9mhx77rhviqbmdc5r6wlimkmadxi1pyk7k3imdqcdzgjlp"; + revision = "4"; + editedCabalFile = "16s7yj70fms01ab8x2f3262p576lwqdxlkq798qf9pjxfg95jvy9"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -171963,6 +172061,18 @@ self: { mainProgram = "kif-parser"; }) {}; + "kill-bool" = callPackage + ({ mkDerivation, base, hspec, hspec-core }: + mkDerivation { + pname = "kill-bool"; + version = "0.1.0.0"; + sha256 = "15ylnlwrh1fkkp6xsjqxm6plykrnr116n9j78mdm00jznp6a0ns6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Boolean strong typing"; + license = lib.licenses.isc; + }) {}; + "kind-apply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175781,45 +175891,48 @@ self: { }) {}; "large-anon" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , ghc, ghc-tcplugin-api, hashable, large-generics, mtl, optics-core - , parsec, primitive, QuickCheck, record-dot-preprocessor - , record-hasfield, sop-core, syb, tagged, tasty, tasty-hunit - , tasty-quickcheck, text, typelet, validation-selective + ({ mkDerivation, aeson, aeson-pretty, arrows, base, bytestring + , containers, deepseq, fourmolu, ghc, ghc-tcplugin-api, hashable + , large-generics, mtl, optics-core, parsec, primitive, QuickCheck + , record-dot-preprocessor, record-hasfield, sop-core, Stream, syb + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, typelet + , validation-selective }: mkDerivation { pname = "large-anon"; - version = "0.1.1"; - sha256 = "15fgmh1nnm3xc04sw0gk7a456fa1j8gij8av4h22g98pp4dap4wb"; + version = "0.2"; + sha256 = "0ym7awxla6lq4gxx6j110cgc3mmfh286nhm7cis7vail8fzbqqf3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base containers ghc ghc-tcplugin-api hashable large-generics - mtl optics-core primitive record-hasfield sop-core syb tagged - typelet + aeson base containers deepseq ghc ghc-tcplugin-api hashable + large-generics mtl optics-core primitive record-hasfield sop-core + syb tagged typelet ]; + executableHaskellDepends = [ base fourmolu text ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring large-generics mtl optics-core - parsec QuickCheck record-dot-preprocessor record-hasfield sop-core - tasty tasty-hunit tasty-quickcheck text typelet - validation-selective + aeson aeson-pretty arrows base bytestring large-generics mtl + optics-core parsec QuickCheck record-dot-preprocessor + record-hasfield sop-core Stream tasty tasty-hunit tasty-quickcheck + text typelet validation-selective ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; "large-generics" = callPackage - ({ mkDerivation, aeson, base, generic-deriving, generics-sop - , microlens, mtl, primitive, QuickCheck, sop-core, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, deepseq, generic-deriving + , generics-sop, microlens, mtl, primitive, QuickCheck, sop-core + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "large-generics"; - version = "0.2.0.0"; - sha256 = "0pyydzwybccwaliajzaddgirrffv0sskkyf5zp84rs8kp2yqz9z1"; - revision = "1"; - editedCabalFile = "07hr73lv367ga0m3knrhwcafr6g7sa7p24689zfn4n1z4ja1cm8q"; + version = "0.2.1"; + sha256 = "0av3j1a1400fsvdmmfji358nknf54n7592fvlilm4kahm4grjl1z"; libraryHaskellDepends = [ - aeson base generics-sop primitive sop-core + aeson base deepseq generics-sop primitive sop-core ]; testHaskellDepends = [ aeson base generic-deriving generics-sop microlens mtl QuickCheck @@ -175869,11 +175982,12 @@ self: { }: mkDerivation { pname = "large-records"; - version = "0.3"; - sha256 = "1s11zk2bgi85q18hp01pkjvp8l3f1plb78cblyi4j0cvs6ra4q4w"; + version = "0.4"; + sha256 = "0g09ly8fck613lbs3g2w1slqrxp6fvvrn7i232w5g7nafgsdalfy"; libraryHaskellDepends = [ - base containers ghc large-generics mtl primitive record-hasfield - syb template-haskell transformers + base containers ghc large-generics mtl primitive + record-dot-preprocessor record-hasfield syb template-haskell + transformers ]; testHaskellDepends = [ base generic-deriving large-generics mtl newtype @@ -177162,7 +177276,6 @@ self: { ]; description = "Haskell code for learning physics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -177181,6 +177294,7 @@ self: { description = "examples for learn-physics"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "learning-hmm" = callPackage @@ -177526,6 +177640,8 @@ self: { pname = "lens"; version = "5.2.1"; sha256 = "0vr6wpq6g8cc24dqi5qzslhkkq1l99pzk8yd7vl3r2i5wyfw3l82"; + revision = "2"; + editedCabalFile = "0l64ydsqfla32xm3vwdjkyzn6f4cv7h68cxx3l0cpfrk61r9w3ra"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -177569,8 +177685,8 @@ self: { pname = "lens-action"; version = "0.2.6"; sha256 = "0cdprc5j6r976dmrga2zwvcr7qsv7nqy3nvncp66yyy0dk2qlwm3"; - revision = "1"; - editedCabalFile = "1nj5a48vpwdaq2vg0c5sniwnyw7ansvhvkvg163damg9cjzysji7"; + revision = "2"; + editedCabalFile = "0rrrv7k0fz98j99a6gzw858v5w3i378g0b7ijj30dz2am6p6rfnm"; libraryHaskellDepends = [ base comonad contravariant lens mtl profunctors semigroupoids transformers @@ -178062,8 +178178,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.5.4.2"; - sha256 = "198ajay44aapyn8zw3416lhv7wdkb8p6y3a77w2m3p9ly9sj5hgc"; + version = "1.5.5.0"; + sha256 = "09qbaz4l6c77j427kfxyxvi68lgh1w2xxnp4cqbyhi39z38k3yl0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178145,8 +178261,8 @@ self: { }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.7.0"; - sha256 = "0j1qnd3qz6kiivhmbs5a4hnw1wm13q794s7b5rrin62x8dz7kcp0"; + version = "0.1.8.0"; + sha256 = "0kq8i39pm1by83q3qaqrdjcisrnf4bgwvzp9j0h6zskpjbvba85v"; libraryHaskellDepends = [ base containers email-validate generic-arbitrary genvalidity genvalidity-hspec genvalidity-property hashable hspec mtl @@ -179331,8 +179447,8 @@ self: { }: mkDerivation { pname = "libsodium"; - version = "1.0.18.2"; - sha256 = "021167kkpii8szx32m5ljgmy5vhvhdijasnz350b14wr047n5iww"; + version = "1.0.18.3"; + sha256 = "0kc5g0yi1c8vvd5v3w73pmxsgc47q1lm1g4cd239354dj33wg46s"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ libsodium ]; libraryToolDepends = [ c2hs ]; @@ -179757,8 +179873,8 @@ self: { pname = "lift-generics"; version = "0.2.1"; sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; - revision = "3"; - editedCabalFile = "0birp7ibzvil7m9ra0ixgaz9z0liixbw9z1j22x4r8x5r6hyaqik"; + revision = "4"; + editedCabalFile = "07nf6d1fb0vc3fyldrgysmbc67hd94npp5f2hclrr3rhklfm7k91"; libraryHaskellDepends = [ base generic-deriving ghc-prim template-haskell th-compat ]; @@ -180372,6 +180488,8 @@ self: { pname = "linear"; version = "1.22"; sha256 = "1ddr0c54kbi9bw7d62i6h3jiss3q0qmrdpkvckajz6qf5lwkxr6g"; + revision = "1"; + editedCabalFile = "1p94bq3pwqvj4qd1lp0w84k514xd9vib76gw0d16q1xh27c2sz4h"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -181370,8 +181488,8 @@ self: { ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-base"; - version = "4.15.0.0"; - sha256 = "1f1lqdd65a3z0by0i3dr51hahcsq8s3vcc0xyxlvb5pp3vsz89vm"; + version = "4.15.1.0"; + sha256 = "0mzv7l1w54wvwcqzy94kwlf6srh4vg1fi4lddm19ysrvfrw7r0pc"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; @@ -181386,8 +181504,8 @@ self: { }: mkDerivation { pname = "liquid-bytestring"; - version = "0.10.10.0"; - sha256 = "1fkl637zdxpsginnr0gqv68kch0dkr4yhmmmryzqy2h8fxm8gmg7"; + version = "0.10.12.1"; + sha256 = "0zzcbpsli9bcf94z42lg1yg1bkaa09vgpcbak0fq4fm9ws12yisf"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; @@ -181402,8 +181520,8 @@ self: { }: mkDerivation { pname = "liquid-containers"; - version = "0.6.2.1"; - sha256 = "07k9sg1q5xvsab2dvikkjb9rpx9rcabs4szm5rbh1m5mqnwivr1l"; + version = "0.6.4.1"; + sha256 = "0529qxvmipw6yd6v1p9vgkbk9al9cqcbwp71zzaxg9y22kkxly6a"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; @@ -181416,31 +181534,31 @@ self: { ({ mkDerivation, aeson, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, bytestring, cereal, cmdargs , containers, deepseq, directory, fgl, filepath, git, hashable - , intern, megaparsec, mtl, nettools, parallel, parser-combinators - , pretty, process, rest-rewrite, stm, store, syb, tasty + , intern, lens-family, megaparsec, mtl, nettools + , optparse-applicative, parallel, parser-combinators, pretty + , process, rest-rewrite, stm, store, syb, tagged, tasty , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-rerun, text - , transformers, unordered-containers, z3 + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquid-fixpoint"; - version = "8.10.7"; - sha256 = "02zih8q3kv94s1l4m9d8f3d60idm1an23kxx0ahjfg8cdqgi3gym"; - revision = "1"; - editedCabalFile = "0ddqrx1ffihwmfw1jy9cycj253zq0f9f7n7xvwl6k07q58nadaf4"; + version = "0.9.0.2.1"; + sha256 = "1gq867m9b48381zi3m5xari9j34xva4gchajahbpi4fvy54gp6h3"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array ascii-progress async attoparsec base binary boxes bytestring cereal cmdargs containers deepseq directory - fgl filepath hashable intern megaparsec mtl parallel + fgl filepath hashable intern lens-family megaparsec mtl parallel parser-combinators pretty process rest-rewrite stm store syb text - transformers unordered-containers + transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers directory filepath hashable mtl process stm tasty - tasty-ant-xml tasty-hunit tasty-quickcheck tasty-rerun transformers + base containers directory filepath hashable mtl + optparse-applicative process stm tagged tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-rerun text transformers unordered-containers ]; testSystemDepends = [ git nettools z3 ]; @@ -181456,8 +181574,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-ghc-prim"; - version = "0.7.0"; - sha256 = "0pyhdg0fcvg0hm6m541hkr9spl3mghf9s4nkl62vi0hfwp1gd5bb"; + version = "0.7.0.1"; + sha256 = "1a9k21krk2b32cmw6b193794wsh5kmpb3d0bvrrkyl0pbvz5jrg2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ ghc-prim liquidhaskell ]; @@ -181471,8 +181589,8 @@ self: { }: mkDerivation { pname = "liquid-parallel"; - version = "3.2.2.0"; - sha256 = "0dg0k1lx74p3lj3vc43wypy5a3lpnww5w456ccp4xy3k83b3c4xd"; + version = "3.2.2.0.1"; + sha256 = "0c9qf1achk9n6l6rlncsm7harmdxph90by61lmjk3fw251c9ib03"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; @@ -181482,18 +181600,18 @@ self: { }) {}; "liquid-platform" = callPackage - ({ mkDerivation, cmdargs, liquid-base, liquid-bytestring + ({ mkDerivation, cmdargs, filepath, liquid-base, liquid-bytestring , liquid-containers, liquid-prelude, liquid-vector, liquidhaskell , process }: mkDerivation { pname = "liquid-platform"; - version = "0.8.10.2"; - sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf"; + version = "0.9.0.2"; + sha256 = "1y2vwjs00k786diwmzljrzwaj3nnmsm4kysq49hdzl9vkfx8nvca"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - cmdargs liquid-base liquid-bytestring liquid-containers + cmdargs filepath liquid-base liquid-bytestring liquid-containers liquid-prelude liquid-vector liquidhaskell process ]; description = "A battery-included platform for LiquidHaskell"; @@ -181508,8 +181626,8 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.8.10.2"; - sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh"; + version = "0.9.0.2"; + sha256 = "176iwwsnx80x716qym2i6hjyq7v38lq2nkwnmhdb1v3c5wrp4z67"; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring containers liquid-base liquidhaskell @@ -181523,8 +181641,8 @@ self: { ({ mkDerivation, base, Cabal, liquid-base, liquidhaskell, vector }: mkDerivation { pname = "liquid-vector"; - version = "0.12.1.2"; - sha256 = "1kpa7c5a774ixqky3msp2xnq1nl16hh95azvaxdk0bhizfi3zjy3"; + version = "0.12.3.1"; + sha256 = "15v4prdf35b11iym05dmr3n58i260zk69yzf31cha7rqbgr5lhd7"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; @@ -183326,8 +183444,8 @@ self: { pname = "log-domain"; version = "0.13.2"; sha256 = "0i4fx9k8cwjvmj0pgfnbici1b68zmif1jmmqxplpjqy32ksnyifa"; - revision = "1"; - editedCabalFile = "0nbfbp7a6x3vppavra7pf28l2wwlci3qgps60igqgjkbdcvq7w8c"; + revision = "2"; + editedCabalFile = "1hddf1q0gvpx7ic0qynjl9nk9g37kjh352yfk5axi36k49zfpw8d"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable semigroupoids semigroups vector @@ -184223,10 +184341,8 @@ self: { ({ mkDerivation, base, integer-gmp }: mkDerivation { pname = "long-double"; - version = "0.1.1"; - sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; - revision = "2"; - editedCabalFile = "0lnzxn18rwpw7idc4pkpn0y4nhlvfxjcnxylgs8il394rig6idxh"; + version = "0.1.1.1"; + sha256 = "0xq2f0ziinlw1drgg3q6p7303rkzbasc9jwrz8lgjfl3wv24qk8l"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = lib.licenses.bsd3; @@ -186171,8 +186287,8 @@ self: { pname = "machines"; version = "0.7.3"; sha256 = "1cmflvd0xphs15ip61347ph9w4hnhmsa4nlp425i53x1ld99l23c"; - revision = "1"; - editedCabalFile = "00mp54mb9br390cnk3i60j4i2byp625swjcnq92csxscj86i0awd"; + revision = "2"; + editedCabalFile = "13msrrbravjx51j40jn5namgbkfc44dv565ry5pdb5l389gzfl1k"; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed profunctors semigroupoids semigroups transformers @@ -189674,8 +189790,8 @@ self: { }: mkDerivation { pname = "mealy"; - version = "0.4.0"; - sha256 = "06pl768xlg0jiqjs1m79zhdqk29sdh1jmcywdn7whq1sxwc5hlhn"; + version = "0.4.1"; + sha256 = "1qr3pbskcsk8hpw8fb39hcqq9ms7a01cvk44bh1fg35cy826hdhv"; libraryHaskellDepends = [ adjunctions base containers mwc-probability numhask numhask-array optics-core primitive profunctors tdigest text vector @@ -190714,6 +190830,18 @@ self: { mainProgram = "memscript"; }) {}; + "memzero" = callPackage + ({ mkDerivation, base, safe-exceptions, transformers }: + mkDerivation { + pname = "memzero"; + version = "0.1"; + sha256 = "15ipi1vxd8gq8w8qb1cdpkmkj41clk70pyl5r6pkzaq46ap7y9fx"; + libraryHaskellDepends = [ base safe-exceptions ]; + testHaskellDepends = [ base safe-exceptions transformers ]; + description = "Securely erase memory contents by writing zeros to it"; + license = lib.licenses.asl20; + }) {}; + "menoh" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , filepath, JuicyPixels, menoh, monad-control, optparse-applicative @@ -195082,6 +195210,8 @@ self: { pname = "monad-logger"; version = "0.3.39"; sha256 = "19992zh63axs0q86fgznk04dan8h3hbs72cjp1s3yynsgl23pwnk"; + revision = "1"; + editedCabalFile = "0nj4qpmp6i5lmfbk7f1shljx8g2062fq6y857y4f9avp1cb9zm7d"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -196506,6 +196636,20 @@ self: { license = lib.licenses.mit; }) {}; + "monocypher" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "monocypher"; + version = "4.0.0.1"; + sha256 = "1hcmzr6px8kmdv63gg1d34vvgprzzj3dlf26hv010xc872qwfiiy"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Low level bindings to the monocypher C library"; + license = "(CC0-1.0 OR BSD-2-Clause)"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "monoid" = callPackage ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { @@ -196632,15 +196776,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "monoid-subclasses_1_2_1" = callPackage + "monoid-subclasses_1_2_2" = callPackage ({ mkDerivation, base, bytestring, commutative-semigroups , containers, primes, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, vector }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.1"; - sha256 = "10q71zpj2q81q4dpb9mmsds0jwhcvlxqdgxk0kjiqf8i78qy54hn"; + version = "1.2.2"; + sha256 = "190cbknmcbjq3z3cx67nas6khb062zbh04ngnv6jkf7vrd31lyv2"; libraryHaskellDepends = [ base bytestring commutative-semigroups containers primes text vector @@ -196775,8 +196919,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.2.6"; - sha256 = "048zic4pkgdcrawg9npj8jdbd38d3qal45gdb6abxmcjqi5zapsg"; + version = "0.0.3.1"; + sha256 = "1fqm2cwgfs477bj83hcknbbyf7lrsk17ka6i0n11p6bxi9dg1mq1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -197686,6 +197830,8 @@ self: { ]; description = "Generación interactiva de mosaicos"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mosquitto-hs" = callPackage @@ -203666,8 +203812,8 @@ self: { }: mkDerivation { pname = "network"; - version = "3.1.2.7"; - sha256 = "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz"; + version = "3.1.2.8"; + sha256 = "08kqgiz5gvq5v22j8kzpicncb7mf555cc12hfmv4r67icnqd9qpx"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -205047,12 +205193,12 @@ self: { }) {}; "newline" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "newline"; - version = "0.0.1.0"; - sha256 = "1lnrcpbj5sqgqxg41hf3ppj4dz77jh978acni7ni1wqd3yycgh68"; - libraryHaskellDepends = [ base text ]; + version = "0.0.2.1"; + sha256 = "127fh7axlkkkg0zb83ah4xh7539xvj4ch4f9gyd0bynnirzy11d4"; + libraryHaskellDepends = [ base bytestring text ]; description = "newline specifications as values"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -205684,8 +205830,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.21"; - sha256 = "1i4n706nrrd0mk34wrjgg597gsd95xslg8aqrhp3ijh4j4h2b8n2"; + version = "0.2.22"; + sha256 = "1np4n7fz6lg0dqxa1x8ksy9q2lkrrzg8182rd6mig2xy0dxa493s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -207059,7 +207205,6 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -207077,7 +207222,6 @@ self: { ]; description = "examples for not-gloss"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "not-in-base" = callPackage @@ -207962,8 +208106,8 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "5"; - editedCabalFile = "005n9ax9dkkcqx9qm5kbga1a69rf78zqf3ld486136379h6qdi0h"; + revision = "6"; + editedCabalFile = "091gsnl0r7y25qb13r28ak39rz10p6ym3qvqdv24y3naxiplw8sq"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework @@ -208122,8 +208266,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.10.1.0"; - sha256 = "1zxp98svs872qpc0d8pycdbnf47phw4xbrvpi4vrzwyri5wahsxb"; + version = "0.10.1.1"; + sha256 = "1ar1qd75kxswwj8vkdxnixakw9hcj38jpxjjknfa9k27457aky2b"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; @@ -208131,15 +208275,17 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, distributive, numhask, vector + ({ mkDerivation, adjunctions, base, distributive, numhask + , QuickCheck, vector }: mkDerivation { pname = "numhask-array"; - version = "0.10.1"; - sha256 = "0c8zvlx5w6zjjxcnsc6jl7pbmfr1p4823jpcyzvx72kzzms16x5b"; + version = "0.10.2"; + sha256 = "09g8kfv5p82g50qag2n9hswf3wc8xjdbg6b8pgw32ywxa4yjgxd3"; libraryHaskellDepends = [ adjunctions base distributive numhask vector ]; + testHaskellDepends = [ base QuickCheck ]; description = "Multi-dimensional arrays"; license = lib.licenses.bsd3; }) {}; @@ -208234,16 +208380,18 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , numhask, random, semigroupoids, tdigest, text, time, vector + , numhask, QuickCheck, random, semigroupoids, tdigest, text, time + , vector }: mkDerivation { pname = "numhask-space"; - version = "0.10.0.0"; - sha256 = "09x53pmn2skbv1zhjmd4wq5wxhi7sshzg3ksjx1n0fy0x16d19lf"; + version = "0.10.0.1"; + sha256 = "04y849c5ghji734k98jbmf6dc4pmwx4ny73r493rwjcbdy31bscm"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector ]; + testHaskellDepends = [ base QuickCheck ]; description = "Numerical spaces"; license = lib.licenses.bsd3; }) {}; @@ -214317,7 +214465,7 @@ self: { ]; }) {}; - "pandoc_3_1" = callPackage + "pandoc_3_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -214335,8 +214483,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1"; - sha256 = "1dwnlvkisqr7lz6rnm89lh5dkg14kzd3bshqyvzg7c31gh45cygr"; + version = "3.1.1"; + sha256 = "0dw52slj7j1fxby9laj51hywi9bzd48fnj08k300pcal5ah5rgyq"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -219326,13 +219474,13 @@ self: { "perf" = callPackage ({ mkDerivation, base, containers, deepseq, formatn, gauge, mtl - , numhask-space, optparse-applicative, rdtsc, recursion-schemes - , text, time, vector + , numhask-space, optparse-applicative, QuickCheck, rdtsc + , recursion-schemes, text, time, vector }: mkDerivation { pname = "perf"; - version = "0.10.1"; - sha256 = "0r103y4xkl99ypiq3ps9cfplfpkd4lbs5w5cf6my2fpcza259zv2"; + version = "0.10.2"; + sha256 = "1ihqqpcvcl0aws3z9mxnz5gv8ghc4h3k0hr0v18x23z9d4x51487"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219342,6 +219490,7 @@ self: { executableHaskellDepends = [ base containers deepseq formatn gauge mtl optparse-applicative text ]; + testHaskellDepends = [ base QuickCheck ]; description = "Low-level run time measurement"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -219827,7 +219976,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_4_4" = callPackage + "persistent_2_14_5_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -219838,8 +219987,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.4.4"; - sha256 = "10i75da5rd5ydg17x93i3jkfx51cywxn37l4km1lr9p35lzhyfa3"; + version = "2.14.5.0"; + sha256 = "1vj67j2r1wc26fz1zk1l0f2b41bkazcz3f509amanmhjwwiqlq84"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers deepseq fast-logger http-api-data lift-type @@ -220155,8 +220304,8 @@ self: { pname = "persistent-mongoDB"; version = "2.13.0.1"; sha256 = "1ck74kpzkz623c43qb8r1cjq8chi2p721vx95zrpciz8jm496235"; - revision = "2"; - editedCabalFile = "169wvga2zkgq0znvpnmpcyz0wy92sspjsrg48vyj2fr58yvvhbz5"; + revision = "3"; + editedCabalFile = "163c5q6fwnp96y952qq5ya26z64lr6abblmpxfqxcsalfcgx3rad"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -220325,8 +220474,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.5.1"; - sha256 = "1snvzm01qgyiz3y12pzyy4phxwqpr7c47fi395w3cnl915y9i8rp"; + version = "2.13.5.2"; + sha256 = "0p8hikvynl6yfdv030pk6vpczpw52ys8m4vba1qb9h2w1vkr4a3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221249,6 +221398,75 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "phladiprelio-general-shared" = callPackage + ({ mkDerivation, base, phonetic-languages-phonetics-basics }: + mkDerivation { + pname = "phladiprelio-general-shared"; + version = "0.1.0.0"; + sha256 = "08k08584ylmfflrv3wsm00j8gcd3mj8lkqpp2mw3mv0x0bdb7hmb"; + libraryHaskellDepends = [ + base phonetic-languages-phonetics-basics + ]; + description = "A shared by different general implementations of the PhLADiPreLiO functionality"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "phladiprelio-general-simple" = callPackage + ({ mkDerivation, base, cli-arguments, phladiprelio-general-shared + , phonetic-languages-phonetics-basics, rhythmic-sequences + }: + mkDerivation { + pname = "phladiprelio-general-simple"; + version = "0.1.1.0"; + sha256 = "0qz5f5w5fih0wc2d9dw29wya2vy8lfb02zhah26sh1x7w7bc9bih"; + libraryHaskellDepends = [ + base cli-arguments phladiprelio-general-shared + phonetic-languages-phonetics-basics rhythmic-sequences + ]; + description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "phladiprelio-ukrainian-shared" = callPackage + ({ mkDerivation, base, directory, mmsyn2-array + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phladiprelio-ukrainian-shared"; + version = "0.1.0.0"; + sha256 = "1k3a70ncffww0p78siikznwiwk7lbcdywyhdfl7si5i6g8g20p1g"; + libraryHaskellDepends = [ + base directory mmsyn2-array ukrainian-phonetics-basic-array + ]; + description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "phladiprelio-ukrainian-simple" = callPackage + ({ mkDerivation, base, cli-arguments, phladiprelio-ukrainian-shared + , phonetic-languages-ukrainian-array, rhythmic-sequences + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phladiprelio-ukrainian-simple"; + version = "0.1.2.0"; + sha256 = "1agbsxxg5zp6gsvqknl09vhapwbf2gl4cf7fpxxnsx6qyd4s1zig"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cli-arguments phladiprelio-ukrainian-shared + phonetic-languages-ukrainian-array rhythmic-sequences + ukrainian-phonetics-basic-array + ]; + description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "phladiprelioUkr"; + }) {}; + "phoityne" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, conduit , conduit-extra, ConfigFile, containers, directory, filepath, gtk3 @@ -221676,8 +221894,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.5.1.0"; - sha256 = "0mgkgqf3rjjdrz85qxdjz6b0ivgc9h4k06gj5wnv3nbfjk5wpndk"; + version = "0.6.1.0"; + sha256 = "0cawd0193axygxs8sd85z2ljp32n4mhp2p8n71hv97932wdlnhvg"; libraryHaskellDepends = [ base heaps phonetic-languages-simplified-properties-array phonetic-languages-ukrainian-array ukrainian-phonetics-basic-array @@ -221725,8 +221943,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.5.1.0"; - sha256 = "0mdsn3clb422r02y87ix6bphggvg8m2yacar5y4ipj0vq2ky2m4a"; + version = "0.6.0.0"; + sha256 = "0qx0kym5ynbsc673kfjygy7vip6l4vqvhy7f74aw0ghlb04vcaap"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics phonetic-languages-simplified-generalized-properties-array @@ -221737,17 +221955,19 @@ self: { }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn2-array - , phonetic-languages-basis, phonetic-languages-phonetics-basics + ({ mkDerivation, base, lists-flines, logical-constraints + , mmsyn2-array, phonetic-languages-basis + , phonetic-languages-phonetics-basics , phonetic-languages-rhythmicity }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.12.0.0"; - sha256 = "14y4h8p43wrhxs110jn4idcvj441ai6qhhs86kfnhvrg3glw9nln"; + version = "0.13.0.0"; + sha256 = "11vqamjjy7vzfsx6j434yfk66jfkdydmvn86fhx9siyyggldmv7g"; libraryHaskellDepends = [ - base lists-flines mmsyn2-array phonetic-languages-basis - phonetic-languages-phonetics-basics phonetic-languages-rhythmicity + base lists-flines logical-constraints mmsyn2-array + phonetic-languages-basis phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; @@ -224077,6 +224297,8 @@ self: { pname = "pixiv"; version = "0.1.1"; sha256 = "1mzcnm1y0fsx66lk09j49mdw9hv4l0zsq4wqi9jcamr0jf5ffq0y"; + revision = "1"; + editedCabalFile = "0zfjbyqvh4azhcrmc8vwkyjq7qnqy4gpm0qp29fv0p5zhmqbn4ay"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash-md5 exceptions filepath http-client http-client-tls lens monad-control mtl process @@ -225208,6 +225430,8 @@ self: { pname = "pointed"; version = "5.0.4"; sha256 = "1mv06x2hscs220w4acm5jwg96vi4faky6ir9hnljfry3n2r2xix3"; + revision = "1"; + editedCabalFile = "14w5w6z2zk494mz5h1bm21a5rj8wlkyy37vi944ix4r7nrylv8bl"; libraryHaskellDepends = [ base comonad containers data-default-class hashable kan-extensions semigroupoids semigroups stm tagged transformers @@ -225927,6 +226151,53 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-account" = callPackage + ({ mkDerivation, base, chronos, elocrypt, password, polysemy + , polysemy-db, polysemy-plugin, prelate, random, servant-auth, sqel + }: + mkDerivation { + pname = "polysemy-account"; + version = "0.2.0.0"; + sha256 = "0j2b8jvjlqfmzajy2dq637xrznclk1zk5q7pv9yv17nni5hshg15"; + libraryHaskellDepends = [ + base chronos elocrypt password polysemy polysemy-db polysemy-plugin + prelate random servant-auth sqel + ]; + description = "Account management with Servant and Polysemy"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "polysemy-account-api" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, exon, fast-logger + , http-types, jose, polysemy, polysemy-account, polysemy-conc + , polysemy-db, polysemy-hasql, polysemy-hasql-test, polysemy-plugin + , polysemy-test, prelate, servant, servant-auth + , servant-auth-server, servant-server, sqel, tasty, transformers + , uuid, wai, wai-extra, warp, zeugma + }: + mkDerivation { + pname = "polysemy-account-api"; + version = "0.2.0.0"; + sha256 = "08vnyagjgg0bj5d8zpkp5y76kn31nyx6381p9p7f93w8rf5fxp8n"; + libraryHaskellDepends = [ + aeson base exon fast-logger jose polysemy polysemy-account + polysemy-conc polysemy-db polysemy-hasql polysemy-plugin prelate + servant servant-auth servant-auth-server servant-server sqel + transformers uuid wai wai-extra warp + ]; + testHaskellDepends = [ + aeson base case-insensitive exon http-types polysemy + polysemy-account polysemy-db polysemy-hasql polysemy-hasql-test + polysemy-plugin polysemy-test prelate servant-auth + servant-auth-server servant-server sqel tasty uuid wai wai-extra + zeugma + ]; + description = "Account management with Servant and Polysemy"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-check" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , kind-generics, kind-generics-th, polysemy, polysemy-plugin @@ -225992,6 +226263,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-db" = callPackage + ({ mkDerivation, base, exon, polysemy, polysemy-plugin, prelate + , random, sqel, uuid + }: + mkDerivation { + pname = "polysemy-db"; + version = "0.0.1.0"; + sha256 = "07xdkcb57l55ghkz4bgkwvl52fsi5qximx4zczp6gq1z3c831ih4"; + libraryHaskellDepends = [ + base exon polysemy polysemy-plugin prelate random sqel uuid + ]; + description = "Polysemy effects for databases"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-extra" = callPackage ({ mkDerivation, base, containers, polysemy, polysemy-kvstore }: mkDerivation { @@ -226037,6 +226324,54 @@ self: { license = lib.licenses.mit; }) {}; + "polysemy-hasql" = callPackage + ({ mkDerivation, aeson, async, base, containers, exon, generics-sop + , hasql, hedgehog, polysemy, polysemy-db, polysemy-plugin + , polysemy-test, postgresql-libpq, prelate, sqel, stm-chans, tasty + , torsor, transformers, uuid, vector, zeugma + }: + mkDerivation { + pname = "polysemy-hasql"; + version = "0.0.1.0"; + sha256 = "1w408gjyjarbrlw0sibwzkv580awqxvg0zsb7c9r67cys4nv9zvp"; + libraryHaskellDepends = [ + async base containers exon generics-sop hasql polysemy polysemy-db + polysemy-plugin postgresql-libpq prelate sqel stm-chans torsor + transformers uuid + ]; + testHaskellDepends = [ + aeson base exon generics-sop hasql hedgehog polysemy polysemy-db + polysemy-plugin polysemy-test prelate sqel tasty uuid vector zeugma + ]; + description = "Polysemy effects for databases"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "polysemy-hasql-test" = callPackage + ({ mkDerivation, aeson, base, chronos, exon, first-class-families + , generics-sop, hasql, hedgehog, path, polysemy, polysemy-db + , polysemy-hasql, polysemy-plugin, polysemy-test, prelate, sqel + , tasty, uuid + }: + mkDerivation { + pname = "polysemy-hasql-test"; + version = "0.0.1.0"; + sha256 = "0j4p3s13vgc92jbr83aybw2lbngk1qdswkfv317b14h9kv71d543"; + libraryHaskellDepends = [ + base hasql hedgehog path polysemy polysemy-db polysemy-hasql + polysemy-plugin polysemy-test prelate sqel uuid + ]; + testHaskellDepends = [ + aeson base chronos exon first-class-families generics-sop hasql + path polysemy polysemy-db polysemy-hasql polysemy-plugin + polysemy-test prelate sqel tasty + ]; + description = "Test utilities for polysemy-hasql"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-http" = callPackage ({ mkDerivation, aeson, base, case-insensitive, exon, hedgehog , http-client, http-client-tls, http-types, network, polysemy @@ -226917,6 +227252,20 @@ self: { broken = true; }) {}; + "poolboy" = callPackage + ({ mkDerivation, base, hspec, hspec-core, safe-exceptions, stm }: + mkDerivation { + pname = "poolboy"; + version = "0.1.0.0"; + sha256 = "08p71z7apr1gb9q3bavwq9qvfddga5lny13kpll0x3ivncd0cvi5"; + libraryHaskellDepends = [ base safe-exceptions stm ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Simple work queue for bounded concurrency"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pooled-io" = callPackage ({ mkDerivation, base, concurrent-split, containers, deepseq , transformers, unsafe, utility-ht @@ -227246,8 +227595,8 @@ self: { pname = "portray"; version = "0.3.0"; sha256 = "059lyc5p7726y9yj7c3by854czhbiwspgrgiqa6qp22pfbx2ycqn"; - revision = "1"; - editedCabalFile = "06bdmmfxav5ah20bdj09rbgvk4ncjicx1r48m3l9xjcczbm28y5m"; + revision = "2"; + editedCabalFile = "0yrkndi02ad65ag6q8753kjfraw2sx3pcm94fh5ivrydgnddlz6z"; libraryHaskellDepends = [ base bytestring containers text wrapped ]; @@ -227265,8 +227614,8 @@ self: { pname = "portray-diff"; version = "0.1.1"; sha256 = "1z09bs62hh9hsf88qkbsqp3ydxr66jdpbp9s8c7d142vcinmi3wm"; - revision = "1"; - editedCabalFile = "1p5ks82k2q59z20kc8nk5aj8n7isjnf0wc07lqv1djlalb3cwwy3"; + revision = "2"; + editedCabalFile = "0578hfn6fjjj7iywbicz9vi7aw9si8drmjgbqh79rcv65igjxy5b"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; @@ -227281,8 +227630,8 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; - revision = "5"; - editedCabalFile = "0yz9jfxsrnb5hb694bjgxc7gwl1dw2m54qnm9z9js51fc1kk2ppa"; + revision = "6"; + editedCabalFile = "1ch6icy7m7z7mmr42s7lih99vkgjdy2y78fy19fsgmrafiglp79c"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; @@ -227296,8 +227645,8 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; - revision = "4"; - editedCabalFile = "1jy6qviv8phj2dr79bkrqsaal1xb940hzhynq84vbkgk2szlcwqr"; + revision = "5"; + editedCabalFile = "0v31pb94cn8i5lazmhnzmlaqz73n7sracpjr6dqlijn85nfrzkia"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; @@ -227313,8 +227662,8 @@ self: { pname = "portray-pretty"; version = "0.1.0.3"; sha256 = "08gf384mqsxblxzmhr6ipskvipgbdgx72s3nmdhsld53spg5zhd5"; - revision = "1"; - editedCabalFile = "03r638j282ldxzkpw07l7cnp4kxwh3325bcljkn96hs1l6vy5q4j"; + revision = "2"; + editedCabalFile = "1mfpx3j543i1j7v1kf186r40jg0w4vqs5n29wrnpvl3v8x08jqsv"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework @@ -227333,8 +227682,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.1"; sha256 = "0dzhzrv6xq67sbf6ivisghlx4pq53h3qh859ai5rs6cikg6xfb7b"; - revision = "1"; - editedCabalFile = "1jz8jpi4in8znsgzcb9kcgv2zgrw2v99zkb311wjwrzk7vgjm9b7"; + revision = "2"; + editedCabalFile = "0ys9fxiw0gmg42hy5iqmhjkpkn4mhs1afmwvgqypq4v9w4bdak8s"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -227454,8 +227803,8 @@ self: { }: mkDerivation { pname = "posit"; - version = "3.2.0.4"; - sha256 = "1nr8269q2zqmsvb7zbv8ab56n52ag2q6gdj2mfpn2zn971z5bghs"; + version = "3.2.0.5"; + sha256 = "0xz8njcwjkazd6ap9a0aqgy0ilrpwnclwzy7715c2ngr17w426bw"; libraryHaskellDepends = [ base data-dword deepseq scientific ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base vector weigh ]; @@ -229606,8 +229955,8 @@ self: { }: mkDerivation { pname = "prelate"; - version = "0.5.0.0"; - sha256 = "0cg8qb6p52milhlh7l41y4fsl2jbkzmnv35ri7j13pniv48p3dkk"; + version = "0.5.1.0"; + sha256 = "1hrak2qylnd6dgla0zs9623qnlcyz7lm5mkiw6nqqzh66zn4yxqc"; libraryHaskellDepends = [ aeson base exon extra generic-lens incipit microlens microlens-ghc polysemy-chronos polysemy-conc polysemy-log polysemy-process @@ -231954,8 +232303,8 @@ self: { pname = "profunctors"; version = "5.6.2"; sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; - revision = "2"; - editedCabalFile = "1dhg8bys9qnfbvhy4cm4fivanmnik4rg0spshkwyp9s3j88qadix"; + revision = "3"; + editedCabalFile = "0y2g5dhmvkbd8zsckpgxd1g4hr3g56g0iqi6crjjc8wqd12bly71"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -234497,8 +234846,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.15.7"; - sha256 = "1krjkgmxpfqf5a1jqs7qbg6r7ball1464zw6vgrdfzl9057c6l4f"; + version = "0.15.8"; + sha256 = "1h5d5hjc9hrlk718lf62qzaq1l6ppr0l2b3fl78csyh86cihh750"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236509,32 +236858,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, data-fix, hashable, integer-logarithms, old-time - , OneTuple, primitive, QuickCheck, scientific, splitmix, strict - , tagged, text, text-short, these, time, time-compat, transformers - , transformers-compat, unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.28"; - sha256 = "1jycijv7gaj6qrkp219nllrdv9zd0ifp0mb0rch430fm95xin4f4"; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers data-fix hashable - integer-logarithms old-time OneTuple primitive QuickCheck - scientific splitmix strict tagged text text-short these time - time-compat transformers transformers-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - base containers primitive QuickCheck tagged uuid-types - ]; - benchmarkHaskellDepends = [ base bytestring QuickCheck ]; - description = "Common quickcheck instances"; - license = lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_29_1" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-array-byte, data-fix, hashable , integer-logarithms, old-time, OneTuple, primitive, QuickCheck @@ -236560,7 +236883,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -236604,8 +236926,8 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.0.0.1"; - sha256 = "1x1jza5s1v89ik0h5m3kla5qwgh05j5dbd7f2m2miwyy1b75bqly"; + version = "0.1.0.0"; + sha256 = "19q4h9s1m72vd0yrk7a9ikjik17hcrcnpgy461zw2zkijg68a0sm"; libraryHaskellDepends = [ base containers monoid-subclasses pretty-show QuickCheck quickcheck-classes quickcheck-instances semigroupoids @@ -240558,7 +240880,7 @@ self: { license = lib.licenses.mit; }) {}; - "rebase_1_18" = callPackage + "rebase_1_19" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, deepseq, dlist, either, groups, hashable , invariant, mtl, profunctors, scientific, selective, semigroupoids @@ -240567,8 +240889,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.18"; - sha256 = "07i5kkzwlgbdz1xikhn9smmv3ac65z3xzs1wflxrbf6v9fa77s5y"; + version = "1.19"; + sha256 = "02yvxdvjwb3dlwwb85i0sbadfjqxyv86pxkzylxidpw5qxb2g0ji"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant deepseq dlist either groups hashable invariant mtl profunctors scientific @@ -240689,8 +241011,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.15"; - sha256 = "0avdisbl1faqpny1r6ljm5gb8xz1yghmls7pgs2nshjkxd94i761"; + version = "0.2.16"; + sha256 = "100s5gkpgpcbi5397bbcp10jw1n5i9aniqc8bzk632ihlrip21ic"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -240924,23 +241246,6 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, data-fix - , free, HUnit, template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.2.2.3"; - sha256 = "04233y5qw7vm0kyh4h44zpfk2zsd6kz9081ngvi098y0xiphrwm9"; - libraryHaskellDepends = [ - base base-orphans comonad containers data-fix free template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = lib.licenses.bsd2; - }) {}; - - "recursion-schemes_5_2_2_4" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, data-fix , free, HUnit, template-haskell, th-abstraction, transformers }: @@ -240948,6 +241253,8 @@ self: { pname = "recursion-schemes"; version = "5.2.2.4"; sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; + revision = "1"; + editedCabalFile = "1sb3pc1z40ss6rmiqifhcawiw1qdxc1mahcbwgfsfvpxlbmzlrrb"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -240955,7 +241262,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -241412,8 +241718,8 @@ self: { pname = "reducers"; version = "3.12.4"; sha256 = "0hsycdir52jdijnnvc77jj971fjrrc722v952wr62ivrvx2zarn0"; - revision = "2"; - editedCabalFile = "1ji6rp0f857d0vp2kjqcck7avrjgqvqjgwnhdcxs3zbjkwpqyhfb"; + revision = "3"; + editedCabalFile = "00xd4pyg0p4z0alyg1zy193jc3smq50y73dkafiphd73rzszxy9g"; libraryHaskellDepends = [ array base bytestring containers fingertree hashable semigroupoids text transformers unordered-containers @@ -241690,23 +241996,6 @@ self: { }) {}; "reflection" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-discover - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "reflection"; - version = "2.1.6"; - sha256 = "1kd6dgnp99dzbkxdnj01g81j03v7zq5cwg0sf19rlcmvgs8i8gmz"; - revision = "1"; - editedCabalFile = "1bnpkfmagii4mc8258yjy4f4lykflmljkqcifnxpfqv99bszw6pl"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Reifies arbitrary terms into types that can be reflected back into terms"; - license = lib.licenses.bsd3; - }) {}; - - "reflection_2_1_7" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , QuickCheck, template-haskell }: @@ -241719,7 +242008,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reifies arbitrary terms into types that can be reflected back into terms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "reflection-extras" = callPackage @@ -245563,12 +245851,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_18" = callPackage + "rerebase_1_19" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.18"; - sha256 = "1y5xklpm2l92wfa1h4h5s78hks36n79b1ncvr46ljf545gywmp4m"; + version = "1.19"; + sha256 = "0lb84apgwxswx4y1k3n9l335qzzby96mcpsjlzfw116b3ayd3123"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -247137,8 +247425,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "rhythmic-sequences"; - version = "0.1.3.0"; - sha256 = "1m74z445zjfimc8b7ga9y1jyp8v2hrirpd2ynh89dz6iwxbbkq5k"; + version = "0.2.1.0"; + sha256 = "0jgnz69h1xbv6dqgqnx71cslbs4g453n9gffvsdpqf4vhbacbzws"; libraryHaskellDepends = [ base ]; description = "Library to deal with rhythmicity of short sequences"; license = lib.licenses.mit; @@ -248009,8 +248297,8 @@ self: { pname = "rle"; version = "0.1.0.1"; sha256 = "05rbhm0lxrq7vdbq9s0q21m0f0hlzmknljmampcmdjnwbl4nvf3d"; - revision = "4"; - editedCabalFile = "10spdlsywcfljy0fxygd3ny0bw8g6icny9ymcbyvmvpihswqz7wi"; + revision = "5"; + editedCabalFile = "15y82cbg9pk9pf7jwiqi83gici1y6619vb67bbp8vkds40nnvrrx"; libraryHaskellDepends = [ base cereal deepseq portray portray-diff wrapped ]; @@ -250193,10 +250481,8 @@ self: { }: mkDerivation { pname = "rustls"; - version = "0.0.0.0"; - sha256 = "1j7qxmapz9znmbd02359qxbsh1pkprzcg2jjpsz80kfyb6bjj766"; - revision = "1"; - editedCabalFile = "18jh00sbyixqjm2y6048f83qpqq4jlbzrik5i62is93rmn4pnnc2"; + version = "0.0.1.0"; + sha256 = "0dx5swy6s2rsgb3ahpzwscmw9i50mnvmch0vxvirbi70inalvnj5"; libraryHaskellDepends = [ base bytestring derive-storable derive-storable-plugin network resourcet text transformers @@ -253150,8 +253436,8 @@ self: { pname = "scientific"; version = "0.3.7.0"; sha256 = "1aa3ngb71l2sh1x2829napnr1w285q0sn2f7z2wvi3ynng2238d3"; - revision = "4"; - editedCabalFile = "0667wh94s1sibpp7i7gkcys4b2lc6mwyza11ijaqbbv2gw51liap"; + revision = "5"; + editedCabalFile = "149d776lnss2ggsv3qpsdbx1vvi57m2q2401d19k8fln0s8i1n16"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-logarithms primitive template-haskell text @@ -255005,12 +255291,14 @@ self: { license = lib.licenses.mit; }) {}; - "selective_0_6" = callPackage + "selective_0_7" = callPackage ({ mkDerivation, base, containers, QuickCheck, transformers }: mkDerivation { pname = "selective"; - version = "0.6"; - sha256 = "0fkwlrydg2whz54l816ayj4szg3m2nkkxq191dlqw9vwn4rjwx0q"; + version = "0.7"; + sha256 = "0dhwfhfp57fmg86h5hkizchnk94zdgbpxxfv0r3xp65a7aq546fg"; + revision = "1"; + editedCabalFile = "0ibky7kzs4rc0dz1m2116fb6q4ziwrb49vjbhfy6ns1qb205ag8f"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers QuickCheck transformers ]; description = "Selective applicative functors"; @@ -255311,6 +255599,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "semigroupoids_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, foldable1-classes-compat + , hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "6"; + sha256 = "1rwnckhmn3h4rws3lps5kgy6dv3raqf08jk7hlbv7468kcbx3amn"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive foldable1-classes-compat hashable tagged + template-haskell transformers transformers-compat + unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -256084,8 +256393,8 @@ self: { pname = "serialise"; version = "0.2.6.0"; sha256 = "05m5h5vfjp4wvh6y7j2f3d4c3l6gxww2n1v38vqrjacpw641izwk"; - revision = "1"; - editedCabalFile = "0rlsi4jq2d1dak2fps5flcn27lywjlhvsi0x2k2lvnjqawnfb3f9"; + revision = "2"; + editedCabalFile = "0ng4gjxwv2arm1ybqkfl66p1lmcwacym8ygi6nnkygysgchwqa3b"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -257265,8 +257574,8 @@ self: { pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; - revision = "5"; - editedCabalFile = "1qjj2v95k800j9w8drc4fjcbazzdh2f7dl7s99g9r48dg9dk5cfz"; + revision = "6"; + editedCabalFile = "1sds0r9g9fjvf4g8sfwkn80hbsy1pjc4wpbimrk4adb4584wlg1m"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -261701,10 +262010,8 @@ self: { }: mkDerivation { pname = "short-vec"; - version = "0.1.0.0"; - sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "8"; - editedCabalFile = "1wvgdav62yixqarv0vlgwhfry7w6vb5z9w9y5330nbf6f286fqfj"; + version = "0.1.0.1"; + sha256 = "0vgdfpj40zlg32hxpp66fl2fa2srqk30i61va49409s733hrbq8l"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -261735,8 +262042,8 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; - revision = "3"; - editedCabalFile = "0vk9nzhk7bipvd09ww7j79xxkjffddprhgdybd8ins8fg6rcxlxx"; + revision = "4"; + editedCabalFile = "1aajdqvh7jb1rdf5j7p70z2v1n8mvdk78qyshv1v4632a91pi4rx"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; @@ -263908,8 +264215,8 @@ self: { pname = "singleton-nats"; version = "0.4.6"; sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; - revision = "1"; - editedCabalFile = "0xgm43p5l9m80anc8qfxr9vdni3iphnkn8d3x3q6nqz7gjq5hypj"; + revision = "2"; + editedCabalFile = "044gxxa9j076p1g4vca4j8w5brx2qg5yqdvqjvmz6fv5kms4b8jd"; libraryHaskellDepends = [ base singletons singletons-base ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = lib.licenses.bsd3; @@ -263948,6 +264255,8 @@ self: { pname = "singletons"; version = "3.0.2"; sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; + revision = "1"; + editedCabalFile = "1lp2qr5vwgr7qh0dwwa5fqz6rflx8hm6z7yyshqkmc2mn30fxhiy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Basic singleton types and definitions"; @@ -263979,15 +264288,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_1_1" = callPackage + "singletons-base_3_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.1.1"; - sha256 = "0d32c1dmi8mlrli0927g3hy6gip4c9w0myza3x594nlb6cnwdj6f"; + version = "3.2"; + sha256 = "0m96dz9k5wls5m3vls65clws1yfd73skblv878yj06lw9nmwshy9"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -264057,14 +264366,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_1_1" = callPackage + "singletons-th_3_2" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.1.1"; - sha256 = "1bp9abhbk6ad27p0ksqx2nhrkp6r9dgx20dzyl3bq1zf6nz92ss6"; + version = "3.2"; + sha256 = "1r4m9h9wwq86lww3aq7jxzias78ix79kgnj24slaps848d7hhpkp"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -264130,8 +264439,8 @@ self: { pname = "sint"; version = "0.2.0"; sha256 = "108za6vamb75kd6s2m0iin1gk6b1azk11jzsj841r7j62rhjn1qx"; - revision = "3"; - editedCabalFile = "1jmy1na42y5mbq4gbk7bb2ny81si903l9wj4j0wvckbqllv3xqim"; + revision = "5"; + editedCabalFile = "0jwd4ky1ydfzrjb8h922v273mw0wpriacvsyqkcad5kmwysayjlw"; libraryHaskellDepends = [ base portray portray-diff ]; testHaskellDepends = [ base portray portray-diff QuickCheck test-framework @@ -264658,8 +264967,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.7"; - sha256 = "02yyiplcdjad3dzcv7x4npj5h93q756ck892kdhzdrm9qbr96z66"; + version = "1.0.8"; + sha256 = "09gn0bkia7rnhbbbh2a4qdbwmq1yjn67f8wfclv78fqia82b84yg"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -264902,8 +265211,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.2"; - sha256 = "06gvc5d23aiah5yq4b9gks7x26iz6xcx0k4mfsmjv5v2ic2zrbzb"; + version = "1.0.3"; + sha256 = "04a0qh451nwkrmgi9a6vda0zpyq8q0jhm80ppfcyrdgr0wh7mhi6"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -268756,15 +269065,15 @@ self: { }) {}; "sorting-network" = callPackage - ({ mkDerivation, base, criterion, hspec, mwc-random, QuickCheck - , template-haskell, vector + ({ mkDerivation, base, criterion, hspec, mwc-random, primitive + , QuickCheck, template-haskell, vector }: mkDerivation { pname = "sorting-network"; - version = "0.1.0.0"; - sha256 = "1rrihqjrj4jnh3950illxb6yva092cz86xkhmr5p34wzpbz1vrpx"; - libraryHaskellDepends = [ base template-haskell vector ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "0.2.1.0"; + sha256 = "1x4g4y4d1568v5fwz25r3n1ksagwrb56a57iy7ybp70b0v01c2cw"; + libraryHaskellDepends = [ base primitive template-haskell vector ]; + testHaskellDepends = [ base hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion mwc-random ]; description = "Sort small lists with sorting network"; license = lib.licenses.asl20; @@ -269518,6 +269827,24 @@ self: { }) {}; "spatial-math" = callPackage + ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens + , linear, QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "spatial-math"; + version = "0.2.7.0"; + sha256 = "0n98mpcr4s1c1p00mn04m7izffphsgzja2mins0lzgcycgckc1m4"; + libraryHaskellDepends = [ + base binary cereal ghc-prim lens linear + ]; + testHaskellDepends = [ + base doctest QuickCheck test-framework test-framework-quickcheck2 + ]; + description = "3d math including quaternions/euler angles/dcms and utility functions"; + license = lib.licenses.bsd3; + }) {}; + + "spatial-math_0_5_0_1" = callPackage ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens , linear, QuickCheck, test-framework, test-framework-quickcheck2 , TypeCompose @@ -270616,6 +270943,34 @@ self: { broken = true; }) {}; + "sqel" = callPackage + ({ mkDerivation, aeson, base, chronos, composition, containers + , contravariant, exon, extra, first-class-families, generic-lens + , generics-sop, hasql, hedgehog, incipit-base, invariant, microlens + , path, path-io, prettyprinter, scientific, singletons + , singletons-base, some, tasty, tasty-hedgehog, template-haskell + , time, transformers, type-errors, uuid, vector + }: + mkDerivation { + pname = "sqel"; + version = "0.0.1.0"; + sha256 = "0793yqrbja3vwljrrlavz0ypv85d4vj2gw7crgchkzkg5qys8qnv"; + libraryHaskellDepends = [ + aeson base chronos composition containers contravariant exon extra + first-class-families generic-lens generics-sop hasql incipit-base + invariant microlens path path-io prettyprinter scientific + singletons singletons-base some template-haskell time transformers + type-errors uuid vector + ]; + testHaskellDepends = [ + base exon generics-sop hedgehog incipit-base microlens tasty + tasty-hedgehog + ]; + description = "Guided derivation for Hasql statements"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sql-simple" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, text , transformers, transformers-base @@ -272542,13 +272897,13 @@ self: { , conduit, containers, envparse, errors, exceptions, extra , filepath, Glob, hspec, lens, lens-aeson, monad-logger, mtl , optparse-applicative, QuickCheck, resourcet, rio, semigroups - , text, time, unliftio, unliftio-core, unordered-containers, uuid - , yaml + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, uuid, yaml }: mkDerivation { pname = "stackctl"; - version = "1.4.0.0"; - sha256 = "1w435rqmgcfxqddjds8bgzkbily97ga6hjhs0cbk15yjm0xswv08"; + version = "1.4.0.1"; + sha256 = "01lm870d7xji00kk15r025hxpwldqc2l03xj09bclix75yq6fsvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272557,7 +272912,7 @@ self: { bytestring cfn-flip conduit containers envparse errors exceptions extra filepath Glob lens lens-aeson monad-logger mtl optparse-applicative QuickCheck resourcet rio semigroups text time - unliftio unliftio-core unordered-containers uuid yaml + transformers unliftio unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -273839,19 +274194,19 @@ self: { "stm-containers" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable - , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt - , transformers + , list-t, quickcheck-instances, rerebase, stm-hamt, tasty + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "stm-containers"; - version = "1.2"; - sha256 = "0yhpnxj7v880fy7vgjz5idpqfg2sm4dflp13k7fs0bqqlfv9hkbc"; + version = "1.2.0.2"; + sha256 = "191yh7whd9x6vjn58saac8nq6rsi7fjq147nbmfmn3kfnxqgabdd"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; testHaskellDepends = [ - deferred-folds focus foldl free HTF list-t QuickCheck - quickcheck-text rerebase + deferred-folds focus foldl free list-t quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck ]; description = "Containers for STM"; license = lib.licenses.mit; @@ -275571,6 +275926,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "streams_3_3_2" = callPackage + ({ mkDerivation, adjunctions, base, boring, comonad, distributive + , semigroupoids + }: + mkDerivation { + pname = "streams"; + version = "3.3.2"; + sha256 = "0m3ilic3m1xb6sq8mp227jy75sxmla3gbdkxfh5mmf0lgsqvyh5d"; + libraryHaskellDepends = [ + adjunctions base boring comonad distributive semigroupoids + ]; + description = "Various Haskell 2010 stream comonads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streamt" = callPackage ({ mkDerivation, async, base, criterion, hspec, logict, mtl, tasty , tasty-hunit @@ -277567,8 +277938,8 @@ self: { pname = "successors"; version = "0.1.0.3"; sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv"; - revision = "1"; - editedCabalFile = "10vsqfgpzrc1mr27956s0r84hy37vz2dvq7klskn74qisnhv52kz"; + revision = "2"; + editedCabalFile = "1w1k6rj9rpnx3ykkfm7k3pk87v5v77ah04rgq31cgxfzdnirik9y"; libraryHaskellDepends = [ base ]; description = "An applicative functor to manage successors"; license = lib.licenses.mit; @@ -278222,10 +278593,8 @@ self: { ({ mkDerivation, base, supply-chain-core }: mkDerivation { pname = "supply-chain"; - version = "0.0.0.1"; - sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; - revision = "1"; - editedCabalFile = "1nnc5k8fp5bd5na9sd9qk5cbra2zjjmddxcn4qs1ahw4lxfy9gxx"; + version = "0.0.1.0"; + sha256 = "0awmvfk9nx5bazgq76l4x6f0xh3paijmjp58bn4b00fv5ps0wkgr"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; @@ -278251,8 +278620,8 @@ self: { pname = "supply-next"; version = "0.0.1.2"; sha256 = "110j4ppkw155hdlz00wbzc9z3m0mqf4dl6pqcaigcqg624m0ppqk"; - revision = "2"; - editedCabalFile = "1amw867flf8260zmrr0wyd50mri60641smqdb1blmc0knwdydlqd"; + revision = "4"; + editedCabalFile = "02hbwyfw1lzcxgp8qh9fv07k9q0frc1inz1y6dd8gw021vr92n58"; libraryHaskellDepends = [ base gambler integer-types quaalude supply-chain transformers ]; @@ -278950,6 +279319,33 @@ self: { mainProgram = "Swish"; }) {}; + "swish_0_10_4_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, polyparse, semigroups + , test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.4.0"; + sha256 = "0p5xs17lzgsqgwnpglqav89ysnaagz532lz279cr7pyl3i5z2zdw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = lib.licenses.lgpl21Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "Swish"; + }) {}; + "swiss" = callPackage ({ mkDerivation, base, bytestring, parallel, time }: mkDerivation { @@ -281555,6 +281951,8 @@ self: { pname = "tagged-transformer"; version = "0.8.2"; sha256 = "10wlwqxzm1xdyzxl6xyfsrb40zmvh7g0y3w0a69b1lw2rp6v4vyy"; + revision = "1"; + editedCabalFile = "01x7c98ag7wnmgyz7zkzz5109fp15v03lbkybp87x1zxlwh1rqg1"; libraryHaskellDepends = [ base comonad contravariant distributive exceptions mtl reflection semigroupoids tagged @@ -282495,8 +282893,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.6.0.4"; - sha256 = "0m6h0ra868n7azxdj00sbhv2i9r5wr5rs10cyrzda7ss5n94aq8v"; + version = "0.6.0.5"; + sha256 = "1xyf6dd5npiypp6z7zs31vc9bsid4jm12lh4p415909vwfyp1c04"; libraryHaskellDepends = [ aeson base bytestring containers process random text time uuid ]; @@ -284190,7 +284588,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "telegram-bot-simple_0_10" = callPackage + "telegram-bot-simple_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant @@ -284200,8 +284598,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.10"; - sha256 = "1xkmmcxnv052hfc0bwr3w6ilrf173npdpc0v5pwrhkz0kd88xxvh"; + version = "0.11"; + sha256 = "0fsyd21dcbf5nx1a7pavl678yfnwkhy6502f88zl0sp7xpz8x38h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285777,6 +286175,8 @@ self: { pname = "test-framework-th-prime"; version = "0.0.10"; sha256 = "1x3iq4dqbnhb96rfzs7awdk5v2arr3fi3jgkkhnn4vjz43ixygg8"; + revision = "1"; + editedCabalFile = "0fhr4i69yb2d1rw7fg4q862x3s2f05q8kr3lvhx0zyijbs17g1vg"; libraryHaskellDepends = [ base cpphs haskell-src-exts template-haskell test-framework ]; @@ -287097,8 +287497,8 @@ self: { pname = "text-short"; version = "0.1.5"; sha256 = "1nid00c1rg5c1z7l9mwk3f2izc2sps2mip2hl30q985dwb6wcpm3"; - revision = "1"; - editedCabalFile = "0gmmwwchy9312kz8kr5jhiamqrnjqxdqg1wkrww4289yfj1p7dzb"; + revision = "2"; + editedCabalFile = "0lkh1sl8vx11vjjkxs2fz3jmmw1fp1f2k74q2acz6nywi4ifp5n2"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable template-haskell text @@ -287121,8 +287521,10 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.10"; - sha256 = "1iq24lpy59c8wc62ss4bwsaks6wlcr73c8vdyd2xha2p4fswmfyf"; + version = "3.10.2"; + sha256 = "00vpyf753322fad02phkhc5njc3l2pnmw12lhyq67vganspsyd4w"; + revision = "2"; + editedCabalFile = "1scjd7gcl3kwv214hyyz6pppy8i46nigvy22945pi89n3ga0fqaz"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -287141,37 +287543,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_10_1" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, QuickCheck, quickcheck-instances - , template-haskell, text, th-abstraction, th-lift, transformers - , transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.10.1"; - sha256 = "1big5iflll2zijzfvnlyni91ir157iwyq08kpmk96qsgwdmxdkca"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - template-haskell text th-abstraction th-lift transformers - transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -287183,8 +287554,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.4"; - sha256 = "154smhpc3l2h1iacdsywzirkv19w493yajhsiqg9pqmmiii7kwr5"; + version = "3.9.5"; + sha256 = "0i91yil7qlk0vv242prs178lvddzlzhh9d78lnmvyvalqrw7bib8"; libraryHaskellDepends = [ aeson base base-compat bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -287665,6 +288036,8 @@ self: { pname = "th-compat"; version = "0.1.4"; sha256 = "1f5ssi24mnhmmi91dl5ddg2jwci6akwlznqggf56nyxl9b0pmyfq"; + revision = "2"; + editedCabalFile = "0c0p2qy78cwhdfw0hn8g16l5xidikdk5314gam4258pk7q47rbp5"; libraryHaskellDepends = [ base directory filepath template-haskell ]; @@ -287756,25 +288129,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_14" = callPackage + "th-desugar_1_15" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction - , th-lift, th-orphans, transformers-compat + , th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.14"; - sha256 = "1b57v15xx0z0xjlijv61dh07p6rvfkdpxnxiaaa1iv7zyg2x7cnz"; - revision = "2"; - editedCabalFile = "16i6x4w286mhhkxzjid5pfbnn51dzyxq6brawlppqb15qbnvs744"; + version = "1.15"; + sha256 = "167ybxp9233xlihmj28hmqmd82liyhjgl17310nn9bximgfjr7hp"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb - template-haskell th-abstraction th-lift th-orphans - transformers-compat + template-haskell th-abstraction th-orphans transformers-compat ]; testHaskellDepends = [ base containers hspec HUnit mtl syb template-haskell th-abstraction - th-lift th-orphans + th-orphans ]; description = "Functions to desugar Template Haskell"; license = lib.licenses.bsd3; @@ -288001,23 +288371,6 @@ self: { }) {}; "th-lift" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.8.2"; - sha256 = "1r2wrnrn6qwy6ysyfnlqn6xbfckw0b22h8n00pk67bhhg81jfn9s"; - revision = "2"; - editedCabalFile = "1s95i774zy3q8yzk18ygdzhzky6wfcr7g55hd2g8h8lc05xzcdgi"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = lib.licenses.bsd3; - }) {}; - - "th-lift_0_8_3" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction }: mkDerivation { @@ -288030,7 +288383,6 @@ self: { testHaskellDepends = [ base ghc-prim template-haskell ]; description = "Derive Template Haskell's Lift class for datatypes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-lift-instances" = callPackage @@ -288073,6 +288425,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; + revision = "1"; + editedCabalFile = "1lb3gi32gzy6ml8jxzyj6jp9gglgg2737aqc128gqz4g7wvbnasy"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -288650,6 +289004,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simplified implementation of Erlang/OTP like supervisor over thread"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "thread-utils-context" = callPackage @@ -289290,17 +289646,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "tidal_1_9_3" = callPackage + "tidal_1_9_4" = callPackage ({ mkDerivation, base, bytestring, clock, colour, containers , criterion, deepseq, exceptions, hosc, microspec, mtl, network , parsec, primitive, random, text, tidal-link, transformers, weigh }: mkDerivation { pname = "tidal"; - version = "1.9.3"; - sha256 = "1p3k65rgxjv701nk30jqf614bk1zmblyq0vlishzza2cdld5rhbc"; - revision = "1"; - editedCabalFile = "0lxx3zb26winf19wl44bs4bqrac1r4yf1j5i77bhnqgwrap426j1"; + version = "1.9.4"; + sha256 = "126p05lqlq8q03gdhqq378dirs5imfkk9csaf797jz1j6lcwbnv1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clock colour containers deepseq exceptions hosc mtl @@ -289588,8 +289942,8 @@ self: { pname = "time-compat"; version = "1.9.6.1"; sha256 = "103b3vpn277kkccv6jv54b2wpi5c00mpb01ndl9w4y4nxc0bn1xd"; - revision = "4"; - editedCabalFile = "1n39yfk21xz8y1xvkh01651yysk2zp5qac22l5pq2hi7scczmxaw"; + revision = "5"; + editedCabalFile = "0ryv5p2hgq5a6iyvh2r30sdlr7jn70cw8ypw5sc0hwbb1pxf2kfx"; libraryHaskellDepends = [ base base-orphans deepseq hashable time ]; @@ -296367,8 +296721,8 @@ self: { pname = "type-equality"; version = "1"; sha256 = "1s4cl11rvvv7n95i3pq9lmmx08kwh4z7l3d1hbv4wi8il81baa27"; - revision = "4"; - editedCabalFile = "0sajw67mmk5syhbrwx4bz82j5cjhm04n4kjl0pp3dnphxg1m5nbw"; + revision = "5"; + editedCabalFile = "0mhvj82l6nvxz3majr7kza4j7nxi0rqjx0ci8m1s9abkcirhcq2m"; libraryHaskellDepends = [ base ]; description = "Data.Type.Equality compat package"; license = lib.licenses.bsd3; @@ -297195,25 +297549,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.10.1"; - sha256 = "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_11_0" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -297230,7 +297565,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -297402,8 +297736,8 @@ self: { }: mkDerivation { pname = "typelet"; - version = "0.1.2"; - sha256 = "09vxpwiz3hf876a5ymwvcq2n5dcxkzpna5srdk817051m715ys99"; + version = "0.1.3"; + sha256 = "03igpnkrb5kxkjhlab8w6fpnbjv6xzc7mv8rczs1y8w3d7biz3r0"; libraryHaskellDepends = [ base containers ghc ghc-tcplugin-api ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; @@ -299309,25 +299643,31 @@ self: { }) {}; "uniform-algebras" = callPackage - ({ mkDerivation, base, numeric-prelude, test-invariant }: + ({ mkDerivation, base, extra, numeric-prelude, test-invariant }: mkDerivation { pname = "uniform-algebras"; - version = "0.1.3"; - sha256 = "0y5x89qkbmzda4xxmg9zdk573vjz89h8iqia8p555cmachf18lf7"; - libraryHaskellDepends = [ base numeric-prelude test-invariant ]; + version = "0.1.5.1"; + sha256 = "0z3kb1s02iqgwfax7mifb0xdd7ys1xin7fjzh0gpj5693yi0zcp6"; + libraryHaskellDepends = [ + base extra numeric-prelude test-invariant + ]; description = "Pointless functions and a simplistic zero and monoid"; license = lib.licenses.gpl2Only; }) {}; "uniform-error" = callPackage - ({ mkDerivation, base, HTF, safe, transformers, uniform-strings }: + ({ mkDerivation, base, data-default, HTF, safe, transformers + , uniform-strings + }: mkDerivation { pname = "uniform-error"; - version = "0.1.3.1"; - sha256 = "1gq3n9rjar3waddvs7w91y2wy2l2fqdqssd1bz2z2bvb27inggaf"; - libraryHaskellDepends = [ base safe transformers uniform-strings ]; + version = "0.1.5.1"; + sha256 = "0fj8p4s5np1irc7j7i39a1i8a94bp1cjf9nqng74x6nwj139hs4i"; + libraryHaskellDepends = [ + base data-default safe transformers uniform-strings + ]; testHaskellDepends = [ - base HTF safe transformers uniform-strings + base data-default HTF safe transformers uniform-strings ]; description = "Handling errors in the uniform framework"; license = lib.licenses.gpl2Only; @@ -299341,8 +299681,8 @@ self: { }: mkDerivation { pname = "uniform-fileio"; - version = "0.1.3"; - sha256 = "08drclzs1g7w2cqsa16izs2nxa4pdkz5v1c2qbkwl03in9ga9v1v"; + version = "0.1.5.1"; + sha256 = "1y92wxzgnj25v06mlx3a6dhkqxhbdr4d6dxa71n9g04zzcp2ghk6"; libraryHaskellDepends = [ base bytestring deepseq directory exceptions filepath monads-tf path path-io pipes pureMD5 safe text uniform-algebras uniform-error @@ -299401,8 +299741,8 @@ self: { }: mkDerivation { pname = "uniform-strings"; - version = "0.1.3.1"; - sha256 = "1bh0n41sn0sgss85r890n2lysnb33xkf1qqxhs9498pd7gjzk5q7"; + version = "0.1.5.1"; + sha256 = "0cqx5cd1cpkqnw2pka8znllwn7wsn42rjrd0zx00rbnzskpnidk9"; libraryHaskellDepends = [ base bytestring MissingH monads-tf network-uri pretty-show safe snap-core split text uniform-algebras @@ -299422,8 +299762,8 @@ self: { }: mkDerivation { pname = "uniform-time"; - version = "0.1.3"; - sha256 = "0lygmp71933gdnydqg6p8gdnwvzh25p8dkx3jwvc3c0nh4jb1j9d"; + version = "0.1.5.1"; + sha256 = "0ynw0aw1ipy5bxzlkarb999gw94aw6vp1ajmdn7bv43qk5yb8rlm"; libraryHaskellDepends = [ base convertible monads-tf time uniform-algebras uniform-error uniform-strings @@ -299438,8 +299778,8 @@ self: { }: mkDerivation { pname = "uniformBase"; - version = "0.1.4"; - sha256 = "1j2fra8p5svb2g9fl86innfghvkvcdqa7dy2w0nszi0lvn5hf86h"; + version = "0.1.5.1"; + sha256 = "0nxz5c28jjfnfcx4dwl1kk6vpkz1yzhhfxd73457xxfc3z7sfg82"; libraryHaskellDepends = [ base data-default uniform-algebras uniform-error uniform-fileio uniform-strings uniform-time @@ -300501,32 +300841,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck - , safe-exceptions, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.23.0"; - sha256 = "1zg4ddi4z85550abw9ijycbbjg8ddig7r0vcma8ik03dxzga71id"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process - safe-exceptions stm time transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck safe-exceptions stm time transformers unix - unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process - safe-exceptions stm time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_24_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck , safe-exceptions, stm, time, transformers, unix, unliftio-core @@ -300550,7 +300864,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -300712,8 +301025,8 @@ self: { pname = "unordered-containers"; version = "0.2.19.1"; sha256 = "1li8s6qw8mgv6a7011y7hg0cn2nllv2g9sr9c1xb48nmw32vw9qv"; - revision = "1"; - editedCabalFile = "0fcax3apnpxxy9maymclr6s2b4c28d3pkl3plbg0lv1mn0mh84fv"; + revision = "2"; + editedCabalFile = "005avgikg676gc2pw1sqia61nypx2wajdqghsjqkfg4i5qn9gn4s"; libraryHaskellDepends = [ base deepseq hashable template-haskell ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit nothunks QuickCheck @@ -303008,8 +303321,8 @@ self: { }: mkDerivation { pname = "validation-selective"; - version = "0.1.0.2"; - sha256 = "1gsvcm8gjp8kdfprd1i4h9si8f2ym1gj3hqfwz7x1ylsa8qxwvq1"; + version = "0.2.0.0"; + sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -303955,8 +304268,8 @@ self: { pname = "vector-algorithms"; version = "0.9.0.1"; sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "1"; - editedCabalFile = "1bma0m4g7770y4xnqsinspqkgf4swpdwddfbcby81szjxd8mik1l"; + revision = "2"; + editedCabalFile = "081adj7krcfv2i0cmy6k59jcp2f9j7ywl5r1fvglxa99amlwdrgk"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -309113,8 +309426,8 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.10.0"; - sha256 = "02fm2bi0gd9nh9kp8a00d66b2g8fzgw9rjawydbifr0g3c3pv7v0"; + version = "0.10.1"; + sha256 = "13x2fjq9d6pg89gfc127ipjnkaxza5qbvrym5k5wwpcj11l94mac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310530,8 +310843,8 @@ self: { }: mkDerivation { pname = "weierstrass-functions"; - version = "0.1.0.0"; - sha256 = "03xh01zj60hhpq90amv1yml1cch38gni1zvgaji20wrhm17mjmpk"; + version = "0.1.1.0"; + sha256 = "06iv19jnpy6za5lbskv1d5xvaic89p2j27nk64zqbsr6syxkc0gx"; libraryHaskellDepends = [ base elliptic-integrals gamma jacobi-theta ]; @@ -311195,6 +311508,20 @@ self: { broken = true; }) {dnsapi = null;}; + "window-utils" = callPackage + ({ mkDerivation, base, bytestring, JuicyPixels, text, vector, X11 + }: + mkDerivation { + pname = "window-utils"; + version = "0.2.0.0"; + sha256 = "1m1yyk26rg0abjzzwc0cnv9i0w2m1hnpc57gc8vm270is3iassq5"; + libraryHaskellDepends = [ + base bytestring JuicyPixels text vector X11 + ]; + description = "OS window icon/name utilities"; + license = lib.licenses.bsd3; + }) {}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -311492,8 +311819,8 @@ self: { pname = "witherable"; version = "0.4.2"; sha256 = "0121ic4xkv3k568j23zp22a5lrv0k11h94fq7cbijd18fjr2n3br"; - revision = "3"; - editedCabalFile = "1f2bvl41by904lnr0dk6qgasqwadq2w48l7fj51bp2h8bqbkdjyc"; + revision = "4"; + editedCabalFile = "1f6kb8cslgqq4x3mbg1gcxfbd9qb5a8hmrv802mm7zzhbnridiff"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -312189,8 +312516,8 @@ self: { }: mkDerivation { pname = "wordpass"; - version = "1.0.0.10"; - sha256 = "1zq4h91pjk816r4ryvajgbk03wdp74f2nizgvyv3nnj50597wlzm"; + version = "1.0.0.11"; + sha256 = "0v277pp1vh8p7z7wkzqaskrqrbfxpnvish9nw3bkahrvkrr8p23l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312492,8 +312819,8 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; - revision = "4"; - editedCabalFile = "103b654pm0figxqjb6bchi975q2rf0r7y2zhygic86j2089k3fcl"; + revision = "5"; + editedCabalFile = "15h2s7flixws54mv8kxbl17jvp0qfqjflg0fn6iwb8yf4qn96pfa"; libraryHaskellDepends = [ base ]; description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; @@ -312621,8 +312948,8 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.3.3"; - sha256 = "0zv51048p0r7vhamml3ps9nr11yi9fxz2w31qcz053bw3z9ivwxw"; + version = "0.5.4.0"; + sha256 = "0wf4ia9zr6wmw9kvn5fhv3gr0h5247nz889j8rhamfgab9yn2a65"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -314405,8 +314732,8 @@ self: { }: mkDerivation { pname = "xml-conduit-selectors"; - version = "0.2.0.0"; - sha256 = "1h1gfnsrypy9w559rgbgabidzpaw580xy0m6l12bbcjc92kr3mf0"; + version = "0.2.0.2"; + sha256 = "1xps46nqi0g42b0hz703cdw98zy8phvzjhrg0i7ljh12sp4ijjnj"; libraryHaskellDepends = [ base containers megaparsec text xml-conduit ]; @@ -316671,15 +316998,15 @@ self: { "yaml-unscrambler" = callPackage ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time , base, base64-bytestring, bytestring, conduit, containers, foldl - , hashable, libyaml, mtl, neat-interpolation, QuickCheck - , quickcheck-instances, rerebase, scientific, selective, tasty - , tasty-hunit, tasty-quickcheck, text, text-builder-dev, time - , transformers, unordered-containers, uuid, vector, yaml + , hashable, libyaml, mtl, neat-interpolation, quickcheck-instances + , rerebase, scientific, selective, tasty, tasty-hunit, text + , text-builder-dev, time, transformers, unordered-containers, uuid + , vector, yaml }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.13"; - sha256 = "0c7cnxlx01xjr992z0150dl1lnlyj2gwrqza7yhgmn4m7wg6r5z1"; + version = "0.1.0.16"; + sha256 = "06swbd8zi2ykjkxyd6vqza028wqdl1w0rv5wh87pm6p95rklwbgw"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64-bytestring bytestring conduit containers foldl hashable @@ -316687,11 +317014,13 @@ self: { transformers unordered-containers uuid vector yaml ]; testHaskellDepends = [ - foldl neat-interpolation QuickCheck quickcheck-instances rerebase - tasty tasty-hunit tasty-quickcheck + foldl neat-interpolation quickcheck-instances rerebase tasty + tasty-hunit ]; description = "Flexible declarative YAML parsing toolkit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yaml2owl" = callPackage @@ -320956,8 +321285,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.7"; - sha256 = "1ss7p1wzcxiap8zm3i6hqllkd0hkrp6bgk4magbaxpy7ic9kifb9"; + version = "1.0.8"; + sha256 = "1g1ikkwnybn02yfawfly9bgbfv4cx5ciqhq3xx3z023p4j1g7rcz"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -321228,6 +321557,24 @@ self: { broken = true; }) {}; + "zeugma" = callPackage + ({ mkDerivation, chronos, hedgehog, incipit, polysemy + , polysemy-chronos, polysemy-test, tasty, tasty-expected-failure + , tasty-hedgehog, unix + }: + mkDerivation { + pname = "zeugma"; + version = "0.7.0.0"; + sha256 = "1przsd9f0bhjygyczdlclpvw62a4hz1vq721fh2gq0ic8r3vs602"; + libraryHaskellDepends = [ + chronos hedgehog incipit polysemy polysemy-chronos polysemy-test + tasty tasty-expected-failure tasty-hedgehog unix + ]; + description = "Polysemy effects for testing"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "zifter" = callPackage ({ mkDerivation, ansi-terminal, async, base, colour, directory , exceptions, filepath, genvalidity, genvalidity-hspec @@ -321478,8 +321825,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.4.2.2"; - sha256 = "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4"; + version = "0.4.3"; + sha256 = "01ax0idyvggizbdbg38nynmm5dk53apsjbj2xaq8v11ry6h0y1b8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -321631,6 +321978,8 @@ self: { pname = "zippers"; version = "0.3.2"; sha256 = "0n85mnp3mv8qwk3wmmm2wpc3j2l4q2fb0gbzb5il3nrd0p42xjld"; + revision = "1"; + editedCabalFile = "1ppm6a56z7nr90q6ffffkvb2syfi9nlzi806g3r5z7dinn262gnc"; libraryHaskellDepends = [ base fail indexed-traversable lens profunctors semigroupoids semigroups @@ -322000,8 +322349,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.3.0"; - sha256 = "0hrsr8gnx4pjkkwyirfcfss2kvl3z5h55gfgs8ny10rj601aylhi"; + version = "0.2.4.0"; + sha256 = "1dvd7gwqqz1qdy0zxcad7485s6nx9s93wgpfz7r0q6g7s0wmff6r"; libraryHaskellDepends = [ base exceptions Z-Data ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix index 747c2a90cb..26205ba0da 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.9"; - sha256 = "sha256-toM2AoPAle+eNKg0to3r/EYT2taJ9OwKvde4Jr++ZE0="; + version = "24.3.4.10"; + sha256 = "sha256-mz9ZSqp/MgdW3tMLLV84Uiwqb4FIOAnYjYgri68LlWs="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix index b3a66f12dc..e6d32f40c4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gtk-server/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "gtk-server"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz"; - sha256 = "0vlx5ibvc7hyc8yipjgvrx1azvmh42i9fv1khg3dvn09nrdkrc7f"; + sha256 = "sha256-sFL3y068oXDKgkEUcNnGVsNSPBdI1NzpsqdYJfmOQoA="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index e323d74a26..c86e71ad36 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -213,8 +213,8 @@ let platforms = lua.meta.platforms; # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ ]; + broken = disabled; } // meta; })); in - assert (disabled -> throw "${pname} not supported for interpreter ${lua.executable}"); luarocksDrv diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix index e221956cf2..45d35d027b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -15,7 +15,7 @@ , portaudio , libX11 , graphicsmagick -, pcre +, pcre2 , pkg-config , libGL , libGLU @@ -112,12 +112,12 @@ let }; self = mkDerivation rec { - version = "7.3.0"; + version = "8.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-bhSkZJ1wr0WrZg+Mu/ZFqvHsM/JfiL/aRpfLF+RAxPU="; + sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8="; }; buildInputs = [ @@ -127,7 +127,7 @@ let flex qhull graphicsmagick - pcre + pcre2 fltk zlib curl diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 091052fe22..681dd6515c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -170,6 +170,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libsdl.org/"; license = licenses.zlib; platforms = platforms.all; - maintainers = with maintainers; [ cpages superherointj ]; + maintainers = with maintainers; [ cpages ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index d3bee03c5e..bd147fffc9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.4.3"; + version = "12.0.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-h2AyY2ZJiK9B2iyk82IF426kepKB+mz9RjEV83l6HaI="; + sha256 = "sha256-IwpcddqtUtxH4a3Oj1pQ+apOQ1Tg8bsY6oTvoucOIN8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cctag/cmake-install-include-dir.patch b/third_party/nixpkgs/pkgs/development/libraries/cctag/cmake-install-include-dir.patch new file mode 100644 index 0000000000..ae708e55d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cctag/cmake-install-include-dir.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -209,7 +209,7 @@ + target_include_directories(CCTag + PUBLIC "$" + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>" ++ "$" + PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}) + + # just for testing diff --git a/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix new file mode 100644 index 0000000000..706d2becbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cctag/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub + +, cmake +, boost +, eigen +, opencv +, tbb + +, avx2Support ? stdenv.hostPlatform.avx2Support +}: + +stdenv.mkDerivation rec { + pname = "cctag"; + version = "1.0.3"; + + outputs = [ "lib" "dev" "out" ]; + + src = fetchFromGitHub { + owner = "alicevision"; + repo = "CCTag"; + rev = "v${version}"; + hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A="; + }; + + cmakeFlags = [ + # Feel free to create a PR to add CUDA support + "-DCCTAG_WITH_CUDA=OFF" + + "-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}" + + "-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DCCTAG_BUILD_APPS=OFF" + ]; + + patches = [ + ./cmake-install-include-dir.patch + ]; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + tbb + ]; + + buildInputs = [ + boost + eigen + opencv + ]; + + # Tests are broken on Darwin (linking issue) + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "Detection of CCTag markers made up of concentric circles"; + homepage = "https://cctag.readthedocs.io"; + downloadPage = "https://github.com/alicevision/CCTag"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ tmarkus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix index 74f09ce292..a0c679b4fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cogl/default.nix @@ -41,11 +41,13 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589"; sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; + decode = "xz -d"; }) (fetchpatch { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; + decode = "xz -d"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppcodec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cppcodec/default.nix new file mode 100644 index 0000000000..d3ead22f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cppcodec/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cppcodec"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "tplgy"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Header-only C++11 library for encode/decode functions as in RFC 4648"; + longDescription = '' + Header-only C++11 library to encode/decode base64, base64url, base32, + base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus + Crockford's base32. + ''; + homepage = "https://github.com/tplgy/cppcodec"; + license = licenses.mit; + maintainers = with maintainers; [ panicgh raitobezarius ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix index 15eedbdfc4..6b660a491f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fbthrift/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "fbthrift"; - version = "2023.02.20.00"; + version = "2023.03.20.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "v${version}"; - sha256 = "sha256-MnF2JS+5kvcA6nymFWW7DTM5yWsnQR0U69lirG/CLDg="; + sha256 = "sha256-jCgdo7jE5QlRK5f2S6XEVM4+TPWI//4DKG/fDMFzgzg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index 670fa30cb0..333d8196d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,18 +1,17 @@ { lib -, stdenv , fetchurl -, fetchpatch -, cmake +, stdenv , testers +, cmake }: stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; + hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix index c793df1670..da10cf22cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Degl=${if x11Support then "yes" else "no"}" + "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" "-Dtests=${lib.boolToString doCheck}" "-Dx11=${lib.boolToString x11Support}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix new file mode 100644 index 0000000000..2f06fe8eaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libnitrokey/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, hidapi +, libusb1 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libnitrokey"; + version = "3.8"; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "libnitrokey"; + rev = "v${finalAttrs.version}"; + hash = "sha256-9ZMR1g04gNzslax6NpD6KykfUfjpKFIizaMMn06iJa0="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + "-DADD_GIT_INFO=OFF" + "-DCMAKE_INSTALL_UDEVRULESDIR=etc/udev/rules.d" + ]; + + buildInputs = [ libusb1 ]; + + propagatedBuildInputs = [ hidapi ]; + + meta = with lib; { + description = "Communicate with Nitrokey devices in a clean and easy manner"; + homepage = "https://github.com/Nitrokey/libnitrokey"; + license = licenses.lgpl3; + maintainers = with maintainers; [ panicgh raitobezarius ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix index 3dfb910f1c..a04050458e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libowfat/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { pname = "libowfat"; - version = "0.32"; + version = "0.33"; src = fetchurl { url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; - sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; + sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0="; }; - patches = [ - (fetchurl { - name = "first_deferred.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch?id=129f4ab9f8571c651937c46ba7bd4c82d6d052a2"; - sha256 = "zxWb9qq5dkDucOsiPfGG1Gb4BZ6HmhBjgSe3tBnydP4="; - }) - ]; - # Fix for glibc 2.34 from Gentoo # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4 postPatch = '' @@ -26,6 +18,9 @@ stdenv.mkDerivation rec { # remove unneeded definition of __deprecated__ sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die ''; + preBuild = '' + make headers + ''; makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix index 6e3db75f5e..3927f7cce4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/litehtml/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; }; + # Don't search for non-existant gumbo cmake config + # This will mislead cmake that litehtml is not found + # Affects build of pkgs that depend on litehtml + postPatch = '' + substituteInPlace cmake/litehtmlConfig.cmake \ + --replace "find_dependency(gumbo)" "" + ''; + nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 4cd1490fd4..23bfac2fe5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.26"; + version = "1.0.27"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Ou6IwCvRJE4pB/69Sjmc5fZPMvjaDvPOs0Qgol9rTEA="; + sha256 = "sha256-QvwSNuIph/ea3dAGQ0VhOiOmPmQtnqleCEebRpH2SgE="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/psol/default.nix b/third_party/nixpkgs/pkgs/development/libraries/psol/default.nix index 6bbe426fb5..b6b9d0bac5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/psol/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/psol/default.nix @@ -1,11 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "psol"; version = "1.13.35.2"; # Latest stable, 2018-02-05 - url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; - sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr"; + src = fetchurl { + url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz"; + hash = "sha256-3zujyPxU4ThF0KHap6bj2YMSbCORKFG7+Lo1vmRqQ08="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + mv include lib -t $out + + runHook postInstall + ''; meta = with lib; { description = "PageSpeed Optimization Libraries"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix index 4221d24679..dfe5e87216 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -7,16 +7,18 @@ , nodePackages , rWrapper , rPackages +, extraRPackages ? [] , makeWrapper , python3 +, extraPythonPackages ? ps: with ps; [] }: stdenv.mkDerivation rec { pname = "quarto"; - version = "1.2.335"; + version = "1.2.475"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-f9b6vDiE/CDsPE8/AseWVTXPZH14wOQtUskMv42Xhcg="; + sha256 = "sha256-oyKjDlTKt2fIzirOqgNRrpuM7buNCG5mmgIztPa28rY="; }; nativeBuildInputs = [ @@ -42,8 +44,8 @@ stdenv.mkDerivation rec { --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ --prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \ - --prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown]; }}/bin/R \ - --prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ])}/bin/python3 + --prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R \ + --prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3 ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index f22a72ac2b..dd64803b14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-thunk"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix index d753779be0..f53727e381 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocsolver/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocsolver"; - version = "5.4.2"; + version = "5.4.4"; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix index a099a14a8e..c9f00fa72e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}" "" + --replace "''${prefix}/" "" ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix index e9be83970f..aeb7c8bb6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}" "" + --replace "''${prefix}/" "" ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix index 7fcdfbdf54..86e03df16b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}" "" + --replace "''${prefix}/" "" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix index 5a5046cd2a..f61f11225f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}" "" + --replace "''${prefix}/" "" ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index a9bd2c8faa..57139f8bcd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/pkgconfig/s-dftd3.pc \ - --replace "''${prefix}" "" + --replace "''${prefix}/" "" ''; doCheck = true; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Reimplementation of the DFT-D3 program"; - license = with licenses; [lgpl3Only gpl3Only]; + license = with licenses; [ lgpl3Only gpl3Only ]; homepage = "https://github.com/dftd3/simple-dftd3"; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch new file mode 100644 index 0000000000..d2d84f42e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/0001-fix-multicharge-dep-needed-for-static-compilation.patch @@ -0,0 +1,31 @@ +From 1885a2349102742e33c5c97a8ab4bcacc032fc70 Mon Sep 17 00:00:00 2001 +From: Ryan Swart +Date: Thu, 30 Mar 2023 15:50:23 +0800 +Subject: [PATCH] fix: multicharge dep needed for static compilation + +--- + config/meson.build | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/config/meson.build b/config/meson.build +index 4f76160..629fa5e 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -136,6 +136,14 @@ sdftd3_dep = dependency( + ) + lib_deps += sdftd3_dep + ++# Create multicharge library as subproject ++multicharge_dep = dependency( ++ 'multicharge', ++ fallback: ['multicharge'], ++ default_options: ['default_library=static', 'api=false', 'python=false'], ++) ++lib_deps += multicharge_dep ++ + # Create TOML Fortran as subproject + tomlf_dep = dependency( + 'toml-f', +-- +2.39.2 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix index 00301d9576..f19c3377b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -3,24 +3,54 @@ , ninja , pkg-config , tblite +, numpy +, simple-dftd3 , cffi +, gfortran +, blas +, lapack +, mctc-lib +, mstore +, toml-f +, multicharge +, dftd4 }: -buildPythonPackage rec { +buildPythonPackage { inherit (tblite) pname version src meta; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + tblite + meson + ninja + pkg-config + gfortran + mctc-lib + ]; - buildInputs = [ tblite ]; + buildInputs = [ + tblite + simple-dftd3 + blas + lapack + mctc-lib + mstore + toml-f + multicharge + dftd4 + ]; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; + + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors + patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; format = "other"; - + pythonImportsCheck = [ "tblite" "tblite.interface" ]; configurePhase = '' runHook preConfigure - meson setup build python --prefix=$out + meson setup build -Dpython=true --prefix=$out cd build runHook postConfigure diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index 34c1b7ad84..a47d826071 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -17,7 +17,7 @@ let # this derivation. However, we should ensure on version bumps # that the CUDA toolkit for `passthru.tests` is still # up-to-date. - version = "1.13.1"; + version = "2.0.0"; device = if cudaSupport then "cuda" else "cpu"; srcs = import ./binary-hashes.nix version; unavailable = throw "libtorch is not available for this platform"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index 5d5c795b6e..83533d89b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -1,19 +1,19 @@ version : builtins.getAttr version { - "1.13.1" = { + "2.0.0" = { x86_64-darwin-cpu = { - name = "libtorch-macos-1.13.1.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.13.1.zip"; - hash = "sha256-2ITO1hO3qb4lEHO7xV6Dn6bhxI4Ia2TLulqs2LM7+vY="; + name = "libtorch-macos-2.0.0.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-2.0.0.zip"; + hash = "sha256-u6y5IeYoiOC0yQ/k6JCChDs9lXWccLxUorgR8L62lkM="; }; x86_64-linux-cpu = { - name = "libtorch-cxx11-abi-shared-with-deps-1.13.1-cpu.zip"; - url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.13.1%2Bcpu.zip"; - hash = "sha256-AXmlrtGNMVOYbQfvAQDUALlK1F0bMGNdm6RBtVuNvbo="; + name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cpu.zip"; + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcpu.zip"; + hash = "sha256-BoZQ2MC1CDVVGfX3SHC3mEpLGWO8XK7AcLcHJXDsXuc="; }; x86_64-linux-cuda = { - name = "libtorch-cxx11-abi-shared-with-deps-1.13.1-cu116.zip"; - url = "https://download.pytorch.org/libtorch/cu116/libtorch-cxx11-abi-shared-with-deps-1.13.1%2Bcu116.zip"; - hash = "sha256-CujIDlE9VqUuhSJcvUO6IlDWjmjEt54sMAJ4ZRjuziw="; + name = "libtorch-cxx11-abi-shared-with-deps-2.0.0-cu118.zip"; + url = "https://download.pytorch.org/libtorch/cu118/libtorch-cxx11-abi-shared-with-deps-2.0.0%2Bcu118.zip"; + hash = "sha256-Dpw9kQdA1NI9EOT7JBKwQP4wZT6lizcnKKTQ8WVJCZc="; }; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index 843eb2f5b1..b3e8c8fbae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.26"; + version = "1.0.27"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-vbuzV4ZZnb0Vl+U9B8BorDD7mHQ7ILwkR35GaFs+aTI="; + hash = "sha256-DxLtDtscTPR1yzeOENyQPylKo+VxJTswUAE/MieEoXQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix b/third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix index 690ceb4276..9361f10e60 100644 --- a/third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/cppreference-doc/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "cppreference-doc"; - version = "2022.07.30"; - ver = builtins.replaceStrings ["."] [""] version; + version = "20220730"; -in fetchzip { - name = pname + "-" + version; + src = fetchurl { + url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz"; + hash = "sha256-cfFQA8FouNxaAMuvGbZICps+h6t+Riqjnttj11EcAos="; + }; - url = "https://github.com/PeterFeicht/${pname}/releases/download/v${ver}/html-book-${ver}.tar.xz"; - sha256 = "sha256-gsYNpdxbWnmwcC9IJV1g+e0/s4Hoo5ig1MGoYPIHspw="; + sourceRoot = "."; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - rm $out/cppreference-doxygen-local.tag.xml $out/cppreference-doxygen-web.tag.xml mkdir -p $out/share/cppreference/doc - mv $out/reference $out/share/cppreference/doc/html + mv reference $out/share/cppreference/doc/html + + runHook postInstall ''; passthru = { inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix index b571cb585e..524017a9ae 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -20,6 +20,7 @@ "@commitlint/cli" = "commitlint"; "@forge/cli" = "forge"; "@gitbeaker/cli" = "gitbeaker"; + "@githubnext/github-copilot-cli" = "github-copilot-cli"; "@google/clasp" = "clasp"; "@medable/mdctl-cli" = "mdctl"; "@mermaid-js/mermaid-cli" = "mmdc"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index c4213f0b8c..511774ab54 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -152,6 +152,7 @@ , "git-ssb" , "git-standup" , "@gitbeaker/cli" +, "@githubnext/github-copilot-cli" , "gitmoji-cli" , "glob" , "gramma" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 4c7dd72762..ebbf0ae2d2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -13,6 +13,15 @@ let sha512 = "HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw=="; }; }; + "@75lb/deep-merge-1.1.1" = { + name = "_at_75lb_slash_deep-merge"; + packageName = "@75lb/deep-merge"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.1.tgz"; + sha512 = "xvgv6pkMGBA6GwdyJbNAnDmfAIR/DfWhrj9jgWh3TY7gRm3KO46x/GPjRg6wJ0nOepwqrNxFfojebh0Df4h4Tw=="; + }; + }; "@achrinza/node-ipc-9.2.2" = { name = "_at_achrinza_slash_node-ipc"; packageName = "@achrinza/node-ipc"; @@ -139,6 +148,15 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; + "@alloc/quick-lru-5.2.0" = { + name = "_at_alloc_slash_quick-lru"; + packageName = "@alloc/quick-lru"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; + sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; + }; + }; "@ampproject/remapping-2.2.0" = { name = "_at_ampproject_slash_remapping"; packageName = "@ampproject/remapping"; @@ -1111,13 +1129,13 @@ let sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; }; }; - "@aws-sdk/querystring-parser-3.272.0" = { + "@aws-sdk/querystring-parser-3.290.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.272.0"; + version = "3.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.272.0.tgz"; - sha512 = "5oS4/9n6N1LZW9tI3qq/0GnCuWoOXRgcHVB+AJLRBvDbEe+GI+C/xK1tKLsfpDNgsQJHc4IPQoIt4megyZ/1+A=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.290.0.tgz"; + sha512 = "8QPDihJKSFYFphxUl5+FfXMQowhAoHuDeoqd1ce3byL0bm7k8emcGfiYD6QGxuDlpno+F4O1/Mz+e+cwNCdPVA=="; }; }; "@aws-sdk/s3-request-presigner-3.241.0" = { @@ -1156,22 +1174,22 @@ let sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; }; }; - "@aws-sdk/signature-v4-3.282.0" = { + "@aws-sdk/signature-v4-3.290.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.282.0"; + version = "3.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.282.0.tgz"; - sha512 = "rnSL3UyF/No7+O2EMtN1sTCiqL1a+odbfnfo3wCSl8DH5PEYINt2kZgVEvT1Fgaffk1pUggBBOZoR+arPIIDJA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.290.0.tgz"; + sha512 = "SUMflc8b8PC0ITV3AdYBSlTcn4oFjumBAPNNXBLKIpifQ1l7ZufFIulDPlqeouXTDwsuCVINAwE0DbItDe/7Qw=="; }; }; - "@aws-sdk/signature-v4-crt-3.282.0" = { + "@aws-sdk/signature-v4-crt-3.290.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.282.0"; + version = "3.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.282.0.tgz"; - sha512 = "NKtqmJLfutjwtpwFFOTBPyEi4262+R+cMhjYo6CwEHXlbXgPbPlyuuIdSuFlL8MecGC61nw2prBlwkTjR//pxA=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.290.0.tgz"; + sha512 = "VZLqO+sIQUvti4tpUDfqqwB6x8PEqXN6VL5ZkUSvi2MvzrZvKk5wAzrVTz0zohrlYACCGNlyL40atI+wW306Ew=="; }; }; "@aws-sdk/signature-v4-multi-region-3.226.0" = { @@ -1210,13 +1228,13 @@ let sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; }; }; - "@aws-sdk/types-3.272.0" = { + "@aws-sdk/types-3.290.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.272.0"; + version = "3.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.272.0.tgz"; - sha512 = "MmmL6vxMGP5Bsi+4wRx4mxYlU/LX6M0noOXrDh/x5FfG7/4ZOar/nDxqDadhJtNM88cuWVHZWY59P54JzkGWmA=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.290.0.tgz"; + sha512 = "uQLD9tLv8Q87CwrSB/taUoQ8wkGeFb1Gygc+kt5oClfMFP9HYzu944kW/1R7/J5LtBLT1QFYccd4gz6eOUNlsw=="; }; }; "@aws-sdk/url-parser-3.226.0" = { @@ -1354,13 +1372,13 @@ let sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; }; }; - "@aws-sdk/util-middleware-3.272.0" = { + "@aws-sdk/util-middleware-3.290.0" = { name = "_at_aws-sdk_slash_util-middleware"; packageName = "@aws-sdk/util-middleware"; - version = "3.272.0"; + version = "3.290.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.272.0.tgz"; - sha512 = "Abw8m30arbwxqmeMMha5J11ESpHUNmCeSqSzE8/C4B8jZQtHY4kq7f+upzcNIQ11lsd+uzBEzNG3+dDRi0XOJQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.290.0.tgz"; + sha512 = "lXGM9YSqwZgCeEPltc++jiGyZ/FLuh62IjrWSIVSL/FvkL6D8KSKNBd7Ab/KDDu5jt4iP5UZ4k3SGVk6monUZg=="; }; }; "@aws-sdk/util-retry-3.229.0" = { @@ -3226,40 +3244,40 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.28.0" = { + "@cspell/cspell-bundled-dicts-6.29.2" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.28.0.tgz"; - sha512 = "RjAf67eejzQVXPX45xmIGFgSewtUeY5R+xun6xz1pQFIIrgsoxYNZ1hbdj72sX6+QdkJDf1WF3S9zMfiRVlOXQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.29.2.tgz"; + sha512 = "++PXqtJXmYV/xRiMS1dxjr0DYhxToOoofSh38n3wyg5B+naOKd766AukaqFhZXRRIPpLIngZvd6LmYM3l/lQ4g=="; }; }; - "@cspell/cspell-pipe-6.28.0" = { + "@cspell/cspell-pipe-6.29.2" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.28.0.tgz"; - sha512 = "/D8cmitszZCethV4ekz+RMigwlkk5kLcOiVdjKBx/YHC5CtpkQ+v5ZlaTpxAKCoOyfyKW6hI8UNhNIx7ZyrizQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.29.2.tgz"; + sha512 = "LJXEaes1Aw7Tiry+lW8RHcs167GF7uRsllOrGlqcPAjFKrwgYDZgsxdduTvW2Lz5MT19CfOahAdbBRlaMQ/JHw=="; }; }; - "@cspell/cspell-service-bus-6.28.0" = { + "@cspell/cspell-service-bus-6.29.2" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.28.0.tgz"; - sha512 = "l3PtT8wZTTB3HcCFg0WYAamzt9MO4fVevOj+6lOaTTQDh5iV+4+XmutkdKGoDmMpe3EdqOeYJ5SC96NUb6U5CA=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.29.2.tgz"; + sha512 = "t3h29kiki994XQNxe2V3R9ACBXBPZc8p90TwDSG8sPsg+FVJJG5ey72Hvh2oAlCxfOu8aqdQJTc4x8COF0adLg=="; }; }; - "@cspell/cspell-types-6.28.0" = { + "@cspell/cspell-types-6.29.2" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.28.0.tgz"; - sha512 = "+LJ7IlD4X9eaw8fBPtHYH8g5eFIkEZssLrjAOLA2hIps5aVNZ6J6oS4lUOVdKaDjdn6qsPgTpHGZJ2rV/RSrCA=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.29.2.tgz"; + sha512 = "nPIdZ+1+2/LjJe/eZ4WG72VvrgKgf+5CM9D+7JwYxexrot06HDvcrHogOerb4HkxZpIGYxJw4gO6JkZIZpRPJw=="; }; }; "@cspell/dict-ada-4.0.1" = { @@ -3910,13 +3928,13 @@ let sha512 = "wmkWHHkp2AN9EDWNBLB0VASB5OtsC3KnhoAHxCJzC6AB3xjYoBfKsvgI/o50gfbsCVQceHpqXjOEYSw/xxTKNw=="; }; }; - "@cspell/dict-sql-2.0.2" = { + "@cspell/dict-sql-2.1.0" = { name = "_at_cspell_slash_dict-sql"; packageName = "@cspell/dict-sql"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.0.2.tgz"; - sha512 = "XxUoamMFU9OGcDHLY6+pTlQDsqq9wcY7Oc4C55hqmotxFeFaaqinoD1UIAm1yDngRP7fKK4mVPPFmJI6bmspHg=="; + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.0.tgz"; + sha512 = "Bb+TNWUrTNNABO0bmfcYXiTlSt0RD6sB2MIY+rNlaMyIwug43jUjeYmkLz2tPkn3+2uvySeFEOMVYhMVfcuDKg=="; }; }; "@cspell/dict-svelte-1.0.2" = { @@ -3964,22 +3982,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-6.28.0" = { + "@cspell/dynamic-import-6.29.2" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.28.0.tgz"; - sha512 = "drPfcTDDnWfQqSA3TqYMewocbFnPIW08/xKnouC7QFThgNocLD6TkBExa9timCATEsL7HujeAFEgMaPPTPFMqA=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-6.29.2.tgz"; + sha512 = "7PQ05hrvYzS7q3GB0m1bEzLpFs5qUWXsv1wdktD0oFdSffWURKSz8ZXwUepKeRxvC6ZdX9Ox57P52Mv3yCQn8Q=="; }; }; - "@cspell/strong-weak-map-6.28.0" = { + "@cspell/strong-weak-map-6.29.2" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.28.0.tgz"; - sha512 = "M8qffYu672xMbF3JH5TmlXydfoglhiO/Tuy2fziQHtaTRm5Qp0KrSioSvHq+3QxnmHVTa91vYuzmr6qoAxqPjQ=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-6.29.2.tgz"; + sha512 = "tmCjsRu+XafFh/58JsXPV7iQk2ZnwVDh7O8+rhA0Grp2yU7P0zzacKC9kMb5Zvh4ZPQhP5tlh5t7MMsuHawXhA=="; }; }; "@cspotcode/source-map-consumer-0.8.0" = { @@ -4468,6 +4486,15 @@ let sha512 = "mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA=="; }; }; + "@esbuild/android-arm-0.17.6" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.6.tgz"; + sha512 = "bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g=="; + }; + }; "@esbuild/android-arm64-0.16.17" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4486,6 +4513,15 @@ let sha512 = "RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg=="; }; }; + "@esbuild/android-arm64-0.17.6" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.6.tgz"; + sha512 = "YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg=="; + }; + }; "@esbuild/android-x64-0.16.17" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4504,6 +4540,15 @@ let sha512 = "SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ=="; }; }; + "@esbuild/android-x64-0.17.6" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.6.tgz"; + sha512 = "MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ=="; + }; + }; "@esbuild/darwin-arm64-0.16.17" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4522,6 +4567,15 @@ let sha512 = "DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw=="; }; }; + "@esbuild/darwin-arm64-0.17.6" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.6.tgz"; + sha512 = "bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA=="; + }; + }; "@esbuild/darwin-x64-0.16.17" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4540,6 +4594,15 @@ let sha512 = "uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ=="; }; }; + "@esbuild/darwin-x64-0.17.6" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.6.tgz"; + sha512 = "xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg=="; + }; + }; "@esbuild/freebsd-arm64-0.16.17" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4558,6 +4621,15 @@ let sha512 = "nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw=="; }; }; + "@esbuild/freebsd-arm64-0.17.6" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.6.tgz"; + sha512 = "EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg=="; + }; + }; "@esbuild/freebsd-x64-0.16.17" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4576,6 +4648,15 @@ let sha512 = "TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug=="; }; }; + "@esbuild/freebsd-x64-0.17.6" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.6.tgz"; + sha512 = "Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q=="; + }; + }; "@esbuild/linux-arm-0.16.17" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4594,6 +4675,15 @@ let sha512 = "VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ=="; }; }; + "@esbuild/linux-arm-0.17.6" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.6.tgz"; + sha512 = "7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw=="; + }; + }; "@esbuild/linux-arm64-0.16.17" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4612,6 +4702,15 @@ let sha512 = "7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ=="; }; }; + "@esbuild/linux-arm64-0.17.6" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.6.tgz"; + sha512 = "bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w=="; + }; + }; "@esbuild/linux-ia32-0.16.17" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4630,6 +4729,15 @@ let sha512 = "X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA=="; }; }; + "@esbuild/linux-ia32-0.17.6" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.6.tgz"; + sha512 = "ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ=="; + }; + }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4657,6 +4765,15 @@ let sha512 = "hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw=="; }; }; + "@esbuild/linux-loong64-0.17.6" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.6.tgz"; + sha512 = "y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ=="; + }; + }; "@esbuild/linux-mips64el-0.16.17" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4675,6 +4792,15 @@ let sha512 = "znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw=="; }; }; + "@esbuild/linux-mips64el-0.17.6" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.6.tgz"; + sha512 = "09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA=="; + }; + }; "@esbuild/linux-ppc64-0.16.17" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4693,6 +4819,15 @@ let sha512 = "EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q=="; }; }; + "@esbuild/linux-ppc64-0.17.6" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.6.tgz"; + sha512 = "AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg=="; + }; + }; "@esbuild/linux-riscv64-0.16.17" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4711,6 +4846,15 @@ let sha512 = "uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ=="; }; }; + "@esbuild/linux-riscv64-0.17.6" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.6.tgz"; + sha512 = "Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ=="; + }; + }; "@esbuild/linux-s390x-0.16.17" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4729,6 +4873,15 @@ let sha512 = "NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ=="; }; }; + "@esbuild/linux-s390x-0.17.6" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.6.tgz"; + sha512 = "SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q=="; + }; + }; "@esbuild/linux-x64-0.16.17" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4747,6 +4900,15 @@ let sha512 = "SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w=="; }; }; + "@esbuild/linux-x64-0.17.6" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.6.tgz"; + sha512 = "a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw=="; + }; + }; "@esbuild/netbsd-x64-0.16.17" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4765,6 +4927,15 @@ let sha512 = "AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA=="; }; }; + "@esbuild/netbsd-x64-0.17.6" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.6.tgz"; + sha512 = "EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A=="; + }; + }; "@esbuild/openbsd-x64-0.16.17" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4783,6 +4954,15 @@ let sha512 = "gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg=="; }; }; + "@esbuild/openbsd-x64-0.17.6" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.6.tgz"; + sha512 = "xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw=="; + }; + }; "@esbuild/sunos-x64-0.16.17" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4801,6 +4981,15 @@ let sha512 = "SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw=="; }; }; + "@esbuild/sunos-x64-0.17.6" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.6.tgz"; + sha512 = "gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw=="; + }; + }; "@esbuild/win32-arm64-0.16.17" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4819,6 +5008,15 @@ let sha512 = "u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg=="; }; }; + "@esbuild/win32-arm64-0.17.6" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.6.tgz"; + sha512 = "G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg=="; + }; + }; "@esbuild/win32-ia32-0.16.17" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4837,6 +5035,15 @@ let sha512 = "GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ=="; }; }; + "@esbuild/win32-ia32-0.17.6" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.6.tgz"; + sha512 = "96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg=="; + }; + }; "@esbuild/win32-x64-0.16.17" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4855,6 +5062,33 @@ let sha512 = "5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow=="; }; }; + "@esbuild/win32-x64-0.17.6" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.6.tgz"; + sha512 = "n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA=="; + }; + }; + "@eslint-community/eslint-utils-4.2.0" = { + name = "_at_eslint-community_slash_eslint-utils"; + packageName = "@eslint-community/eslint-utils"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz"; + sha512 = "gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ=="; + }; + }; + "@eslint-community/regexpp-4.4.0" = { + name = "_at_eslint-community_slash_regexpp"; + packageName = "@eslint-community/regexpp"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz"; + sha512 = "A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ=="; + }; + }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -4873,22 +5107,22 @@ let sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; }; }; - "@eslint/eslintrc-2.0.0" = { + "@eslint/eslintrc-2.0.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz"; - sha512 = "fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.1.tgz"; + sha512 = "eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw=="; }; }; - "@eslint/js-8.35.0" = { + "@eslint/js-8.36.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.35.0"; + version = "8.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz"; - sha512 = "JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz"; + sha512 = "lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg=="; }; }; "@esm2cjs/cacheable-lookup-7.0.0" = { @@ -5017,13 +5251,13 @@ let sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; }; }; - "@exodus/schemasafe-1.0.0-rc.11" = { + "@exodus/schemasafe-1.0.0" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.11"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.11.tgz"; - sha512 = "jlDglM3cbjrpq+D4oDBP/tztQDJn2hNqOak/wIOIVxbv8+d9Yn8or4Misr0zx9UEsvVFYNCQsE97zVvIU0/Idw=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0.tgz"; + sha512 = "2cyupPIZI69HQxEAPllLXBjQp4njDKkOjYRCYxvMZe3/LY9pp9fBM3Tb1wiFAdP6Emo4v3OEbCLGj6u73Q5KLw=="; }; }; "@expo/apple-utils-0.0.0-alpha.37" = { @@ -5215,13 +5449,13 @@ let sha512 = "V7ihSFNFaATM31P1b/tGrGG7sjuXBT5ZAzKnybTWr5Xl1ODOdEpSC1c9bzs9SUr2iWUFVsxyd2/7+f2+7r/l4A=="; }; }; - "@expo/eas-json-3.7.0" = { + "@expo/eas-json-3.8.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.7.0.tgz"; - sha512 = "9+K0lDvwHXXjXcn5a8mrNDUXiX5RIIP4UZdLvF8JReNl8tSv21syqCZ6dPXB+1G3KmOfImHn1PaWW4reFEGOdg=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-3.8.0.tgz"; + sha512 = "eGUF4WVr/FQPMWCOQSHJYUWxLwDEBBY7p623qdJUzOyD0J84UIE4+x3336UzVIlFowBmC4pxXEcImzQYRZoxyg=="; }; }; "@expo/image-utils-0.3.21" = { @@ -5665,13 +5899,13 @@ let sha512 = "i9Wy+7V+lKfX+UWRTrrK+3xm4aa8jl9tK2/7Ku696yWJ5v3D6xjRcMevfxUZDrZ3xS4/GRFfWKPHkAjzz/BQoQ=="; }; }; - "@fluentui/react-8.106.4" = { + "@fluentui/react-8.106.5" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.106.4"; + version = "8.106.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.106.4.tgz"; - sha512 = "Lq/FJa8ww8mRI5/1xzl/DvV96DLRm210g1Oe1PL3i5rsTuOIY4ZqcjffNEVLztSemm2u2sRoZUS/wQnUcWi1Xw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.106.5.tgz"; + sha512 = "nJruoPUIqpIEhdOvMvN6slkAoJPe44F2BB79kab3il1j7OcBSazcaDMBY58laTlXqFgQW1E1bu3RhWeXlgwGAg=="; }; }; "@fluentui/react-focus-8.8.18" = { @@ -5683,13 +5917,13 @@ let sha512 = "qH4mD7BM0n8318X4jCZRV5Gv4b94xSluhMEK0uZwM6A+AClucEX93+7cgYanss0QU4yhOYrtQ+xJURQHVThq+Q=="; }; }; - "@fluentui/react-hooks-8.6.18" = { + "@fluentui/react-hooks-8.6.19" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.18"; + version = "8.6.19"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.18.tgz"; - sha512 = "8XtDs3VmdIjwYU9y5xWMxZg0DhZ4CNJx7aPjEdGiLfn6EyUTvJFZO5DcdlCF126Thbb1bqsD94iV8/GdS5ikCw=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.19.tgz"; + sha512 = "qiuz01T6DcB1OFUzliFXMJKnkeB+jmkNBOuhoB4k3MqEpKBxLjf5vrLznQgJ7KRwqyZPQs8uOnykDU/AcndZ7A=="; }; }; "@fluentui/react-portal-compat-context-9.0.4" = { @@ -5701,13 +5935,13 @@ let sha512 = "qw2lmkxZ2TmgC0pB2dvFyrzVffxBdpCx1BdWRaF+MRGUlTxRtqfybSx3Edsqa6NMewc3J0ThLMFdVFBQ5Yafqw=="; }; }; - "@fluentui/react-window-provider-2.2.7" = { + "@fluentui/react-window-provider-2.2.8" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.2.7"; + version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.7.tgz"; - sha512 = "fi5nYs2h4H70yrJ4g+XN4Tp4PCbwvyIErBz0Bdyai8b86VUtYLnGt+MDDrFqLqt17tcooH8u29iGyGGNFy2yYw=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.8.tgz"; + sha512 = "Z1qgyCmsfYvwoAa+ViCFdVAu5SAdBy1571zAHALHgmcN0AbplAYD1S39xIAEpyX1+r6TeKtyepQUuyfv73kNEg=="; }; }; "@fluentui/set-version-8.2.5" = { @@ -5971,6 +6205,15 @@ let sha512 = "1hO6esfdo42mSvyArPHrlgSY/fgerTuVNAbSD5ZKHS/w5ZyrkA4pRp3VHK2XE3fm9/uMBT/39i8pPvx0+Kbxjg=="; }; }; + "@grammyjs/types-3.0.2" = { + name = "_at_grammyjs_slash_types"; + packageName = "@grammyjs/types"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@grammyjs/types/-/types-3.0.2.tgz"; + sha512 = "jkSATedLQ0+aeDl+JxuOygIwgjlGBF+KFmp9K7h0uXz3g1/YFAyzUfnWmNsof2GmNPAIJa0oIP03TC58jZDyww=="; + }; + }; "@graphql-cli/common-4.1.0" = { name = "_at_graphql-cli_slash_common"; packageName = "@graphql-cli/common"; @@ -6295,15 +6538,6 @@ let sha512 = "mdqYADWl/9Kb75XLstt6pvBnS1DpxSDFRKrbadkY1ymUd29hq49nP6tLcL7a7qLydgqFCpjNwa2RsyrqB3MsXA=="; }; }; - "@grpc/grpc-js-1.8.11" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.8.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.11.tgz"; - sha512 = "f/xC+6Z2QKsRJ+VSSFlt4hA5KSRm+PKvMWV8kMPkMgGlFidR6PeIkXrOasIY2roe+WROM6GFQLlgDKfeEZo2YQ=="; - }; - }; "@grpc/grpc-js-1.8.12" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -8653,112 +8887,112 @@ let sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; }; }; - "@nrwl/cli-15.8.5" = { + "@nrwl/cli-15.8.6" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.8.5.tgz"; - sha512 = "voy16nUO1MxRMRqCpLlhDB9U4KyPfGHZABXtfMEIQk+W3alncatFMMSVvMQZmi8HXwubM8LxWSOnPtTtOCKBrQ=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.8.6.tgz"; + sha512 = "KrWoYcZgE6woCubPO1QSnwbZAjs2rdV4dotHxR+iRkeHRPAq0D6w83CVo5oP/krfUri2pxwzhnbkgAK1LSPBYg=="; }; }; - "@nrwl/devkit-15.8.5" = { + "@nrwl/devkit-15.8.6" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.8.5.tgz"; - sha512 = "NgpD1I1BfFb6wRxB5i5PGP4hMyRhPsArCyENWWvY4gCn8tylAc7yjpQyiDiy2QnymL2PjWM8QeAeCOy1eF2xgw=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.8.6.tgz"; + sha512 = "yA5hBpeqoIlyEN5lUkejUrmB/5vfg+k6xoT4KhXnmj6bLPDGOYTuixg8k+iYrIAFIRMx0F8zYbYOYzXG3lmvHg=="; }; }; - "@nrwl/nx-darwin-arm64-15.8.5" = { + "@nrwl/nx-darwin-arm64-15.8.6" = { name = "_at_nrwl_slash_nx-darwin-arm64"; packageName = "@nrwl/nx-darwin-arm64"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.8.5.tgz"; - sha512 = "/8yXbh1J3k85MAW/A6cDiPeEnbt66SE9BPnM2IPlGoZrXakQvAXEn+gsjQlvnP3q2EaEyv7e5+GA+8d+p6mT5A=="; + url = "https://registry.npmjs.org/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.8.6.tgz"; + sha512 = "8diQitlyjHxpkWcXNecd6T2ch8fHR7LOMaZg9+qgrt5AypWkEGf+UHMxTSNRObAiBGnoxySa+AL/UKVtpQ203Q=="; }; }; - "@nrwl/nx-darwin-x64-15.8.5" = { + "@nrwl/nx-darwin-x64-15.8.6" = { name = "_at_nrwl_slash_nx-darwin-x64"; packageName = "@nrwl/nx-darwin-x64"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.8.5.tgz"; - sha512 = "zEVoi0d+YChLrQMypoGFwu73t3YiD8UkXSozMtUEa2mg/se4e7jh+15tB6Te+Oq5aL0JKwQpr027GE4YtAmpLw=="; + url = "https://registry.npmjs.org/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.8.6.tgz"; + sha512 = "h9/JULzPZTpt6oNpKMZLc1NGDu+CLyx91c8DJUh/hH0Zh/7dS9LFxe9jWeFIdh18iAu7ZAoktK2KJ5YhOrUYhA=="; }; }; - "@nrwl/nx-linux-arm-gnueabihf-15.8.5" = { + "@nrwl/nx-linux-arm-gnueabihf-15.8.6" = { name = "_at_nrwl_slash_nx-linux-arm-gnueabihf"; packageName = "@nrwl/nx-linux-arm-gnueabihf"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.8.5.tgz"; - sha512 = "4C5wN0C7gQD6/lC9+UKUsB6mbHvowKhlaO529GIgtzrCLmfEh/LJ/CybnnKGpFEB/8Y5GpCa2uTWyA1XcPDzUw=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.8.6.tgz"; + sha512 = "Yp/YjzcIHW+OW4revPRZIt0Px9cKRsOL69FPLlYSxWuR/PD9SPeXWcbo3pKkjnIWIjOL2YT8z5cHiQ3bV1NVfw=="; }; }; - "@nrwl/nx-linux-arm64-gnu-15.8.5" = { + "@nrwl/nx-linux-arm64-gnu-15.8.6" = { name = "_at_nrwl_slash_nx-linux-arm64-gnu"; packageName = "@nrwl/nx-linux-arm64-gnu"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.8.5.tgz"; - sha512 = "SMQ+oIsyK75JiKeSMprmb8VXce6MLdfcS5GWWOihpoDWfUC9FoQHAu4X1OtxHbVTmJfoEOInJKAhPxXAi5obdw=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.8.6.tgz"; + sha512 = "b+OenpPhhxqgaG6EFHRLfVGtAU4+UbKqOhv7DLLh5P7tX3RAQAtyrT6tVkfDRFYl6kgEme/I5ZrevcbaGyDO+w=="; }; }; - "@nrwl/nx-linux-arm64-musl-15.8.5" = { + "@nrwl/nx-linux-arm64-musl-15.8.6" = { name = "_at_nrwl_slash_nx-linux-arm64-musl"; packageName = "@nrwl/nx-linux-arm64-musl"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.8.5.tgz"; - sha512 = "GVENjltZ17aJ6KOCibdBtLXQcGY5lpBqKolB9+rIYJvTWuV1k/uHOkYJDG7Vl70Rj46rC8K0Jp6BCpJHCv1ksQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.8.6.tgz"; + sha512 = "F9D8moy+lfJQhVrZoY54vDwpigBgxQy4HB9PRmc6Ln9mIk3ouOvKNC99OjUYEO+ensHr9eMpsbghsRCjod//uw=="; }; }; - "@nrwl/nx-linux-x64-gnu-15.8.5" = { + "@nrwl/nx-linux-x64-gnu-15.8.6" = { name = "_at_nrwl_slash_nx-linux-x64-gnu"; packageName = "@nrwl/nx-linux-x64-gnu"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.8.5.tgz"; - sha512 = "AW8YjhZv3c+LRUoLvHLx4BZaDakQbPCPx70+c/uQyDkQP/ckYJc0gRjoZukolcI6+AvNcBhkI559RL9W4qb9iw=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.8.6.tgz"; + sha512 = "an0zD6lKpblexazKssFvcfOx7BuGutwlrzmwScxISPXj5+ly99u+sYclDg2P56YRHYXIuYGBK0c0VWaJ91QIcw=="; }; }; - "@nrwl/nx-linux-x64-musl-15.8.5" = { + "@nrwl/nx-linux-x64-musl-15.8.6" = { name = "_at_nrwl_slash_nx-linux-x64-musl"; packageName = "@nrwl/nx-linux-x64-musl"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.8.5.tgz"; - sha512 = "m4Iy/pbzH0LTsADq/X+74nfVzm2Tt0zorOXXy/uQN4ozL/JNGVpwvxdOFxZ7e3RBXDX4u6awUzSE52Z2d2f0uA=="; + url = "https://registry.npmjs.org/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.8.6.tgz"; + sha512 = "LOurlSuLf9LWdjvpHHIsHC0auxgMVrkeOFFCUJ3oVv/dN4uZ0vuNG98XM2E7fPDXDacBZIyKdx34KQlmFfBHsA=="; }; }; - "@nrwl/nx-win32-arm64-msvc-15.8.5" = { + "@nrwl/nx-win32-arm64-msvc-15.8.6" = { name = "_at_nrwl_slash_nx-win32-arm64-msvc"; packageName = "@nrwl/nx-win32-arm64-msvc"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.8.5.tgz"; - sha512 = "4AT1PHo5At8AXvgE5XlQbimE0THeSji6J3XZ1UTqq7n3L26QicNdnZcaHGyL1ukMtXRIwT/yed+xu1PFkXF4QA=="; + url = "https://registry.npmjs.org/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.8.6.tgz"; + sha512 = "MvH84nLv1tdM96z92abeQd+tguY/zKC22AFHek9PSR1StUQzwwPu6rR7XDn3mggwnkLm11jTUXlk7wdbE5sldQ=="; }; }; - "@nrwl/nx-win32-x64-msvc-15.8.5" = { + "@nrwl/nx-win32-x64-msvc-15.8.6" = { name = "_at_nrwl_slash_nx-win32-x64-msvc"; packageName = "@nrwl/nx-win32-x64-msvc"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.8.5.tgz"; - sha512 = "53vzsQErvN4OeF/qBgfPg6OZ3smX4V8Lza59bwql9aAjjlMe1Ff9Su0BgAqlhVfSiYGxAirfHljgA6aWFqpCHQ=="; + url = "https://registry.npmjs.org/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.8.6.tgz"; + sha512 = "P0Sb4HJCeoeTvPFdUMKljRUIjzso0go36cn1Zpl+Z5CG/nbOvLlbnzh6rg15SRNu9OLWTHNPtyQIvKxjqEDoxg=="; }; }; - "@nrwl/tao-15.8.5" = { + "@nrwl/tao-15.8.6" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.8.5.tgz"; - sha512 = "pb/hUprOOv2vgvbevGz9hiu8LLOtK7KKuBe4JLSXrFxfHEQjMFsK/2aymnts0ZQrA83QlIG2Mr0tuSKj6/iWvg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.8.6.tgz"; + sha512 = "dY205cotLiKTV+5BrUlneZEOucDmXiJU4asj1G4vQCf8Nt7awwuLYOmgbsACS27gkopSVV+DPl1zmtkSJX8Cjg=="; }; }; "@oclif/command-1.8.0" = { @@ -9238,40 +9472,49 @@ let sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg=="; }; }; - "@opentelemetry/api-1.4.0" = { + "@opentelemetry/api-1.4.1" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; - sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz"; + sha512 = "O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="; }; }; - "@opentelemetry/core-1.9.1" = { + "@opentelemetry/core-1.10.0" = { name = "_at_opentelemetry_slash_core"; packageName = "@opentelemetry/core"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.9.1.tgz"; - sha512 = "6/qon6tw2I8ZaJnHAQUUn4BqhTbTNRS0WP8/bA0ynaX+Uzp/DDbd0NS0Cq6TMlh8+mrlsyqDE7mO50nmv2Yvlg=="; + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.10.0.tgz"; + sha512 = "H5/mfU3TsEBe/cnnLu3VCkzjqyRARmhxQGsT64KwafxjzkDh+c2Bk4n140Cg/xhgrjK2sFsxbJj6d0xZlVo/OQ=="; }; }; - "@opentelemetry/resources-1.9.1" = { + "@opentelemetry/resources-1.10.0" = { name = "_at_opentelemetry_slash_resources"; packageName = "@opentelemetry/resources"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.9.1.tgz"; - sha512 = "VqBGbnAfubI+l+yrtYxeLyOoL358JK57btPMJDd3TCOV3mV5TNBmzvOfmesM4NeTyXuGJByd3XvOHvFezLn3rQ=="; + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.10.0.tgz"; + sha512 = "bh4auHOdS0/cwSgviCPbkItLwLZRWCZKp/ns2soVwlWQMJH36FIHbcYJf7G9+Rthlc6u163VhUefho+eDrPVeA=="; }; }; - "@opentelemetry/sdk-trace-base-1.9.1" = { + "@opentelemetry/sdk-trace-base-1.10.0" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.9.1.tgz"; - sha512 = "Y9gC5M1efhDLYHeeo2MWcDDMmR40z6QpqcWnPCm4Dmh+RHAMf4dnEBBntIe1dDpor686kyU6JV1D29ih1lZpsQ=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.10.0.tgz"; + sha512 = "X4rRShtVQ893LCU4GNKS1TKFua9nSjVmo0VJvigfSFSOmyyOLfiyTWmVL9MKV7Ws0HqLOIWJixJY0x28fw3Tzg=="; + }; + }; + "@opentelemetry/semantic-conventions-1.10.0" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.10.0.tgz"; + sha512 = "Mzo5IyrI59YuYWeNoOZRXfUCc3upjmxCmczSm+pUgWprvSNfdOX70SVde84UxmuzU7MF1MEkPXKXTYG3ymRw2w=="; }; }; "@opentelemetry/semantic-conventions-1.3.1" = { @@ -9283,15 +9526,6 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@opentelemetry/semantic-conventions-1.9.1" = { - name = "_at_opentelemetry_slash_semantic-conventions"; - packageName = "@opentelemetry/semantic-conventions"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.9.1.tgz"; - sha512 = "oPQdbFDmZvjXk5ZDoBGXG8B4tSB/qW5vQunJWQMFUBp7Xe8O1ByPANueJ+Jzg58esEBegyyxZ7LRmfJr7kFcFg=="; - }; - }; "@orval/angular-6.12.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; @@ -9859,13 +10093,13 @@ let sha512 = "+AxBnKgjqVpUHBcHLWIHcjYgKIvHIpZjN33mG5LG9XXvrZiqdWvouEzqEXlVLq5VzzVbKIQQcmsvRy138YErkg=="; }; }; - "@peculiar/asn1-schema-2.3.3" = { + "@peculiar/asn1-schema-2.3.6" = { name = "_at_peculiar_slash_asn1-schema"; packageName = "@peculiar/asn1-schema"; - version = "2.3.3"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.3.tgz"; - sha512 = "6GptMYDMyWBHTUKndHaDsRZUO/XMSgIns2krxcm2L7SEExRHwawFvSwNBhqNPR9HJwv3MruAiF1bhN0we6j6GQ=="; + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz"; + sha512 = "izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA=="; }; }; "@peculiar/json-schema-1.1.12" = { @@ -10345,13 +10579,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.123" = { + "@redocly/openapi-core-1.0.0-beta.124" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.123"; + version = "1.0.0-beta.124"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.123.tgz"; - sha512 = "W6MbUWpb/VaV+Kf0c3jmMIJw3WwwF7iK5nAfcOS+ZwrlbxtIl37+1hEydFlJ209vCR9HL12PaMwdh2Vpihj6Jw=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.124.tgz"; + sha512 = "WvRRR4z1zJgs55fM5wdFrZ9WzuFT8QeEVRgvmERhi/kJcGEUGKHgezuDMmIhDUAnxi/+eJJfwAnLnUzC4c69Fg=="; }; }; "@remix-run/dev-1.14.0" = { @@ -10363,22 +10597,22 @@ let sha512 = "567BSCe3YNTKVKFYWSjC7sj8y0AbiAolCz1roW2JpdZXY7GoxoP+I8mtQV7RGrgpvUzhVL0go1B2EIxFJzZhDQ=="; }; }; - "@remix-run/express-1.14.0" = { + "@remix-run/express-1.14.1" = { name = "_at_remix-run_slash_express"; packageName = "@remix-run/express"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/express/-/express-1.14.0.tgz"; - sha512 = "Kj7kVbj3f86TTbwE8kbSqHjLEzHJvs+cvYdlBEDrWsuXj1q5ciHs7Jjun6qSLrrOxCtEMqFXc6s530p67M1fiQ=="; + url = "https://registry.npmjs.org/@remix-run/express/-/express-1.14.1.tgz"; + sha512 = "Y8pGdxcv4PnnHjq19VZKb/VurYwt0LQKCd6CaCITuEvZ2INtXdvxcxHPe0EUTNDp79tEHO5h0O1s21jvcQ+YAg=="; }; }; - "@remix-run/node-1.14.0" = { + "@remix-run/node-1.14.1" = { name = "_at_remix-run_slash_node"; packageName = "@remix-run/node"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/node/-/node-1.14.0.tgz"; - sha512 = "TAm6AMAxFTccCAUIMki5VY+6vhBmItFvms1K+uTZc0z62ct0i1JEH+xl2POj6wB0UJhlq8IWchAZ41KKttPV1A=="; + url = "https://registry.npmjs.org/@remix-run/node/-/node-1.14.1.tgz"; + sha512 = "BdHhm7N9eDSZ8jxl240qgO8214HdFiq6rQKt8Y1Xzlp2JHatTZFDlRXifNQDpzwzTbn/CXygP9CVr3B6xe8qoA=="; }; }; "@remix-run/router-1.3.3" = { @@ -10390,13 +10624,13 @@ let sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w=="; }; }; - "@remix-run/serve-1.14.0" = { + "@remix-run/serve-1.14.1" = { name = "_at_remix-run_slash_serve"; packageName = "@remix-run/serve"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.14.0.tgz"; - sha512 = "lf/hEwogYgxqiNdRdEoAf6u2IJK8o0QmsC2EIqc6sHIHTL1X+kDw39m46ePAFY/wU/ymRUtD+dote+u3PCAczA=="; + url = "https://registry.npmjs.org/@remix-run/serve/-/serve-1.14.1.tgz"; + sha512 = "bcL31/pxxbD+/NzGaZxmTdMXHHPQ+JVWuwAOxMGAkuHZppLYLi+o7FJ6ONXBOpeNGzvfdu79D9ZAqrBGmtq4Jw=="; }; }; "@remix-run/server-runtime-1.14.0" = { @@ -10408,6 +10642,15 @@ let sha512 = "qkqfT7DDwVzLICtJxMGthIU4T7DVtLy+oxKAzOi9eiCFlr3aWqV30YJ5Kq6r/kP8tighlnHbj1uEo41+WbD8uA=="; }; }; + "@remix-run/server-runtime-1.14.1" = { + name = "_at_remix-run_slash_server-runtime"; + packageName = "@remix-run/server-runtime"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.14.1.tgz"; + sha512 = "GG/NBkkOBw1oZYJZJrvLh0s/pM6DDrFCwD/qWxrdBGNBt1vV1YmSRx2ablCDMXbLzGggshpy+BEatjv8pOkTlw=="; + }; + }; "@remix-run/web-blob-3.0.4" = { name = "_at_remix-run_slash_web-blob"; packageName = "@remix-run/web-blob"; @@ -10777,13 +11020,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.42.0" = { + "@sentry/core-7.43.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.42.0"; + version = "7.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.42.0.tgz"; - sha512 = "vNcTyoQz5kUXo5vMGDyc5BJMO0UugPvMfYMQVxqt/BuDNR30LVhY+DL2tW1DFZDvRvyn5At+H7kSTj6GFrANXQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.43.0.tgz"; + sha512 = "zvMZgEi7ptLBwDnd+xR/u4zdSe5UzS4S3ZhoemdQrn1PxsaVySD/ptyzLoGSZEABqlRxGHnQrZ78MU1hUDvKuQ=="; }; }; "@sentry/hub-6.19.7" = { @@ -10795,13 +11038,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.42.0" = { + "@sentry/integrations-7.43.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.42.0"; + version = "7.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.42.0.tgz"; - sha512 = "5P3LsU+HRmdh458mav3dNh8RCn0TROIxwa/b7jk1TLWcXHrNp5REjo1oI4PTC+fFbNE4b7ydwHNEzI65rz7gyA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.43.0.tgz"; + sha512 = "rob7/PAUWFTuodCDlRoB0+7vQ7Fc/LlkvprLlB1Qqt34OIgOll4T72zVSaAXWSHZz7nGU8mS2XdYkRSXbDMK4w=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10822,13 +11065,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.42.0" = { + "@sentry/node-7.43.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.42.0"; + version = "7.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.42.0.tgz"; - sha512 = "mmpVSDeoM5aEbKOMq3Wt54wAvH53bkivhRh3Ip+R7Uj3aOKkcVJST2XlbghHgoYQXTWz+pl475EVyODWgY9QYg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.43.0.tgz"; + sha512 = "oXaTBq6Bk8Qwsd46hhRU2MLEnjYqWI41nPJmXyAWkDSYQTP7sUe1qM8bCUdsRpPwQh955Vq9qCRfgMbN4lEoAQ=="; }; }; "@sentry/types-6.19.7" = { @@ -10840,13 +11083,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.42.0" = { + "@sentry/types-7.43.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.42.0"; + version = "7.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.42.0.tgz"; - sha512 = "Ga0xaBIR/peuXQ88hI9a5TNY3GLNoH8jpsgPaAjAtRHkLsTx0y3AR+PrD7pUysza9QjvG+Qux01DRvLgaNKOHA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.43.0.tgz"; + sha512 = "5XxCWqYWJNoS+P6Ie2ZpUDxLRCt7FTEzmlQkCdjW6MFWOX26hAbF/wEuOTYAFKZXMIXOz0Egofik1e8v1Cg6/A=="; }; }; "@sentry/utils-6.19.7" = { @@ -10858,13 +11101,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.42.0" = { + "@sentry/utils-7.43.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.42.0"; + version = "7.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.42.0.tgz"; - sha512 = "cBiDZVipC+is+IVgsTQLJyZWUZQxlLZ9GarNT+XZOZ5BFh0acFtz88hO6+S7vGmhcx2aCvsdC9yb2Yf+BphK6Q=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.43.0.tgz"; + sha512 = "f78YfMLcgNU7+suyWFCuQhQlneXXMS+egb0EFZh7iU7kANUPRX5T4b+0C+fwaPm5gA6XfGYskr4ZnzQJLOlSqg=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -11020,13 +11263,13 @@ let sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.8.2" = { + "@serverless/utils-6.9.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.8.2"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.8.2.tgz"; - sha512 = "FW8zdG8OPoF6qgyutiMhz4m/5SxbQjoQdbaGcW3wU6xe3QzQh41Hif7I3Xuu4J62CvxiWuz19sxNDJz2mTcskw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.9.0.tgz"; + sha512 = "14tJYySFn8UVPZoaFmR8G6upZ+cOrTHrzzPYD9pN/CugarxvwOv4pVd/N66cUDMOqPyGZbV7csqYBPfxKi4qTw=="; }; }; "@sideway/address-4.1.4" = { @@ -11578,103 +11821,103 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.38" = { + "@swc/core-1.3.40" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.38.tgz"; - sha512 = "AiEVehRFws//AiiLx9DPDp1WDXt+yAoGD1kMYewhoF6QLdTz8AtYu6i8j/yAxk26L8xnegy0CDwcNnub9qenyQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.40.tgz"; + sha512 = "ZQJ+NID24PQkPIHnbO2B68YNQ6aMEyDz6dcsZucpRK4r7+aPqQ2yVLaqFcQU9VcGMyo4JJydmokzyTr1roWPIQ=="; }; }; - "@swc/core-darwin-arm64-1.3.38" = { + "@swc/core-darwin-arm64-1.3.40" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.38.tgz"; - sha512 = "4ZTJJ/cR0EsXW5UxFCifZoGfzQ07a8s4ayt1nLvLQ5QoB1GTAf9zsACpvWG8e7cmCR0L76R5xt8uJuyr+noIXA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.40.tgz"; + sha512 = "x4JHshTVB2o5xOedLL54/jsKkfUlsMw25tNM5fWkehiKWXlQuxEasl5/roceAFETWm8mEESuL8pWgZaiyTDl4Q=="; }; }; - "@swc/core-darwin-x64-1.3.38" = { + "@swc/core-darwin-x64-1.3.40" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.38.tgz"; - sha512 = "Kim727rNo4Dl8kk0CR8aJQe4zFFtsT1TZGlNrNMUgN1WC3CRX7dLZ6ZJi/VVcTG1cbHp5Fp3mUzwHsMxEh87Mg=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.40.tgz"; + sha512 = "2QaW9HtlvatiQscQACVIyKtj+vAEFEC6Tn+8rqxm8ikYHUD33M/FVXGWEvMLTI7T3P25zjhs+toAlLsjHgfzQQ=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.38" = { + "@swc/core-linux-arm-gnueabihf-1.3.40" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.38.tgz"; - sha512 = "yaRdnPNU2enlJDRcIMvYVSyodY+Amhf5QuXdUbAj6rkDD6wUs/s9C6yPYrFDmoTltrG+nBv72mUZj+R46wVfSw=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.40.tgz"; + sha512 = "cJPgSg8222gezj5Db2S8PNvcALJLokvXqvFjyzRR253SMFFkq9JKWk0uwO3wg8i8jhe78xMB6EO6AteQqFWvCg=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.38" = { + "@swc/core-linux-arm64-gnu-1.3.40" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.38.tgz"; - sha512 = "iNY1HqKo/wBSu3QOGBUlZaLdBP/EHcwNjBAqIzpb8J64q2jEN02RizqVW0mDxyXktJ3lxr3g7VW9uqklMeXbjQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.40.tgz"; + sha512 = "s76n4/vpQzV7dpS703m1WnCxyG7OfGk+EeJf+KEl/m6KP7c5MHHOLOf8hpagI/QI1H8jb9j1ADqNu2C7tEUR8Q=="; }; }; - "@swc/core-linux-arm64-musl-1.3.38" = { + "@swc/core-linux-arm64-musl-1.3.40" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.38.tgz"; - sha512 = "LJCFgLZoPRkPCPmux+Q5ctgXRp6AsWhvWuY61bh5bIPBDlaG9pZk94DeHyvtiwT0syhTtXb2LieBOx6NqN3zeA=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.40.tgz"; + sha512 = "aTkeImCq1WrkljAQNnqlbk/1ermotONkBl11GH7Ia+8yhsmgt8ZiNBIi0tJ5UjdfXDtnl58Iek43Vo8LWaPUKA=="; }; }; - "@swc/core-linux-x64-gnu-1.3.38" = { + "@swc/core-linux-x64-gnu-1.3.40" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.38.tgz"; - sha512 = "hRQGRIWHmv2PvKQM/mMV45mVXckM2+xLB8TYLLgUG66mmtyGTUJPyxjnJkbI86WNGqo18k+lAuMG2mn6QmzYwQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.40.tgz"; + sha512 = "ZsfVlzXSXvNZBuK1fCrenoLSLVv0Zk7OdmkAG9cWN3bKkc/ynxO+6njXLEKWfv9bRfDBXhxifyHGOVOQlIFIAA=="; }; }; - "@swc/core-linux-x64-musl-1.3.38" = { + "@swc/core-linux-x64-musl-1.3.40" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.38.tgz"; - sha512 = "PTYSqtsIfPHLKDDNbueI5e0sc130vyHRiFOeeC6qqzA2FAiVvIxuvXHLr0soPvKAR1WyhtYmFB9QarcctemL2w=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.40.tgz"; + sha512 = "5GgMuadbd6fhHg/+7W25i+9OQTW4nTMGECias0BNPlcW8nnohzSphpj5jLI/Ub5bWzMwE2hua6e2uiZ17rTySg=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.38" = { + "@swc/core-win32-arm64-msvc-1.3.40" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.38.tgz"; - sha512 = "9lHfs5TPNs+QdkyZFhZledSmzBEbqml/J1rqPSb9Fy8zB6QlspixE6OLZ3nTlUOdoGWkcTTdrOn77Sd7YGf1AA=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.40.tgz"; + sha512 = "TqiK28eaK3YOKSp8iESlrrbSzDGRQqM0zR4hvCgfHwL4L1BPh/M0aIMC/vyYh2gqpz2quyNqgi/DxoZ2+WxlUg=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.38" = { + "@swc/core-win32-ia32-msvc-1.3.40" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.38.tgz"; - sha512 = "SbL6pfA2lqvDKnwTHwOfKWvfHAdcbAwJS4dBkFidr7BiPTgI5Uk8wAPcRb8mBECpmIa9yFo+N0cAFRvMnf+cNw=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.40.tgz"; + sha512 = "PqtCXFs5+ZbrfFe1VZAcCl8k9h47wE65mKDhDvZ9/SQhXxZX2+f5mUGXuH4G5rA0CyijsVpHnpA/5rqE7f2Sxw=="; }; }; - "@swc/core-win32-x64-msvc-1.3.38" = { + "@swc/core-win32-x64-msvc-1.3.40" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.38.tgz"; - sha512 = "UFveLrL6eGvViOD8OVqUQa6QoQwdqwRvLtL5elF304OT8eCPZa8BhuXnWk25X8UcOyns8gFcb8Fhp3oaLi/Rlw=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.40.tgz"; + sha512 = "73DGsjsJYSzmoRbfomPj5jcQawtK2H0bCDi/1wgfl8NKVOuzrq+PpaTry3lzx+gvTHxUX6mUHV22i7C9ITL74Q=="; }; }; "@swc/helpers-0.4.14" = { @@ -11686,13 +11929,13 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.38" = { + "@swc/wasm-1.3.40" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.38"; + version = "1.3.40"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.38.tgz"; - sha512 = "7A4T9/R48J4Vy/1DB2yYuY29CYNgyqDgvlTW1rdaGJGv7i7TxTmx6lnMm4b8/MU+TUJ5NRL/MDPVjmQ8Vwkwbg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.40.tgz"; + sha512 = "fNhs61C4rb4GfUQbAsKRLUn3EOU2Rar/plWP8Zlvn83/c298FioGyVI2WJ/Ya3RBDGMjIeXht/6uKFtNBVNtbQ=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -12307,6 +12550,15 @@ let sha512 = "rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ=="; }; }; + "@types/eslint-8.21.2" = { + name = "_at_types_slash_eslint"; + packageName = "@types/eslint"; + version = "8.21.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.2.tgz"; + sha512 = "EMpxUyystd3uZVByZap1DACsMXvb82ypQnGn89e1Y0a+LYu3JJscUd/gqhRsVFDkaD2MIiWo0MT8EfXr3DGRKw=="; + }; + }; "@types/eslint-scope-3.7.4" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; @@ -12919,13 +13171,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.14" = { + "@types/node-16.18.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.14"; + version = "16.18.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.14.tgz"; - sha512 = "wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.15.tgz"; + sha512 = "a5RBe4vw4bFITL6351US4glblsc0m7JKfm9RpSl9f/rSAXmZmulIEzk7fvpWFr14iJCvKxV7sQUqI0bwee0iVw=="; }; }; "@types/node-16.9.1" = { @@ -12946,15 +13198,6 @@ let sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; - "@types/node-18.14.4" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "18.14.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.4.tgz"; - sha512 = "VhCw7I7qO2X49+jaKcAUwi3rR+hbxT5VcYF493+Z5kMLI0DL568b7JI4IDJaxWFH0D/xwmGJNoXisyX+w7GH/g=="; - }; - }; "@types/node-18.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12973,6 +13216,24 @@ let sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w=="; }; }; + "@types/node-18.15.1" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.15.1.tgz"; + sha512 = "U2TWca8AeHSmbpi314QBESRk7oPjSZjDsR+c+H4ECC1l+kFgpZf8Ydhv3SJpPy51VyZHHqxlb6mTTqYNNRVAIw=="; + }; + }; + "@types/node-18.15.2" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "18.15.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-18.15.2.tgz"; + sha512 = "sDPHm2wfx2QhrMDK0pOt2J4KLJMAcerqWNvnED0itPRJWvI+bK+uNHzcH1dFsBlf7G3u8tqXmRF3wkvL9yUwMw=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -13594,13 +13855,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.54.1" = { + "@typescript-eslint/eslint-plugin-5.55.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz"; - sha512 = "a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.55.0.tgz"; + sha512 = "IZGc50rtbjk+xp5YQoJvmMPmJEYoC53SiKPXyqWfv15XoD2Y5Kju6zN0DwlmaGJp1Iw33JsWJcQ7nw0lGCGjVg=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13621,13 +13882,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.54.1" = { + "@typescript-eslint/parser-5.55.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz"; - sha512 = "8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.55.0.tgz"; + sha512 = "ppvmeF7hvdhUUZWSd2EEWfzcFkjJzgNQzVST22nzg958CR+sphy8A6K7LXQZd6V75m1VKjp+J4g/PCEfSCmzhw=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13639,22 +13900,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.54.1" = { + "@typescript-eslint/scope-manager-5.55.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz"; - sha512 = "zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz"; + sha512 = "OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw=="; }; }; - "@typescript-eslint/type-utils-5.54.1" = { + "@typescript-eslint/type-utils-5.55.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.1.tgz"; - sha512 = "WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.55.0.tgz"; + sha512 = "ObqxBgHIXj8rBNm0yh8oORFrICcJuZPZTqtAFh0oZQyr5DnAHZWfyw54RwpEEH+fD8suZaI0YxvWu5tYE/WswA=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13666,13 +13927,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.54.1" = { + "@typescript-eslint/types-5.55.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz"; - sha512 = "G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.55.0.tgz"; + sha512 = "M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13684,22 +13945,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.54.1" = { + "@typescript-eslint/typescript-estree-5.55.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz"; - sha512 = "bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz"; + sha512 = "I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ=="; }; }; - "@typescript-eslint/utils-5.54.1" = { + "@typescript-eslint/utils-5.55.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.1.tgz"; - sha512 = "IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.55.0.tgz"; + sha512 = "FkW+i2pQKcpDC3AY6DU54yl8Lfl14FVGYDgBTyGKB75cCwV3KpkpTMFi9d9j2WAJ4271LR2HeC5SEWF/CZmmfw=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13711,13 +13972,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.54.1" = { + "@typescript-eslint/visitor-keys-5.55.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.54.1"; + version = "5.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz"; - sha512 = "q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz"; + sha512 = "q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13774,22 +14035,22 @@ let sha512 = "LjnbQWGeMwaydmovx8jWUR8BxLtLiPyq0xz5C8G5OvFhsuJxvavLdrBHNNizvr1dq7/3qZGlPv0znsvU4P44YA=="; }; }; - "@vanilla-extract/css-1.9.5" = { + "@vanilla-extract/css-1.10.0" = { name = "_at_vanilla-extract_slash_css"; packageName = "@vanilla-extract/css"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.9.5.tgz"; - sha512 = "aVSv6q24zelKRtWx/l9yshU3gD1uCDMZ2ZGcIiYnAcPfyLryrG/1X5DxtyiPKcyI/hZWoteHofsN//2q9MvzOA=="; + url = "https://registry.npmjs.org/@vanilla-extract/css/-/css-1.10.0.tgz"; + sha512 = "s/EFfLDKbU1c2jnELNl+l14AufvIyryDh09ZZxRRqKjRKitiKvEjoiUy964pGKmfHngc9O0mkbzqrbhWaH+96Q=="; }; }; - "@vanilla-extract/integration-6.1.2" = { + "@vanilla-extract/integration-6.2.1" = { name = "_at_vanilla-extract_slash_integration"; packageName = "@vanilla-extract/integration"; - version = "6.1.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.1.2.tgz"; - sha512 = "80Qff+mry4aUC3O2xv6N+FzylI9L64ZZ5THXUKFueZNTTswqgnxLlT9Nsf1nQYtvaZjavorVt3qpq+aakBZHvg=="; + url = "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.1.tgz"; + sha512 = "+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg=="; }; }; "@vanilla-extract/private-1.0.3" = { @@ -16906,6 +17167,15 @@ let sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; }; }; + "applicationinsights-2.5.0" = { + name = "applicationinsights"; + packageName = "applicationinsights"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.5.0.tgz"; + sha512 = "6kIFmpANRok+6FhCOmO7ZZ/mh7fdNKn17BaT13cg/RV5roLPJlA6q8srWexayHd3MPcwMb9072e8Zp0P47s/pw=="; + }; + }; "applicationinsights-native-metrics-0.0.9" = { name = "applicationinsights-native-metrics"; packageName = "applicationinsights-native-metrics"; @@ -17248,13 +17518,22 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; - "array-back-4.0.2" = { + "array-back-6.2.2" = { name = "array-back"; packageName = "array-back"; - version = "4.0.2"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz"; - sha512 = "NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="; + url = "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz"; + sha512 = "gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw=="; + }; + }; + "array-buffer-byte-length-1.0.0" = { + name = "array-buffer-byte-length"; + packageName = "array-buffer-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; + sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; }; }; "array-differ-1.0.0" = { @@ -18004,13 +18283,13 @@ let sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; }; - "async-append-only-log-3.1.4" = { + "async-append-only-log-4.3.9" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.1.4"; + version = "4.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.4.tgz"; - sha512 = "mPh8K1iI2ysWCEXGFDnhFeRpkT4wl6mshO/KAzRpzU60oi2+RMGCVjTZ0hZAjIK5z+iDMj6NiITlt99qYmUScA=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-4.3.9.tgz"; + sha512 = "yxOksjv7ZQT+LVT9BfaWnKRZizL12SgmCGSRi1Zzm1LVvtg6iM7jBIP7E5uY9lrlv3CqSzXyQ5Mv8nY9McYY+g=="; }; }; "async-done-1.3.2" = { @@ -18274,13 +18553,13 @@ let sha512 = "Eh6pW+fRC2/1RxPq3hO8+PkZKv+wujzKky2MP/n69eC8yMkbNFfuEb/riZHqf13M7gr6Hvglpk/kISgBSBb6bQ=="; }; }; - "atomic-file-rw-0.2.2" = { + "atomic-file-rw-0.3.0" = { name = "atomic-file-rw"; packageName = "atomic-file-rw"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.2.2.tgz"; - sha512 = "XZOcMIc32aIDxKFJGpYIPZ7H0p+Zmu3xAYyKDMmRgSQMNR97E8byl4tQa9vkYv4x8dNcYRQV8tw+KvtiKua0xQ=="; + url = "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.3.0.tgz"; + sha512 = "XMFpe/ub9Mwdlyq3DUdOc/g2sdutDMdYw0XNFSvNGQpYdmxqVmLbeklu5KhemUYyrAj1kIrwoHOx6IxA3a7w3A=="; }; }; "atomic-sleep-1.0.0" = { @@ -18418,22 +18697,22 @@ let sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ=="; }; }; - "aws-sdk-2.1331.0" = { + "aws-sdk-2.1333.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1331.0"; + version = "2.1333.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1331.0.tgz"; - sha512 = "zrA1ymbt/D4GtieF7FuiZacv1fp9BBp9qnHUmy0YbPd9dwH5iwPIFkzdGTABbQ+F3a6b//AjtTpcF/JGVjCtTw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1333.0.tgz"; + sha512 = "MvOuleNeRryJtkCGXGEWDHPqqgxuqdi4/hGzJEpn9tnjsW9LNK8UgFPpYzUZ24ZO/3S+jiUh8DMMrL5nVGnagg=="; }; }; - "aws-sdk-2.1332.0" = { + "aws-sdk-2.1334.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1332.0"; + version = "2.1334.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1332.0.tgz"; - sha512 = "WuzpeiVv+80gPDv+foHTDap0FW0OkBax+wXf8frm1mub0aBOAGJ2rGnTaCbNVPOZ5zbMFSiEuODvlebMdWBnRg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1334.0.tgz"; + sha512 = "nJuV8QYY39sI1Q7u7Dsd2XcxDkUG/Z5oGosc41LrTBAHQjPib3rXV06zaL9jS+4yQ9Ko7qon2f/0ZVVuUPJjDA=="; }; }; "aws-sign2-0.6.0" = { @@ -19057,13 +19336,13 @@ let sha512 = "ZNB4525U7BxT6v9C8LEtywyCgB4Pjnm7/bh+ru/Z9Ecxvg3fDjaJ6z305z9a61orQdbB1zqYHh5JbUqx4s4K0g=="; }; }; - "bash-language-server-4.8.2" = { + "bash-language-server-4.8.3" = { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.2.tgz"; - sha512 = "B/jBGVeRMdQs+fHkEDycxD6L8/nf2WwoH3r+kt+O4GqknZ9AX3gNVE8sGjCOf0iLEvAChi6tqefYRRY2nKM4xw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.3.tgz"; + sha512 = "NJXqzNOClxJ/G6Hr8gafvqcBiY1iNvBACxZlz5tOPyoloTeqyOtl6C9yZUxW8ryW8GAJ2TUS479ly5tq9kjEBA=="; }; }; "basic-auth-1.1.0" = { @@ -20542,6 +20821,15 @@ let sha512 = "OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ=="; }; }; + "broadcast-channel-3.7.0" = { + name = "broadcast-channel"; + packageName = "broadcast-channel"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz"; + sha512 = "cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg=="; + }; + }; "broadcast-stream-0.2.2" = { name = "broadcast-stream"; packageName = "broadcast-stream"; @@ -21173,6 +21461,15 @@ let sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="; }; }; + "buffer-xor-2.0.2" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz"; + sha512 = "eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ=="; + }; + }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -21974,13 +22271,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001464" = { + "caniuse-lite-1.0.30001465" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001464"; + version = "1.0.30001465"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz"; - sha512 = "oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001465.tgz"; + sha512 = "HvjgL3MYAJjceTDCcjRnQGjwUz/5qec9n7JPOzUursUoOTIsYCSDOb1l7RsnZE8mjbxG78zVRCKfrBXyvChBag=="; }; }; "canvas-2.11.0" = { @@ -22136,22 +22433,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.7.25" = { + "cdk8s-2.7.30" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.7.25"; + version = "2.7.30"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.25.tgz"; - sha512 = "MwCZvNn14EWibak5RM+CfgMJwZ+mpUrtUyrxhedAsA4pSELHUNpVUqYsLRBJwbabWRV7N0cUwaZVeU9XYMLe1A=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.7.30.tgz"; + sha512 = "wAfEYBxSfCcEQH6Dprba5Cji6uNA3ZYaxRgeIRdz43IbfnyAJCnw7kg4+UOyyLD25fCleUqyf27oAsuWe+8c7g=="; }; }; - "cdk8s-plus-25-2.4.47" = { + "cdk8s-plus-25-2.5.4" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.4.47"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.47.tgz"; - sha512 = "2iNl2XWT+T9zKtW+xaEJQBxNs9b2Ol3RL+FglrH1FnPnm+WiCl+/P1S7OAKtybZtzBXykImp/oCSz3vQ8+d3gg=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.5.4.tgz"; + sha512 = "w7eEazp2gDny4HlcrcMzp60Tm0A0ykbiKmUFrVytMWNKvU9huKgQ9QdZ1huilLgc+UOwZzbweCPofrPHQr+sJA=="; }; }; "cdktf-0.15.5" = { @@ -22172,6 +22469,15 @@ let sha512 = "Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ=="; }; }; + "chacha20-universal-1.0.4" = { + name = "chacha20-universal"; + packageName = "chacha20-universal"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chacha20-universal/-/chacha20-universal-1.0.4.tgz"; + sha512 = "/IOxdWWNa7nRabfe7+oF+jVkGjlr2xUL4J8l/OvzZhj+c9RpMqoo3Dq+5nU1j/BflRV4BKnaQ4+4oH1yBpQG1Q=="; + }; + }; "chai-4.3.7" = { name = "chai"; packageName = "chai"; @@ -24134,13 +24440,13 @@ let sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g=="; }; }; - "command-line-usage-6.1.3" = { + "command-line-usage-7.0.1" = { name = "command-line-usage"; packageName = "command-line-usage"; - version = "6.1.3"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz"; - sha512 = "sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw=="; + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-7.0.1.tgz"; + sha512 = "NCyznE//MuTjwi3y84QVUGEOT+P5oto1e1Pk/jFPVdPPfsG03qpTIl3yw6etR+v73d0lXsoojRpvbru2sqePxQ=="; }; }; "commander-0.6.1" = { @@ -24917,13 +25223,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.272" = { + "constructs-10.1.276" = { name = "constructs"; packageName = "constructs"; - version = "10.1.272"; + version = "10.1.276"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.272.tgz"; - sha512 = "Rn5nwQoWjsVTeUOXqPsXE//uwd2Aj6Ln59/PTNIgyCUVuRMgRGTuKNT5w4cDauJWYnwsE+z15v2AvcHA85RToA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.276.tgz"; + sha512 = "NMYSBZfI0oe1InCer25WPK8X2z5ZCA2yyBrv0xH5uqs9YftE0TyKXV4pLVFf5SDNBJVXLWhq5rxRfGiGt/lvtg=="; }; }; "consume-http-header-1.0.0" = { @@ -25584,22 +25890,22 @@ let sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; - "core-js-3.29.0" = { + "core-js-3.29.1" = { name = "core-js"; packageName = "core-js"; - version = "3.29.0"; + version = "3.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; - sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz"; + sha512 = "+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw=="; }; }; - "core-js-compat-3.29.0" = { + "core-js-compat-3.29.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.29.0"; + version = "3.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; - sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.1.tgz"; + sha512 = "QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA=="; }; }; "core-util-is-1.0.2" = { @@ -26151,22 +26457,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-6.28.0" = { + "cspell-dictionary-6.29.2" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.28.0.tgz"; - sha512 = "7RSap81rJ2JVENuErrcKqfN1rBfDN8UIJSn5uoQZj2Boz/IfV24wGs0izXcJ+jpZI9L5PoT0XpMyuT93rwo+hA=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-6.29.2.tgz"; + sha512 = "JYaVa8XYjUYhUZIg7eLcPN17r2C4Y6//j97i522Pxf4SG5Y3TdJmdjSLaATQFdRdgAs2a9M2Em85MmTgX9tSBQ=="; }; }; - "cspell-gitignore-6.28.0" = { + "cspell-gitignore-6.29.2" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.28.0.tgz"; - sha512 = "AOlblIJsoMk8F7+CznmhUIM+jGpIP/rBFERo5yT7bF7GarO2MoONxFA5MauSDnRaIDxMuik/gCn4MzvgT8ZZgw=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.29.2.tgz"; + sha512 = "gYsdjwMQz619zHpodpCQeYUewp2ZBBrPqd7XK6ik6FRvKTRDGViB7vzv0b2hgwnY3wwsI/RSvS0ituk3EsVZyg=="; }; }; "cspell-glob-0.1.25" = { @@ -26178,22 +26484,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-6.28.0" = { + "cspell-glob-6.29.2" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.28.0.tgz"; - sha512 = "588E4RdswSNRoXf9mPtDxc+aSP3rpRwmJCrLEPtV6FdbG0YJDQOAmV2jP2qRqVouWOHjZZ84HwN79jfWt1ROsA=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.29.2.tgz"; + sha512 = "Ty8BrLYC4DNU9hENnkI1BQkFHcc2N2GqJEBtrT/ZxUksyuj6qdpnhqJW7R0D1vp/r2u4CR1GB8QBQyp+CdV8Lg=="; }; }; - "cspell-grammar-6.28.0" = { + "cspell-grammar-6.29.2" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.28.0.tgz"; - sha512 = "MQaaGn+aJxsUnYxi6yHeU0RvsD3ARo6/14aipbrx11uZYZjm8dDQVPFabW98aPjO7zd0qNuB6FBS/3FK6nbKkg=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.29.2.tgz"; + sha512 = "mhK6+MWmZ06npeBfVi0LkwcXIeQ6EZaMNH8pctotOTCdgs0LtynCWICqSNSQG4dCEdTzjmORYqOOFh/eDol1QA=="; }; }; "cspell-io-4.1.7" = { @@ -26205,13 +26511,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-6.28.0" = { + "cspell-io-6.29.2" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.28.0.tgz"; - sha512 = "h/KtXQDX1c7q/0tZvBlYe0MyaqmtJZ1dcL9kInQXrFhLnw3IPXcS3Nwux+FRj7DXJp5uXbM80hEu54z8fDnT6g=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.29.2.tgz"; + sha512 = "8qkEdAwpY2Cgk3ZIC7MhX/b6QCmx0/xyvyAwMe4Esnj4+Z6RvgAs7coTH2mQd+hUEfwnX2TRP6ZBkkHte1Klkg=="; }; }; "cspell-lib-4.3.12" = { @@ -26223,13 +26529,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-6.28.0" = { + "cspell-lib-6.29.2" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.28.0.tgz"; - sha512 = "J24iWuaWU3O4L+4//wS3TA/Dw1GEqzZqeKsufOlpgU+P1+VplPaoIKmKBK44nM7RBPEz+fbyUxhnksLKD1tRmQ=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.29.2.tgz"; + sha512 = "bQGB97N/zXECCT6cjfWkSV7hpYagYTlhSvH2+LbqVgffVNbnW14pL2l3IHpM3wh7Ju3WC7w6AjnbK0bAwH/kZA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -26241,13 +26547,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-6.28.0" = { + "cspell-trie-lib-6.29.2" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.28.0.tgz"; - sha512 = "pF+C60Fdclg5oxXdnyA2biP6WjckaTs/eNMPTxbmQOEAraujZVyGFL3b464dwW9dJ8Qz1FuQc7fhQADelN2LrA=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.29.2.tgz"; + sha512 = "uBK4QNYy65u/wZDQCIzEQ/BJurnQRUEEYk+aWvjn2PSbXBlfnQWC53ncrPIUFUTxNDycbuU7XSZ/XAR28gTfgw=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -28149,6 +28455,15 @@ let sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg=="; }; }; + "decimal.js-10.3.1" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz"; + sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; + }; + }; "decimal.js-10.4.3" = { name = "decimal.js"; packageName = "decimal.js"; @@ -30228,13 +30543,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "ejs-3.1.8" = { + "ejs-3.1.9" = { name = "ejs"; packageName = "ejs"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz"; + sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; "electron-packager-17.1.1" = { @@ -30246,22 +30561,13 @@ let sha512 = "r1NDtlajsq7gf2EXgjRfblCVPquvD2yeg+6XGErOKblvxOpDi0iulZLVhgYDP4AEF1P5/HgbX/vwjlkEv7PEIQ=="; }; }; - "electron-to-chromium-1.4.325" = { + "electron-to-chromium-1.4.328" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.325"; + version = "1.4.328"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.325.tgz"; - sha512 = "K1C03NT4I7BuzsRdCU5RWkgZxtswnKDYM6/eMhkEXqKu4e5T+ck610x3FPzu1y7HVFSiQKZqP16gnJzPpji1TQ=="; - }; - }; - "electron-to-chromium-1.4.326" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.326"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.326.tgz"; - sha512 = "tFNZP7VlGDp88vR7TYQ/h5svw8lzfu44PU5tfDJ+JYdcsEuWv4GpEm7hOF3c4Z/o4QQ6lNxmlGtvGaBVMRM9uQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.328.tgz"; + sha512 = "DE9tTy2PNmy1v55AZAO542ui+MLC2cvINMK4P2LXGsJdput/ThVG9t+QGecPuAZZSgC8XoI+Jh9M1OG9IoNSCw=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -30851,6 +31157,24 @@ let sha512 = "/DhCJDf5DSFK32joQiWRpWrT0h7p3hVQfMKxiBb7Nt8C8IF8BYyPtclDnuGGLOoj16d/8udKeiE7JbkotDmorQ=="; }; }; + "envelope-js-1.3.2" = { + name = "envelope-js"; + packageName = "envelope-js"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/envelope-js/-/envelope-js-1.3.2.tgz"; + sha512 = "U3MQnyczN9QvwgXWlxDzAiEbNjwGD1aG+l1fNdwSZijOYboiu1aLHT8vIPSITShLiD4+n9p+EEwR79rp0vsKdw=="; + }; + }; + "envelope-spec-1.1.1" = { + name = "envelope-spec"; + packageName = "envelope-spec"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envelope-spec/-/envelope-spec-1.1.1.tgz"; + sha512 = "7eIn5kw7eIt2H2YEPE5oWT8ATx9AYkVFKQi4GG+3qRxgcBKmPWt71OOI3DE4Do/hryZohh9eamoxGhSgZGQpIw=="; + }; + }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -30969,13 +31293,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.21.1" = { + "es-abstract-1.21.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; - sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; + sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; }; }; "es-aggregate-error-1.0.9" = { @@ -31203,6 +31527,15 @@ let sha512 = "71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg=="; }; }; + "esbuild-0.17.6" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.17.6"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.6.tgz"; + sha512 = "TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -31761,13 +32094,13 @@ let sha512 = "nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ=="; }; }; - "eslint-8.35.0" = { + "eslint-8.36.0" = { name = "eslint"; packageName = "eslint"; - version = "8.35.0"; + version = "8.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; - sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz"; + sha512 = "Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw=="; }; }; "eslint-config-prettier-6.15.0" = { @@ -32121,6 +32454,15 @@ let sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; }; }; + "espree-9.5.0" = { + name = "espree"; + packageName = "espree"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz"; + sha512 = "JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw=="; + }; + }; "esprima-1.2.2" = { name = "esprima"; packageName = "esprima"; @@ -32751,13 +33093,13 @@ let sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; }; }; - "execa-7.0.0" = { + "execa-7.1.0" = { name = "execa"; packageName = "execa"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-7.0.0.tgz"; - sha512 = "tQbH0pH/8LHTnwTrsKWideqi6rFB/QNUawEwrn+WHyz7PX1Tuz2u7wfTvbaNBdP5JD5LVWxNo8/A8CHNZ3bV6g=="; + url = "https://registry.npmjs.org/execa/-/execa-7.1.0.tgz"; + sha512 = "T6nIJO3LHxUZ6ahVRaxXz9WLEruXLqdcluA+UuTptXmLM7nDAn9lx9IfkxPyzEL21583qSt4RmL44pO71EHaJQ=="; }; }; "execall-1.0.0" = { @@ -33849,13 +34191,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastpriorityqueue-0.7.3" = { + "fastpriorityqueue-0.7.4" = { name = "fastpriorityqueue"; packageName = "fastpriorityqueue"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.3.tgz"; - sha512 = "1+DZ5cjw6irYFvkmn4RqfmSZ0o7xgAqDtdO4wXYw2fxBrYIgUxEljrN/RYxIXwj6k08dIzNq+lkeYxwcxwZfuw=="; + url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.4.tgz"; + sha512 = "u7o5oa9R7CMOHo2i8P2/T2nRg5bg/0dDegDSJVzkVkMf/A318LNnujNLfpxlJeXUdDAefrVPqsDV624vUyxNfA=="; }; }; "fastq-1.15.0" = { @@ -35748,13 +36090,13 @@ let sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; }; }; - "fswin-3.23.119" = { + "fswin-3.23.311" = { name = "fswin"; packageName = "fswin"; - version = "3.23.119"; + version = "3.23.311"; src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-3.23.119.tgz"; - sha512 = "OzyPAua0GO/ii2z+uB2IdqU+5rvWJy1dX6/K0PQm82tPl/gh59Js84RArk06TxpPq7/WiHOpM56Fo8UnphPhow=="; + url = "https://registry.npmjs.org/fswin/-/fswin-3.23.311.tgz"; + sha512 = "MKiaXljyEA7D9AXP1X0bCsgn1b1PEIo0P9pHKsxz6BLXZFIpfY1jYs8biRaVWlDEFkK10E3jD99mwpUZhVVCkQ=="; }; }; "ftp-0.3.10" = { @@ -35820,6 +36162,15 @@ let sha512 = "cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="; }; }; + "futoin-hkdf-1.5.1" = { + name = "futoin-hkdf"; + packageName = "futoin-hkdf"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/futoin-hkdf/-/futoin-hkdf-1.5.1.tgz"; + sha512 = "g5d0Qp7ks55hYmYmfqn4Nz18XH49lcCR+vvIvHT92xXnsJaGZmY1EtWQWilJ6BQp57heCIXM/rRo+AFep8hGgg=="; + }; + }; "fuzzy-0.1.3" = { name = "fuzzy"; packageName = "fuzzy"; @@ -37270,6 +37621,15 @@ let sha512 = "FrGuJWxYqWfptGEHkXQkR4CvLOOvbJL9cgPyiGGwtRMJCuUgJHyEdhkTVjQYbOl6pdXFTR9EHd9wkXHeA6zmGw=="; }; }; + "goldengate-12.0.4" = { + name = "goldengate"; + packageName = "goldengate"; + version = "12.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-12.0.4.tgz"; + sha512 = "s4bd33VyaT76HXLc6Hcefn/M9yQjiJhDJZnXrCeha5JCL8qDRRjgbglgYMCOKj2Odn3GIEUVK3SLpYtqm48MIA=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -37297,13 +37657,13 @@ let sha512 = "1M0NG5VDIvJZEnstHbRdckLZESoJwguinwN8Dhae0j2ZKIQFIV63zxm6Fo6nM4xkgqUr2bbMtV5Dgo+Hy6oo0Q=="; }; }; - "google-gax-3.5.7" = { + "google-gax-3.5.8" = { name = "google-gax"; packageName = "google-gax"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.7.tgz"; - sha512 = "taDGwR9Ry5y6NkcPYKe0B3wr7rCwaImZZIuWajUcFe9Y8L71eBtaq0+ZJ62JByzr/2cJkd9EN1rr52rD6V/UDA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-3.5.8.tgz"; + sha512 = "bkqxv7YdYP3FGh+dywvgyctj8XM07toJ/JCWwAkmmE15QTt3ieF/f7Hpz7xG85+dGmZtQR8Y+yMo0ENFmhypNA=="; }; }; "google-p12-pem-3.1.4" = { @@ -37540,13 +37900,13 @@ let sha512 = "kAxja6QDjw5oTJOFtrqhaQlLfCco3AwO4Mb4YRdP8A+v59roJA8mgEd0S5dOgFPyn74bPp8VWaKCI+of8wnPow=="; }; }; - "grammy-1.14.1" = { + "grammy-1.15.1" = { name = "grammy"; packageName = "grammy"; - version = "1.14.1"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.14.1.tgz"; - sha512 = "hFIW2DE2xF5yuYL5a65i/0lvqsAwQsIaJO64Fk0N7v696nTSu7g0LqnQnHapmydRkNMoZVbwn25M80LKZzUkxw=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.15.1.tgz"; + sha512 = "kyD/x1yUlyoF1s/m8vt5YPFV+XyC+BEixHXRmVT67c7cmIBpeIIQSdLdWhjeMXGuXEJA+Q7rEDMvkp0vSc0uSQ=="; }; }; "grant-5.4.21" = { @@ -40294,13 +40654,13 @@ let sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg=="; }; }; - "immutable-4.2.4" = { + "immutable-4.3.0" = { name = "immutable"; packageName = "immutable"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz"; - sha512 = "WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w=="; + url = "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"; + sha512 = "0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="; }; }; "import-cwd-2.1.0" = { @@ -40411,13 +40771,13 @@ let sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; }; - "import-meta-resolve-2.2.1" = { + "import-meta-resolve-2.2.2" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.1.tgz"; - sha512 = "C6lLL7EJPY44kBvA80gq4uMsVFw5x3oSKfuMl1cuZ2RkI5+UJqQXgn+6hlUew0y4ig7Ypt4CObAAIzU53Nfpuw=="; + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-2.2.2.tgz"; + sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; "imurmurhash-0.1.4" = { @@ -40663,6 +41023,15 @@ let sha512 = "firNp1q3xxTzoItj/eOOSZQnYSlyrWks5llCTVX37nJ59K3eXbQ8PtzCguqo8YI19EELo5QxaKnJd4VxzhU8tg=="; }; }; + "ink-divider-3.0.0" = { + name = "ink-divider"; + packageName = "ink-divider"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ink-divider/-/ink-divider-3.0.0.tgz"; + sha512 = "Mqb9WArtEZCtXw622aHhJqPK157QNc+8ssl9/RvAZlS6nZRCKyW4mYOYCudQh6dSuFGt9eG5yaqT1mJaGmwu+w=="; + }; + }; "ink-select-input-4.2.2" = { name = "ink-select-input"; packageName = "ink-select-input"; @@ -41248,13 +41617,13 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; - "ip-num-1.5.0" = { + "ip-num-1.5.1" = { name = "ip-num"; packageName = "ip-num"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ip-num/-/ip-num-1.5.0.tgz"; - sha512 = "XPStGtjDEDgaJXZhteWoIYZe2SaLWOzlpqwUmcx2W8UAA3lBY9oTyNNJ3fTnnW9Y4Px9f6Qi1mUqeFb9/dTIwQ=="; + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.5.1.tgz"; + sha512 = "QziFxgxq3mjIf5CuwlzXFYscHxgLqdEdJKRo2UJ5GurL5zrSRMzT/O+nK0ABimoFH8MWF8YwIiwECYsHc1LpUQ=="; }; }; "ip-regex-2.1.0" = { @@ -41401,13 +41770,13 @@ let sha512 = "kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="; }; }; - "irregular-plurals-3.4.1" = { + "irregular-plurals-3.5.0" = { name = "irregular-plurals"; packageName = "irregular-plurals"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.1.tgz"; - sha512 = "JR7VL+1Kd9z79bE+2uSgifpzrTwLWmTvyeUewhxZCHVtpPImAsLk4adfRxg86uvdsJ8etYYrpzN7vRT30gGnOA=="; + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz"; + sha512 = "1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ=="; }; }; "is-3.3.0" = { @@ -41626,6 +41995,15 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; + "is-buffer-zero-1.0.0" = { + name = "is-buffer-zero"; + packageName = "is-buffer-zero"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer-zero/-/is-buffer-zero-1.0.0.tgz"; + sha512 = "eqgpqrTMGaAd5dQxg0dcZ79C8wTlDVYrM+zvB8kUXXSBzOqG5JeKWne1Zv9LDV3ePovx06fHLbp372OFbp/cIA=="; + }; + }; "is-callable-1.2.7" = { name = "is-callable"; packageName = "is-callable"; @@ -42202,6 +42580,15 @@ let sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; }; }; + "is-my-ssb-valid-1.2.2" = { + name = "is-my-ssb-valid"; + packageName = "is-my-ssb-valid"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-ssb-valid/-/is-my-ssb-valid-1.2.2.tgz"; + sha512 = "13B1KdYuXwfVASWWWAKcbtKHtXhFNzLtg16oKh/3UTAWVh9GBdf/zjvY9BFY3xYsYFQYC1WhZEuifbYRzeiz7w=="; + }; + }; "is-nan-1.3.2" = { name = "is-nan"; packageName = "is-nan"; @@ -43498,13 +43885,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-4.1.0" = { + "jitdb-7.0.7" = { name = "jitdb"; packageName = "jitdb"; - version = "4.1.0"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-4.1.0.tgz"; - sha512 = "j6PZcTup+evIz+cVy8wDB6+GlV20/YvgDKCQtV7FBTBgYhl8FtpurUclcHz+C4OerMRosaKRX1doxTWgWoCmBQ=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-7.0.7.tgz"; + sha512 = "D/b1uyZzEvQewg9gDamgkCjvCji3ZYnirG86p3VHm/UzCohASd6ojLZrRPZHlsDRWsO5qhZxBzWoH7fSRtztdA=="; }; }; "jiti-1.17.1" = { @@ -44102,13 +44489,13 @@ let sha512 = "gOpK7YxGb64Fwy6zvEpRV3umC3u77HAmltP3kSF/eGPmM04ggTQ17UEfN+XsEO4NXJh1LDniMDyMjOIa3QViBw=="; }; }; - "jsii-srcmak-0.1.847" = { + "jsii-srcmak-0.1.851" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.847"; + version = "0.1.851"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.847.tgz"; - sha512 = "icCv6UlSCYsijfZK6Mxik6A0YehtZKRJ8lRotJw24Ynw+lBh9aPhFYhfx9Q6m8Y8YqijLc2yxemMMiLpgdcTbg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.851.tgz"; + sha512 = "ubv/cm0hrZouHpvP8UVZ50dzC4Tpp4Nwpyobkhit75fCrwswYTsHMUYIk2Y/IpVr/EgPikWOdeIy2Cnh78Hn7A=="; }; }; "json-bigint-1.0.0" = { @@ -44480,13 +44867,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2jsii-0.3.299" = { + "json2jsii-0.3.303" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.299"; + version = "0.3.303"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.299.tgz"; - sha512 = "Yu2EgEUmYS9o+YhD8KqriTdfuh8S3KcghqELPC0YpQ09fTa5Jal3zkzNLefsY/UeqsJvUXBIBTr30l3lmpJKUg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.303.tgz"; + sha512 = "1r9duZYWpV5UsJF3olAdp0fi8RpeQoBS3rsf90jiWeZTzs9bZLaJGN6vRiKiLPXbXVROBNk/DOd3AB2HHi6JUg=="; }; }; "json3-3.2.6" = { @@ -46154,13 +46541,22 @@ let sha512 = "oGnfMICKd0cmGxHdXG6VW5Ha/TLVgHJxCCYxHHyOO0PKAAweK8yUV8d0CUfgHaV/rUybTxbQ+oRhMQ6M7yPtyg=="; }; }; - "lightning-7.1.2" = { + "lightning-7.1.3" = { name = "lightning"; packageName = "lightning"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-7.1.2.tgz"; - sha512 = "rT/94wdCV2rO4o1KLmQGwK6JoN3/IqyO0fduMK9TN7UNd1yq23b0lUNPR8Xm/zvD6CTnxStmQxjZLqJXAdnPZw=="; + url = "https://registry.npmjs.org/lightning/-/lightning-7.1.3.tgz"; + sha512 = "nc8QXGABpYzjywzyaXNe888C29CbhW5crDR2W7DolHI70Hr3wLIUQvINF2/nGBohJqnDM0LvHRaholTiyOBIPQ=="; + }; + }; + "lightning-7.1.4" = { + name = "lightning"; + packageName = "lightning"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-7.1.4.tgz"; + sha512 = "qcMnxsKAkn5eWdFCZGP1mwW/6zBTTtGJPMt1BW6056bmB6kTAnP8A3+MWp1bQpdcfMzUKhl18am8uLu00w/FoA=="; }; }; "lightningcss-1.19.0" = { @@ -46415,13 +46811,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-5.0.7" = { + "listr2-5.0.8" = { name = "listr2"; packageName = "listr2"; - version = "5.0.7"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-5.0.7.tgz"; - sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw=="; + url = "https://registry.npmjs.org/listr2/-/listr2-5.0.8.tgz"; + sha512 = "mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA=="; }; }; "livereload-0.9.3" = { @@ -46469,13 +46865,22 @@ let sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; - "ln-service-54.10.2" = { + "ln-service-54.10.4" = { name = "ln-service"; packageName = "ln-service"; - version = "54.10.2"; + version = "54.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.2.tgz"; - sha512 = "EA5PZjiQhcSHwfKOTwPvEnbEeVy9AaCOiF3AplYCmYX8IskkUM36x8o4YaHmC2L2w7Le1B+KNExi7MzGZtznSg=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.4.tgz"; + sha512 = "NjCuJx67SaKQn8bA5M7beaPacoCItTv+mnAHZbDhpR6/7UToP1WOFzFza99AoiSnPghYAIg1luDfl5vQt58dnA=="; + }; + }; + "ln-service-54.10.5" = { + name = "ln-service"; + packageName = "ln-service"; + version = "54.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-54.10.5.tgz"; + sha512 = "dMT803JdsQgWUYid1n3nIZYmRU+Yd4FL3GcezEye5u1c6ab9f9/VcCvAwVL86FuhR4PB1+xajs2PHtNreejNRA=="; }; }; "ln-service-54.9.0" = { @@ -46505,6 +46910,24 @@ let sha512 = "DQr68yZBk9QmcSKRJ9Nto6WxB2xjRS2XcUFSQXNDWkM+r9vMFCsqNUFU5IMVt/aLiKnf4PdKQ3mhfrvbH+TMuQ=="; }; }; + "ln-sync-4.3.1" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.1.tgz"; + sha512 = "3eZbWCkDshikpiuSo6tAohJkdF+jb8yaKAMlaegadOgpQSgSIQQKvJH0OjaFJaWEnhHZinRLY0hjOWV1KVJYlg=="; + }; + }; + "ln-sync-4.3.2" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.2.tgz"; + sha512 = "bVHd1UnoosyDzcd0N0lr//+uJzl+389tQf94zwNAUIlQURPU346V2uN7Nncf1KS/R55ao/r17oSGzW1rgLDMKw=="; + }; + }; "ln-telegram-4.6.1" = { name = "ln-telegram"; packageName = "ln-telegram"; @@ -47234,6 +47657,15 @@ let sha512 = "yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg=="; }; }; + "lodash.assignwith-4.2.0" = { + name = "lodash.assignwith"; + packageName = "lodash.assignwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; + sha512 = "ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g=="; + }; + }; "lodash.bind-2.4.1" = { name = "lodash.bind"; packageName = "lodash.bind"; @@ -49359,6 +49791,15 @@ let sha512 = "Qlox3wRM/Q4Ww9rv1cBmYKNJwWVX/WC+eA3+1S3Fv4EOhrqyp812ZEfVFKQk0AP6RfzmPUUOwEZBbJ8IRt8SOw=="; }; }; + "match-sorter-6.3.1" = { + name = "match-sorter"; + packageName = "match-sorter"; + version = "6.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz"; + sha512 = "mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw=="; + }; + }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -49503,13 +49944,13 @@ let sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; }; }; - "mdast-comment-marker-2.1.1" = { + "mdast-comment-marker-2.1.2" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.1.tgz"; - sha512 = "ktFfySmbRfOPiWoLkRKqkkyYkDnBVX5b5FqXwnvV1TmgVOl49ETsYK4hPKqrlM15y7AtxNDKIKwJRkZa3TWkng=="; + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.2.tgz"; + sha512 = "HED3ezseRVkBzZ0uK4q6RJMdufr/2p3VfVZstE3H1N9K8bwtspztWo6Xd7rEatuGNoCXaBna8oEqMwUn0Ve1bw=="; }; }; "mdast-util-compact-2.0.1" = { @@ -50826,6 +51267,15 @@ let sha512 = "+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg=="; }; }; + "microseconds-0.2.0" = { + name = "microseconds"; + packageName = "microseconds"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz"; + sha512 = "n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="; + }; + }; "middleware-handler-0.2.0" = { name = "middleware-handler"; packageName = "middleware-handler"; @@ -51411,13 +51861,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.2.4" = { + "minipass-4.2.5" = { name = "minipass"; packageName = "minipass"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; - sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz"; + sha512 = "+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q=="; }; }; "minipass-collect-1.0.2" = { @@ -51681,13 +52131,13 @@ let sha512 = "nbj022D7cd7n6hxDuON08SQciKHSTcRSFlLfCGyIuypo4cl6Z6qJxMVlatFyS6ZbgHqOebkYm/fvwtGiKqmSwQ=="; }; }; - "mlly-1.1.1" = { + "mlly-1.2.0" = { name = "mlly"; packageName = "mlly"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mlly/-/mlly-1.1.1.tgz"; - sha512 = "Jnlh4W/aI4GySPo6+DyTN17Q75KKbLTyFK8BrGhjNP4rxuUjbRWhE6gHg3bs33URWAF44FRm7gdQA348i3XxRw=="; + url = "https://registry.npmjs.org/mlly/-/mlly-1.2.0.tgz"; + sha512 = "+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww=="; }; }; "mobx-6.8.0" = { @@ -52572,6 +53022,15 @@ let sha512 = "Ym8Mn5u8D8Fwo7fHWhD7xEyKe/y/J8Epkxp6iJfZhtgnRva+GN+dQddiWGE2cksWCV92K/HzdHlJWo7aZJDlFw=="; }; }; + "nano-time-1.0.0" = { + name = "nano-time"; + packageName = "nano-time"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz"; + sha512 = "flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA=="; + }; + }; "nanoassert-1.1.0" = { name = "nanoassert"; packageName = "nanoassert"; @@ -53419,15 +53878,6 @@ let sha512 = "ZfoHjoDLpNfXYBshztIq+aTjtlvCZF4XAE00ZYNk4u+/qAjQI+8BidCn957b69WzronQtyNw2NtnJEhsP3N7EQ=="; }; }; - "node-bindgen-loader-1.0.1" = { - name = "node-bindgen-loader"; - packageName = "node-bindgen-loader"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-bindgen-loader/-/node-bindgen-loader-1.0.1.tgz"; - sha512 = "j6kNHKSGLye9qpR/OQh1BhDqyfHqNUIEGicx4NFZLUtseYagfPLLn2qW7MPssbAuAmGvAqNmAwYcW1O1uvsXZA=="; - }; - }; "node-bitmap-0.0.1" = { name = "node-bitmap"; packageName = "node-bitmap"; @@ -53563,6 +54013,15 @@ let sha512 = "BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA=="; }; }; + "node-fetch-3.3.1" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz"; + sha512 = "cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -54922,13 +55381,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.8.5" = { + "nx-15.8.6" = { name = "nx"; packageName = "nx"; - version = "15.8.5"; + version = "15.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.8.5.tgz"; - sha512 = "1c6Y3rPSzzlqQVJPo33Ej0HY/3t9ykeaPs074HpYxXH0+GU1BSIv/9EfXKQGvmBzjs5yAx6asGIv+H3QDrFt3A=="; + url = "https://registry.npmjs.org/nx/-/nx-15.8.6.tgz"; + sha512 = "3OsT6HMyyUyRuP07vLr7iuWzqziQvkh/vSfOWQb3PXakm6N1IvaLxF+NuUCtSaBDUACfqoVO4MC7WE2270OrKQ=="; }; }; "nyc-15.1.0" = { @@ -55337,6 +55796,15 @@ let sha512 = "lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ=="; }; }; + "oblivious-set-1.0.0" = { + name = "oblivious-set"; + packageName = "oblivious-set"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz"; + sha512 = "z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="; + }; + }; "observ-0.2.0" = { name = "observ"; packageName = "observ"; @@ -55373,15 +55841,6 @@ let sha512 = "Iq/Q3TXAfHgABGL7mKlG3ILJnT8jgetOt0sH9a6SGLLCvjh58bsH7RzixLJWkVO6aQK6hI4rxVYHF0rk9KmIwA=="; }; }; - "obz-1.0.3" = { - name = "obz"; - packageName = "obz"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/obz/-/obz-1.0.3.tgz"; - sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; - }; - }; "obz-1.1.0" = { name = "obz"; packageName = "obz"; @@ -57038,13 +57497,13 @@ let sha512 = "OhwWeWAFnklitYkobAgIqM7UlQuJdsYI9WeEsfdiVrfJau02JYwljtNMZEID1XWE7sYW3vMD3H8tsJC+fagrPQ=="; }; }; - "paid-services-4.3.3" = { + "paid-services-4.3.4" = { name = "paid-services"; packageName = "paid-services"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.3.tgz"; - sha512 = "OfYQkRAne2HbPsC+tWjwfQVAbjzq7mBXVQF1aGwfbpWEO49X54aH0/RwepQjkxrRvYFMqHc++NGxcHwQRRWTew=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-4.3.4.tgz"; + sha512 = "qQf09gmntOST3mG43KpQKNdiTc4YGNnDZRGZ1s/cM9gYNwHJ93HEZBCVhlrUZNnM2nfu5JHFWjZgMlH11I5JRQ=="; }; }; "pako-0.2.9" = { @@ -60620,6 +61079,15 @@ let sha512 = "abAuk3ZDyQvPLY6MygtwaDTUBIZ0C5wMMuX1jXa0svazV+keTwn7cPobRv4WYA9ctsDUztm/9CYu4y2TPL08xw=="; }; }; + "private-group-spec-1.2.0" = { + name = "private-group-spec"; + packageName = "private-group-spec"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/private-group-spec/-/private-group-spec-1.2.0.tgz"; + sha512 = "O7SfG+vZIZgqDXy/wjsuTRI5LaozW4rxaZBpGmwlcDfjIvxvYWNboyNm1PoQUU6j4dQ02V1tOQVLDq9u2RzolA=="; + }; + }; "probe-image-size-6.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; @@ -62177,22 +62645,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.7.3" = { + "puppeteer-19.7.4" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.7.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.3.tgz"; - sha512 = "QEiRHPUAJp8VOK27zE6h2ne4xKVYibKUZpvjCuLYaAe8/2SOLKIgstF8wK3YaLgTkeruMrYfqZo+Qlw4ZkJDAQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.7.4.tgz"; + sha512 = "TdiNEG27BahPab4B/xfUth/L8yWV8ZT4D+/n01DWjK6pPQ2HgCGJGbL3dlSxUvor6dtxFBe16CEQ9JWXh0SCaQ=="; }; }; - "puppeteer-core-19.7.3" = { + "puppeteer-core-19.7.4" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.7.3"; + version = "19.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.3.tgz"; - sha512 = "9Q5HahsstfoTnllcpNkxNu2z9J7V0Si5Mr5q90K6XSXwW1P8iqe8q3HzWViVuBuEYTSMZ2LaXXzTEYeoCzLEWg=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.7.4.tgz"; + sha512 = "E8nVhqGF0ZM7s9pb5849gzKFG7282WYZaeGXo/eYDkpUpcPUgmkj7QrAoa8SpFXXyqHHilHJZPbfVBb4foDazQ=="; }; }; "purgecss-2.3.0" = { @@ -62681,31 +63149,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-23.0.12" = { + "quicktype-core-23.0.17" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "23.0.12"; + version = "23.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.12.tgz"; - sha512 = "EPCLnAPBw6/WqYW7WsS5Mcpg+U/w6tYnmfphsSes555qltbB9USR6QbBYksuO+JwF04x94an1ziZi9javD0teQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.17.tgz"; + sha512 = "G/JZIJBqXLIzrehZkjVUnsCwWtQe5BS/uuSIwo8hIo1ra4wo34MtPs+yiKR21EpBri8+HrfDb+kLMZ05rJibqQ=="; }; }; - "quicktype-graphql-input-23.0.12" = { + "quicktype-graphql-input-23.0.17" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "23.0.12"; + version = "23.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.12.tgz"; - sha512 = "7A3/3LuN8h1Pw4F4tdXevnujRUAlMQ+Zi7Q8APXmTQTu85zTUDA/FAQy5giiKt/Y5veoYSL+72jSFRlA3Re2MA=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-23.0.17.tgz"; + sha512 = "36/r/xM2fkAq4U45YuF/MwaPIqNq5Q/YWu2DRYy94ykFuL7UaQ+bvKk8kIHqX7q1dxArw68lvtt8ippJN5m9QQ=="; }; }; - "quicktype-typescript-input-23.0.12" = { + "quicktype-typescript-input-23.0.17" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "23.0.12"; + version = "23.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.12.tgz"; - sha512 = "HdW6DwkSE2FnkPaimfebizb4Exb1SKKxE/KLA3oYQFwxyafzwDwEkRFwstTFhI6J3Svn1jE5LLMI3lunSVXMBA=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-23.0.17.tgz"; + sha512 = "hyzo59PbRkwlBN3l2eMxYKIohWTSLsbH8Yx0YzBw3TbhPEaA7utayofbRC1CWMtOWUmiSvt4RqPiJ4MRCcsQDA=="; }; }; "quotation-1.1.3" = { @@ -62735,6 +63203,15 @@ let sha512 = "kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ=="; }; }; + "radash-9.5.0" = { + name = "radash"; + packageName = "radash"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/radash/-/radash-9.5.0.tgz"; + sha512 = "t0s8BJlvrk8YPaOS8X0J2xzqAsBlXAUkDEjoBXwlzaXsXNCpBILjT9OvWlabLa2KB/r4XrhThdXjxMs7SiCyIw=="; + }; + }; "raf-3.3.2" = { name = "raf"; packageName = "raf"; @@ -63239,6 +63716,15 @@ let sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; }; }; + "react-query-3.39.3" = { + name = "react-query"; + packageName = "react-query"; + version = "3.39.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-query/-/react-query-3.39.3.tgz"; + sha512 = "nLfLz7GiohKTJDuT4us4X3h/8unOh+00MLb2yJoGTPjxKs2bc1iDhkNx2bd5MKklXnOD3NrVZ+J2UXujA5In4g=="; + }; + }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -63698,13 +64184,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readable-stream-3.6.1" = { + "readable-stream-3.6.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; - sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; "readable-stream-4.3.0" = { @@ -64058,15 +64544,6 @@ let sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ=="; }; }; - "reduce-flatten-2.0.0" = { - name = "reduce-flatten"; - packageName = "reduce-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; - sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; - }; - }; "redux-4.2.1" = { name = "redux"; packageName = "redux"; @@ -64238,13 +64715,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.3.1" = { + "regexpu-core-5.3.2" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"; - sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"; + sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="; }; }; "register-protocol-win32-1.1.0" = { @@ -65075,6 +65552,15 @@ let sha512 = "C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w=="; }; }; + "remove-accents-0.4.2" = { + name = "remove-accents"; + packageName = "remove-accents"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz"; + sha512 = "7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -66236,6 +66722,15 @@ let sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; }; }; + "rollup-3.19.1" = { + name = "rollup"; + packageName = "rollup"; + version = "3.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rollup/-/rollup-3.19.1.tgz"; + sha512 = "lAbrdN7neYCg/8WaoWn/ckzCtz+jr70GFfYdlf50OF7387HTg+wiuiqJRFYawwSPpqfqDNYqK7smY/ks2iAudg=="; + }; + }; "rollup-plugin-inject-3.0.2" = { name = "rollup-plugin-inject"; packageName = "rollup-plugin-inject"; @@ -66749,13 +67244,13 @@ let sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; }; }; - "sass-1.58.3" = { + "sass-1.59.2" = { name = "sass"; packageName = "sass"; - version = "1.58.3"; + version = "1.59.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz"; - sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.59.2.tgz"; + sha512 = "jJyO6SmbzkJexF8MUorHx5tAilcgabioYxT/BHbY4+OvoqmbHxsYlrjZ8Adhqcgl6Zqwie0TgMXLCAmPFxXOuw=="; }; }; "sass-formatter-0.7.6" = { @@ -67739,6 +68234,42 @@ let sha512 = "459AP5kwdIhtMLLE1+h2q5a6E7hyY7Ri88GUIhFsyrQinKkm+7qj1ARHELow7GkFS7oimWmIwhXTSxBsuNuOsw=="; }; }; + "sha256-universal-1.2.1" = { + name = "sha256-universal"; + packageName = "sha256-universal"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-universal/-/sha256-universal-1.2.1.tgz"; + sha512 = "ghn3muhdn1ailCQqqceNxRgkOeZSVfSE13RQWEg6njB+itsFzGVSJv+O//2hvNXZuxVIRyNzrgsZ37SPDdGJJw=="; + }; + }; + "sha256-wasm-2.2.2" = { + name = "sha256-wasm"; + packageName = "sha256-wasm"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-wasm/-/sha256-wasm-2.2.2.tgz"; + sha512 = "qKSGARvao+JQlFiA+sjJZhJ/61gmW/3aNLblB2rsgIxDlDxsJPHo8a1seXj12oKtuHVgJSJJ7QEGBUYQN741lQ=="; + }; + }; + "sha512-universal-1.2.1" = { + name = "sha512-universal"; + packageName = "sha512-universal"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-universal/-/sha512-universal-1.2.1.tgz"; + sha512 = "kehYuigMoRkIngCv7rhgruLJNNHDnitGTBdkcYbCbooL8Cidj/bS78MDxByIjcc69M915WxcQTgZetZ1JbeQTQ=="; + }; + }; + "sha512-wasm-2.3.4" = { + name = "sha512-wasm"; + packageName = "sha512-wasm"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-wasm/-/sha512-wasm-2.3.4.tgz"; + sha512 = "akWoxJPGCB3aZCrZ+fm6VIFhJ/p8idBv7AWGFng/CZIrQo51oQNsvDbTSRXWAzIiZJvpy16oIDiCCPqTe21sKg=="; + }; + }; "shallow-clone-3.0.1" = { name = "shallow-clone"; packageName = "shallow-clone"; @@ -68963,6 +69494,15 @@ let sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA=="; }; }; + "sodium-javascript-0.8.0" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.8.0.tgz"; + sha512 = "rEBzR5mPxPES+UjyMDvKPIXy9ImF17KOJ32nJNi9uIquWpS/nfj+h6m05J5yLJaGXjgM72LmQoUbWZVxh/rmGg=="; + }; + }; "sodium-native-2.4.9" = { name = "sodium-native"; packageName = "sodium-native"; @@ -68990,6 +69530,15 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; + "sodium-universal-3.1.0" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.1.0.tgz"; + sha512 = "N2gxk68Kg2qZLSJ4h0NffEhp4BjgWHCHXVlDi1aG1hA3y+ZeWEmHqnpml8Hy47QzfL1xLy5nwr9LcsWAg2Ep0A=="; + }; + }; "sonic-boom-3.2.1" = { name = "sonic-boom"; packageName = "sonic-boom"; @@ -69404,13 +69953,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.12" = { + "spdx-license-ids-3.0.13" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.12"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"; + sha512 = "XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="; }; }; "spdx-license-list-6.6.0" = { @@ -69792,6 +70341,15 @@ let sha512 = "vTa4t3tIDJSj4kG3FqnfxQcBW1STLbEDZxjVb3R/MOUZzYpGlsDTUsTrMXH1ZPXxWdQB9sdZ9n/CaXUtLEIEvQ=="; }; }; + "ssb-about-self-1.1.0" = { + name = "ssb-about-self"; + packageName = "ssb-about-self"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-about-self/-/ssb-about-self-1.1.0.tgz"; + sha512 = "AG07Dg2XG9CJvK52qrpwz54cXu+G6sPKwPiOb2LX5K+ORGhA+4MJUVViwuMEcOCI1a1wmXvOKFJbeTaFtosSAw=="; + }; + }; "ssb-avatar-0.2.0" = { name = "ssb-avatar"; packageName = "ssb-avatar"; @@ -69801,13 +70359,13 @@ let sha512 = "rv1SwQDE7OhavLWIbTxvWf2R2Qq3svp7OLT+49OECr8kSrQN1XGQqeI1bVdzFSr0DBwjxHES56+2FLkhk6Qmvw=="; }; }; - "ssb-bendy-butt-0.12.5" = { - name = "ssb-bendy-butt"; - packageName = "ssb-bendy-butt"; - version = "0.12.5"; + "ssb-bfe-1.1.0" = { + name = "ssb-bfe"; + packageName = "ssb-bfe"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz"; - sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-1.1.0.tgz"; + sha512 = "viY/ZzQENnO+gvahYQ35tf3OPV6ChQ+CxnyPpiloDZu7bzQNL0E24wjmoGefF+ftaCK/meeWKP3Hxm7pG50cFA=="; }; }; "ssb-bfe-3.7.0" = { @@ -69837,6 +70395,24 @@ let sha512 = "N+X46lE/KaIH9y1w3LQ9pPnt2tQr5VCSj1dAo/pJGYnSwnHz8GhIiboq7UGzrCZwCWgVUs22/2YiytCXSC9ASg=="; }; }; + "ssb-box-1.0.1" = { + name = "ssb-box"; + packageName = "ssb-box"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-box/-/ssb-box-1.0.1.tgz"; + sha512 = "/lZOqFr5glmzKTmpXZ8/QbvYA6/mVQ6dDPT/+zsYQkKKEHaloMkMPRRXlK86xG+/Bsuw2HGjcm78W09aWshS+g=="; + }; + }; + "ssb-box2-3.0.1" = { + name = "ssb-box2"; + packageName = "ssb-box2"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-box2/-/ssb-box2-3.0.1.tgz"; + sha512 = "jQhrsEyrpqnUciEb1qzqc/SJCAx3hTm48BMzMy1bE//xQthWRahigTffflOM7pdRieGlxwGlHc8PpagBBZOkhA=="; + }; + }; "ssb-caps-1.1.0" = { name = "ssb-caps"; packageName = "ssb-caps"; @@ -69846,6 +70422,15 @@ let sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA=="; }; }; + "ssb-classic-1.1.0" = { + name = "ssb-classic"; + packageName = "ssb-classic"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-classic/-/ssb-classic-1.1.0.tgz"; + sha512 = "aR1nifEXIpyNP+tRmQ8Sw2ra9nhPGrJnhH6xGTmSn4GXSwy5Gm4JCrpzcKvzUKzKMsfmqw5HVug+2/IVkvEVXQ=="; + }; + }; "ssb-client-4.9.0" = { name = "ssb-client"; packageName = "ssb-client"; @@ -69882,13 +70467,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.11" = { + "ssb-db2-7.0.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.11"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz"; - sha512 = "XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-7.0.0.tgz"; + sha512 = "J3rWW0fXDvIvbefv4c3H11GaUeBEKwGPD4YTqgO08+wDXWetoMv+Y8b3amfXUmcS1afzYjM8qxZ2TfHrshO+ww=="; }; }; "ssb-ebt-5.6.7" = { @@ -69900,13 +70485,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.4.7" = { + "ssb-friends-4.4.8" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.4.7"; + version = "4.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.7.tgz"; - sha512 = "WPdHEWsAl9zMjbqQoFP++7UBi/lCKxiR0c8Qe2HHHoWIw58iVLSpepbNlZFwiZP4mPK5v2XaoYLOj7s3/UKj2w=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.8.tgz"; + sha512 = "Fqv8YjI2M5ckZUByDisuF4BHIqHtSZEotItr7tHERuqbH7dSNx3NUG928Fdw76rQ+kOSptXeBfAv+ebHytx/iQ=="; }; }; "ssb-git-0.5.0" = { @@ -69954,6 +70539,15 @@ let sha512 = "fPbEmfczYmPpQTyWvExW9BL8hsObOCQ39Xm77u07cV0rinmdDIIFzwFtCDVG0DZEuNEXeNlPSms2x0BsIvgmEw=="; }; }; + "ssb-keyring-2.2.0" = { + name = "ssb-keyring"; + packageName = "ssb-keyring"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-keyring/-/ssb-keyring-2.2.0.tgz"; + sha512 = "pXNzYsQbtdWoWAjEPT5lVrZs/Px4ypJU2m4S34tTN6KivZukHPcflj1/IbZSDj7kHJGQhJRcyqGQ3MxgQdFBrA=="; + }; + }; "ssb-keys-7.2.2" = { name = "ssb-keys"; packageName = "ssb-keys"; @@ -70035,6 +70629,15 @@ let sha512 = "gf/ryDRD5zos3PaUohKc28p28gdp+X9cjUqdNAbmFwaM+apbTYiddYvdvYZOyH7OHH9+Esxgsy9q2X8RX6soPw=="; }; }; + "ssb-msg-content-1.0.1" = { + name = "ssb-msg-content"; + packageName = "ssb-msg-content"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-msg-content/-/ssb-msg-content-1.0.1.tgz"; + sha512 = "M6W0Ef+jif829USmGvh6XeS4lYb/F2lgFhfEoCE/md7ESILNOGidp8frJE2uVOzSr2wVRA265tPrnVb7rYHkug=="; + }; + }; "ssb-msg-schemas-6.3.0" = { name = "ssb-msg-schemas"; packageName = "ssb-msg-schemas"; @@ -70089,6 +70692,24 @@ let sha512 = "eM8vid+K8MhwZwzk/CDUhSNhUoS6wYgq9clJrrKaP0/Otdd3zZzcBQw54Xvm0olMcOgpTSlY3m2rT4iqjZPIBw=="; }; }; + "ssb-private-group-keys-0.4.1" = { + name = "ssb-private-group-keys"; + packageName = "ssb-private-group-keys"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-private-group-keys/-/ssb-private-group-keys-0.4.1.tgz"; + sha512 = "Npl9NpUZvHho10h18/tphMfuyMlj+6lLW0mm+u8ooIRgVh5+hyoOtgJL22VmTEyD8KQVJG6SOjiv6MiGXzIL3g=="; + }; + }; + "ssb-private-group-keys-1.1.2" = { + name = "ssb-private-group-keys"; + packageName = "ssb-private-group-keys"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-private-group-keys/-/ssb-private-group-keys-1.1.2.tgz"; + sha512 = "0UPPmxy61qmbDmP71J2vhX6UPfCtXa/CNehxYTgk2+AaLXsnA0perGZAiOWm9niGEU50TYYC5/jsIfjz4IiD9A=="; + }; + }; "ssb-pull-requests-1.0.0" = { name = "ssb-pull-requests"; packageName = "ssb-pull-requests"; @@ -70143,15 +70764,6 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.9.0" = { - name = "ssb-uri2"; - packageName = "ssb-uri2"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.9.0.tgz"; - sha512 = "HkgRbZeFe3YhBLfv5C6AgJaz1ESlQ5MP7sAdRTpCYwU4wo0U+d/irvVUsnUimPq6FO/Zn6gmW8BiCk+JBv3rGw=="; - }; - }; "ssb-uri2-2.4.1" = { name = "ssb-uri2"; packageName = "ssb-uri2"; @@ -70170,24 +70782,6 @@ let sha512 = "nzj5EQnhm5fBGXgtzuuWgxv45dW+CJJm4eCLZKiOxyG1NE/WJZwju2DmqZfiE9zr9bC2T2hPHkckDP0CCP8v8w=="; }; }; - "ssb-validate2-0.1.2" = { - name = "ssb-validate2"; - packageName = "ssb-validate2"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate2/-/ssb-validate2-0.1.2.tgz"; - sha512 = "B1UMy/+sZLbVo0KvdiAvOeSCalYWSaFXxxEmuZ0K0wRqIkn/KU7vdXeaXxp+bRmTTnABdu+k/O7qRJtdiD6e0w=="; - }; - }; - "ssb-validate2-rsjs-node-1.0.4" = { - name = "ssb-validate2-rsjs-node"; - packageName = "ssb-validate2-rsjs-node"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate2-rsjs-node/-/ssb-validate2-rsjs-node-1.0.4.tgz"; - sha512 = "UWdqf1nu7DgDDYB8ZndELiD/RkAIm8//odirkv1yynSxGOgwiGrFiQG+5I/OVdpfnb3pZ712QWX9sv0t+hUFYg=="; - }; - }; "ssb-ws-6.2.3" = { name = "ssb-ws"; packageName = "ssb-ws"; @@ -70800,6 +71394,15 @@ let sha512 = "P+7muTGs2C8yRcgJw/PPt61q7O517tDHiwYEzMWo1GSBCcZedUMT/clz7vUNsSxFphIlJ6QUL4GexQKlfJoVtA=="; }; }; + "stream-read-all-3.0.1" = { + name = "stream-read-all"; + packageName = "stream-read-all"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-read-all/-/stream-read-all-3.0.1.tgz"; + sha512 = "EWZT9XOceBPlVJRrYcykW8jyRSZYbkb/0ZK36uLEmoWVO5gxBOnntNTseNzfREsqxqdfEGQrD8SXQ3QWbBmq8A=="; + }; + }; "stream-shift-1.0.1" = { name = "stream-shift"; packageName = "stream-shift"; @@ -72159,13 +72762,13 @@ let sha512 = "ay4MPFjfiQzDsyTidljJLXQi22l2AwjcuamYnJWj/LdhaHdKmDJxRox52WXimdcLpMuLDtkQvv4+jEu+wu9eSw=="; }; }; - "svelte-3.55.1" = { + "svelte-3.56.0" = { name = "svelte"; packageName = "svelte"; - version = "3.55.1"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.55.1.tgz"; - sha512 = "S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.56.0.tgz"; + sha512 = "LvXiJbjdvJKwB/0CQyYpDX0q+hFqCyWmybzC2G6eK1tJJA/RSRCytTfNmjHv+RHlLuA70vWG7nXp6gbeErYvRA=="; }; }; "svelte-preprocess-5.0.1" = { @@ -72177,13 +72780,13 @@ let sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; - "svelte2tsx-0.6.3" = { + "svelte2tsx-0.6.9" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.6.3"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.3.tgz"; - sha512 = "2e0rB9l7oih3CEa5S8OEYm1FvlXKj6c444hAVRMqt7LZgOm6oTu3FqfzIPXViDNh7LmU9Yb3PiYWhS7a7D7zow=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.6.9.tgz"; + sha512 = "yQT83cQMztgRTkJPEUYgrHYnJA8WmFC1TqOGabZ2DgSlmuqZK1qI6uxCFF1IEQRxgvkVPvYR5+H0W51ujSia2Q=="; }; }; "sver-compat-1.5.0" = { @@ -72330,13 +72933,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.18.0" = { + "swagger-ui-dist-4.18.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.18.0"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.18.0.tgz"; - sha512 = "PZeF7r+JsAXC8tEGatOARSEeC0n3ChGqTDcbZUzrV+mGnlW2ZEystlpiEyMWfAY4FAT+uxibfMuRahEvnoG3CQ=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.18.1.tgz"; + sha512 = "n7AT4wzKIPpHy/BGflJOepGMrbY/7Cd5yVd9ptVczaJGAKScbVJrZxFbAE2ZSZa8KmqdQ0+pOs3/5mWY5tSMZQ=="; }; }; "swagger2openapi-7.0.8" = { @@ -72546,13 +73149,13 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "table-layout-1.0.2" = { + "table-layout-3.0.2" = { name = "table-layout"; packageName = "table-layout"; - version = "1.0.2"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz"; - sha512 = "qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A=="; + url = "https://registry.npmjs.org/table-layout/-/table-layout-3.0.2.tgz"; + sha512 = "rpyNZYRw+/C+dYkcQ3Pr+rLxW4CfHpXjPDnG7lYhdRoUcZTUt+KEsX+94RGp/aVp/MQU35JCITv2T/beY4m+hw=="; }; }; "tabtab-1.3.2" = { @@ -73555,6 +74158,15 @@ let sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; }; }; + "tiny-invariant-1.3.1" = { + name = "tiny-invariant"; + packageName = "tiny-invariant"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"; + sha512 = "AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw=="; + }; + }; "tiny-queue-0.2.1" = { name = "tiny-queue"; packageName = "tiny-queue"; @@ -74437,6 +75049,15 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; + "ts-dedent-2.2.0" = { + name = "ts-dedent"; + packageName = "ts-dedent"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz"; + sha512 = "q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ=="; + }; + }; "ts-interface-checker-0.1.13" = { name = "ts-interface-checker"; packageName = "ts-interface-checker"; @@ -74545,13 +75166,13 @@ let sha512 = "5xZugaeM3wKQPj/vrWnrtYjNh4xnIz6cGSW/smCe9OTmkh1+KvHpm7M7HLq/OnBaljf4+yKctC4AYimBi4T1/Q=="; }; }; - "tsconfck-2.0.3" = { + "tsconfck-2.1.0" = { name = "tsconfck"; packageName = "tsconfck"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.0.3.tgz"; - sha512 = "o3DsPZO1+C98KqHMdAbWs30zpxD30kj8r9OLA4ML1yghx4khNDzaaShNalfluh8ZPPhzKe3qyVCP1HiZszSAsw=="; + url = "https://registry.npmjs.org/tsconfck/-/tsconfck-2.1.0.tgz"; + sha512 = "lztI9ohwclQHISVWrM/hlcgsRpphsii94DV9AQtAw2XJSVNiv+3ppdEsrL5J+xc5oTeHXe1qDqlOAGw8VSa9+Q=="; }; }; "tsconfig-5.0.3" = { @@ -75337,13 +75958,13 @@ let sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="; }; }; - "typical-5.2.0" = { + "typical-7.1.1" = { name = "typical"; packageName = "typical"; - version = "5.2.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; - sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; + url = "https://registry.npmjs.org/typical/-/typical-7.1.1.tgz"; + sha512 = "T+tKVNs6Wu7IWiAce5BgMd7OZfNYUndHwc5MknN+UHOudi7sGZzuHdCadllRuqJ3fPtgFtIH9+lt9qRv6lmpfA=="; }; }; "u2f-api-0.2.7" = { @@ -76552,6 +77173,15 @@ let sha512 = "6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg=="; }; }; + "unload-2.2.0" = { + name = "unload"; + packageName = "unload"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz"; + sha512 = "B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA=="; + }; + }; "unordered-array-remove-1.0.2" = { name = "unordered-array-remove"; packageName = "unordered-array-remove"; @@ -77065,6 +77695,24 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; + "use-sync-external-store-1.2.0" = { + name = "use-sync-external-store"; + packageName = "use-sync-external-store"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"; + sha512 = "eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="; + }; + }; + "use-zustand-0.0.1" = { + name = "use-zustand"; + packageName = "use-zustand"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use-zustand/-/use-zustand-0.0.1.tgz"; + sha512 = "axjswesUfXirTQ1CC1F4r0dkaI7g2nMEftyvg23Wq4PnAbLogswzj+o5gbnnnQaQOMXKHxNZIlYpKfuTnL466Q=="; + }; + }; "user-home-2.0.0" = { name = "user-home"; packageName = "user-home"; @@ -78334,6 +78982,24 @@ let sha512 = "NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA=="; }; }; + "vite-4.1.4" = { + name = "vite"; + packageName = "vite"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.1.4.tgz"; + sha512 = "3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg=="; + }; + }; + "vite-node-0.28.5" = { + name = "vite-node"; + packageName = "vite-node"; + version = "0.28.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vite-node/-/vite-node-0.28.5.tgz"; + sha512 = "LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA=="; + }; + }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -79567,13 +80233,13 @@ let sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; }; }; - "webpack-5.76.0" = { + "webpack-5.76.1" = { name = "webpack"; packageName = "webpack"; - version = "5.76.0"; + version = "5.76.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz"; - sha512 = "l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz"; + sha512 = "4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -80395,13 +81061,13 @@ let sha512 = "U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg=="; }; }; - "wonka-6.2.3" = { + "wonka-6.2.4" = { name = "wonka"; packageName = "wonka"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/wonka/-/wonka-6.2.3.tgz"; - sha512 = "EFOYiqDeYLXSzGYt2X3aVe9Hq1XJG+Hz/HjTRRT4dZE9q95khHl5+7pzUSXI19dbMO1/2UMrTf7JT7/7JrSQSQ=="; + url = "https://registry.npmjs.org/wonka/-/wonka-6.2.4.tgz"; + sha512 = "+q0VMDFqLzu+NAOdhmebQb46Fprip1zV1I/AhKYG4MAtru03R5L6MU89XQK59YDiPL7ELDZEEgZTGtCJ0BWL6g=="; }; }; "word-wrap-1.2.3" = { @@ -80449,13 +81115,13 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "wordwrapjs-4.0.1" = { + "wordwrapjs-5.1.0" = { name = "wordwrapjs"; packageName = "wordwrapjs"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz"; - sha512 = "kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA=="; + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-5.1.0.tgz"; + sha512 = "JNjcULU2e4KJwUNv6CHgI46UvDGitb6dGryHajXTDiLgg1/RiGoPSDw4kZfYnwGtEXf2ZMeIewDQgFGzkCB2Sg=="; }; }; "worker-farm-1.5.2" = { @@ -80845,6 +81511,15 @@ let sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; }; }; + "ws-8.13.0" = { + name = "ws"; + packageName = "ws"; + version = "8.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; + }; + }; "ws-8.2.3" = { name = "ws"; packageName = "ws"; @@ -82142,13 +82817,22 @@ let sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; }; }; - "zod-3.21.0" = { + "zod-3.21.4" = { name = "zod"; packageName = "zod"; - version = "3.21.0"; + version = "3.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-3.21.0.tgz"; - sha512 = "UYdykTcVxB6lfdyLzAqLyyYAlOcpoluECvjsdoaqfQmz9p+3LRaIqYcNiL/J2kFYp66fBM8wwBvIGVEjq7KtZw=="; + url = "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz"; + sha512 = "m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="; + }; + }; + "zustand-4.3.6" = { + name = "zustand"; + packageName = "zustand"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/zustand/-/zustand-4.3.6.tgz"; + sha512 = "6J5zDxjxLE+yukC2XZWf/IyWVKnXT9b9HUv09VJ/bwGCpKNcaTqp7Ws28Xr8jnbvnZcdRaidztAPsXFBIqufiw=="; }; }; "zwave-js-10.11.1" = { @@ -82356,7 +83040,7 @@ in }) sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -82439,7 +83123,7 @@ in ]; }) sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -82471,7 +83155,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."ssri-10.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -82578,7 +83262,7 @@ in sources."glob-8.1.0" (sources."help-me-4.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."ieee754-1.2.1" @@ -82798,7 +83482,7 @@ in sources."pumpify-2.0.1" sources."queue-4.5.1" sources."quick-format-unescaped-4.0.4" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."real-require-0.2.0" sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" @@ -83019,7 +83703,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" ]; @@ -83038,7 +83722,7 @@ in sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -83108,7 +83792,7 @@ in ]; }) sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -83212,7 +83896,7 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -83414,24 +84098,24 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.1" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."acorn-8.8.2" @@ -83558,7 +84242,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -83573,7 +84257,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split2-3.2.2" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -83782,19 +84466,19 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" - (sources."@sentry/core-7.42.0" // { + (sources."@sentry/core-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.42.0" // { + (sources."@sentry/node-7.43.0" // { dependencies = [ sources."cookie-0.4.2" sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.42.0" - (sources."@sentry/utils-7.42.0" // { + sources."@sentry/types-7.43.0" + (sources."@sentry/utils-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -83817,7 +84501,7 @@ in sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" sources."@types/mime-3.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.1" sources."@types/node-fetch-2.6.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -83828,15 +84512,15 @@ in sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.4" sources."@types/yauzl-2.10.0" - sources."@typescript-eslint/types-5.54.1" - (sources."@typescript-eslint/typescript-estree-5.54.1" // { + sources."@typescript-eslint/types-5.55.0" + (sources."@typescript-eslint/typescript-estree-5.55.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.54.1" + sources."@typescript-eslint/visitor-keys-5.55.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -83892,6 +84576,7 @@ in ]; }) sources."argparse-1.0.10" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.flatmap-1.3.1" @@ -83967,7 +84652,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."case-1.6.3" sources."chainsaw-0.1.0" (sources."chalk-2.4.2" // { @@ -84098,7 +84783,7 @@ in }) sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -84118,7 +84803,7 @@ in sources."entities-2.2.0" sources."env-paths-2.2.1" sources."envinfo-7.8.1" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-module-lexer-0.9.3" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" @@ -84202,7 +84887,7 @@ in sources."mkdirp-0.5.6" ]; }) - sources."fswin-3.23.119" + sources."fswin-3.23.311" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" @@ -84605,7 +85290,7 @@ in sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."rc-1.2.8" - (sources."readable-stream-3.6.1" // { + (sources."readable-stream-3.6.2" // { dependencies = [ sources."inherits-2.0.4" ]; @@ -84698,6 +85383,7 @@ in sources."statuses-2.0.1" sources."stdin-0.0.1" sources."string-width-4.2.3" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.3.0" @@ -84847,7 +85533,7 @@ in sources."ipaddr.js-2.0.1" sources."rimraf-3.0.2" sources."schema-utils-4.0.0" - sources."ws-8.12.1" + sources."ws-8.13.0" ]; }) sources."webpack-merge-5.8.0" @@ -84909,7 +85595,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.14.6" + sources."@types/node-18.15.1" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -85135,7 +85821,7 @@ in sources."yocto-queue-0.1.0" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.3" sources."replace-buffer-1.2.1" @@ -85160,7 +85846,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-lines-3.0.0" sources."string-width-5.1.2" sources."string_decoder-1.3.0" @@ -85255,7 +85941,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -85894,7 +86580,7 @@ in sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."rc-1.2.8" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" (sources."recast-0.11.23" // { dependencies = [ sources."esprima-3.1.3" @@ -86257,7 +86943,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.4.0" + sources."@opentelemetry/api-1.4.1" sources."@pnpm/crypto.base32-hash-1.0.1" sources."@pnpm/error-1.4.0" sources."@pnpm/link-bins-5.3.25" @@ -86300,7 +86986,7 @@ in sources."@types/lodash-4.14.191" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -86336,7 +87022,7 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."boxen-5.1.2" // { @@ -86520,7 +87206,7 @@ in sources."ignore-5.1.9" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."immutable-4.2.4" + sources."immutable-4.3.0" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -86813,7 +87499,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.58.3" + sources."sass-1.59.2" sources."sax-1.2.4" sources."scss-parser-1.0.6" sources."semver-7.3.8" @@ -86835,7 +87521,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stackframe-1.3.4" @@ -86854,7 +87540,7 @@ in sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."text-table-0.2.0" @@ -87017,7 +87703,7 @@ in sources."preferences-2.0.2" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -87099,7 +87785,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -87143,7 +87829,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -87162,7 +87848,7 @@ in sources."de-indent-1.0.2" sources."deepmerge-4.3.0" sources."defaults-1.0.4" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.12.0" @@ -87283,7 +87969,7 @@ in sources."pump-3.0.0" sources."punycode-2.3.0" sources."randombytes-2.1.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."rechoir-0.6.2" sources."require-from-string-2.0.2" @@ -87404,7 +88090,7 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."ora-5.4.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."signal-exit-3.0.7" @@ -87442,23 +88128,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87566,23 +88252,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87678,10 +88364,10 @@ in "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.11.tgz"; - sha512 = "34E/guiYHdgCSlgyIKy68jmmPJQrMdCIj4Uth7Sgay+s9w4NFSqgnWmktty6oP+jQfhUXQ5o0mIYqzuIZVxazQ=="; + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.12.tgz"; + sha512 = "myq9GpUeB0EKzOuAgOh2xUEIsxo4N13wMlPVct6QaXOvxNkiyIFmRvhf+tan6fq1uHD1P82r17Gxel/K7Apw4g=="; }; buildInputs = globalBuildInputs; meta = { @@ -87709,23 +88395,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87833,23 +88519,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -87968,7 +88654,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" @@ -87977,7 +88663,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1331.0" + sources."aws-sdk-2.1333.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -88461,7 +89147,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -88570,7 +89256,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -88619,7 +89305,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.29.0" + sources."core-js-compat-3.29.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -88679,8 +89365,8 @@ in sources."duplexer3-0.1.5" sources."easy-stack-1.0.1" sources."ee-first-1.1.1" - sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.325" + sources."ejs-3.1.9" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -89100,14 +89786,14 @@ in ]; }) sources."read-pkg-5.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."recast-0.20.5" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -89205,7 +89891,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { @@ -89604,7 +90290,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/normalize-package-data-2.4.1" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" @@ -89652,7 +90338,7 @@ in sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) @@ -89741,7 +90427,7 @@ in }) sources."ignore-5.2.4" sources."import-lazy-4.0.0" - sources."import-meta-resolve-2.2.1" + sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" sources."indent-string-5.0.0" sources."inflight-1.0.6" @@ -89782,7 +90468,7 @@ in sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" - sources."mdast-comment-marker-2.1.1" + sources."mdast-comment-marker-2.1.2" (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ sources."escape-string-regexp-5.0.0" @@ -89947,7 +90633,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -90115,7 +90801,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.5" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -90125,7 +90811,7 @@ in sources."convert-source-map-1.9.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -90428,7 +91114,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -90506,15 +91192,15 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.4.13"; + version = "10.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"; - sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz"; + sha512 = "FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ=="; }; dependencies = [ sources."browserslist-4.21.5" - sources."caniuse-lite-1.0.30001464" - sources."electron-to-chromium-1.4.325" + sources."caniuse-lite-1.0.30001465" + sources."electron-to-chromium-1.4.328" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" @@ -90584,7 +91270,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/yauzl-2.10.0" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" @@ -90594,7 +91280,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1331.0" // { + (sources."aws-sdk-2.1333.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -90746,7 +91432,7 @@ in sources."puppeteer-13.7.0" sources."querystring-0.2.0" sources."raw-body-2.5.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" @@ -90967,7 +91653,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" - sources."irregular-plurals-3.4.1" + sources."irregular-plurals-3.5.0" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -91075,7 +91761,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-lint-8.0.0" @@ -91155,7 +91841,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" @@ -91257,10 +91943,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.31.2"; + version = "13.31.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.31.2.tgz"; - sha512 = "zoHKus75cLDo82VhWiGTvVNKmchtbDcUuN+1Pe3jlglCPoLS/cBDDNBcNWO6n+qlPV1fPKctuG0zx5/2GReuiA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.31.3.tgz"; + sha512 = "HiosJL9Z+DnDSYAmYwArmc9NiDT167Y1uxqVuDZohd+eaNrcx24QoMzctqiRvKY1YZejEXCgtMQnkq+qUP9x3Q=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -91286,9 +91972,9 @@ in }) sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@grammyjs/types-2.12.1" - sources."@grpc/grpc-js-1.8.4" - sources."@grpc/proto-loader-0.7.4" + sources."@grammyjs/types-3.0.2" + sources."@grpc/grpc-js-1.8.12" + sources."@grpc/proto-loader-0.7.5" sources."@handsontable/formulajs-2.0.2" sources."@json2csv/formatters-6.1.2" sources."@json2csv/plainjs-6.1.2" @@ -91308,11 +91994,11 @@ in sources."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" - sources."@types/express-4.17.15" + sources."@types/express-4.17.17" sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" @@ -91353,12 +92039,12 @@ in sources."bitcoinjs-lib-6.1.0" (sources."bl-5.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."bluebird-3.7.2" sources."bn.js-5.2.1" - sources."body-parser-1.20.1" + sources."body-parser-1.20.2" sources."bolt01-1.2.6" sources."bolt03-1.2.15" sources."bolt07-1.8.3" @@ -91433,6 +92119,8 @@ in sources."exit-hook-1.1.1" (sources."express-4.18.2" // { dependencies = [ + sources."body-parser-1.20.1" + sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" ]; }) @@ -91451,13 +92139,16 @@ in sources."gauge-1.2.7" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.0" - (sources."goldengate-12.0.2" // { + (sources."goldengate-12.0.4" // { dependencies = [ - sources."ln-service-54.9.0" - sources."ln-sync-4.2.0" + (sources."ln-sync-4.3.1" // { + dependencies = [ + sources."ln-service-54.10.4" + ]; + }) ]; }) - (sources."grammy-1.14.1" // { + (sources."grammy-1.15.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -91473,7 +92164,7 @@ in sources."has-unicode-2.0.1" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -91527,46 +92218,72 @@ in sources."jstat-1.9.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-7.0.3" // { + (sources."lightning-7.1.3" // { dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."@types/node-18.11.18" + sources."@types/node-18.14.6" ]; }) (sources."ln-accounting-6.1.3" // { dependencies = [ + sources."@grpc/grpc-js-1.8.4" + sources."@grpc/proto-loader-0.7.4" + sources."@types/express-4.17.15" + sources."@types/node-18.11.18" + sources."body-parser-1.20.1" + sources."goldengate-12.0.2" + (sources."lightning-7.0.3" // { + dependencies = [ + sources."@grpc/grpc-js-1.8.1" + ]; + }) sources."ln-service-54.9.0" + sources."ln-sync-4.2.0" + sources."raw-body-2.5.1" + sources."type-fest-3.5.1" + sources."utf-8-validate-5.0.10" + sources."ws-8.11.0" ]; }) - (sources."ln-service-54.10.2" // { + (sources."ln-service-54.10.5" // { dependencies = [ - sources."@grpc/grpc-js-1.8.11" - sources."@grpc/proto-loader-0.7.5" - sources."@types/express-4.17.17" - sources."@types/node-18.14.4" - sources."body-parser-1.20.2" - sources."lightning-7.1.2" - sources."raw-body-2.5.2" - sources."type-fest-3.6.1" - sources."ws-8.12.1" - ]; - }) - (sources."ln-sync-4.3.0" // { - dependencies = [ - sources."ln-service-54.9.0" + sources."@types/node-18.15.0" + sources."lightning-7.1.4" + sources."ws-8.13.0" ]; }) + sources."ln-sync-4.3.2" (sources."ln-telegram-4.6.1" // { dependencies = [ + sources."@grammyjs/types-2.12.1" + sources."@grpc/grpc-js-1.8.4" + sources."@grpc/proto-loader-0.7.4" + sources."@types/express-4.17.15" + sources."@types/node-18.11.18" + sources."body-parser-1.20.1" sources."debug-4.3.4" + (sources."goldengate-12.0.2" // { + dependencies = [ + sources."ln-sync-4.2.0" + ]; + }) sources."grammy-1.13.1" + (sources."lightning-7.0.3" // { + dependencies = [ + sources."@grpc/grpc-js-1.8.1" + ]; + }) sources."ln-service-54.9.0" + sources."ln-sync-4.3.0" sources."ms-2.1.2" (sources."paid-services-4.3.0" // { dependencies = [ sources."ln-sync-4.2.0" ]; }) + sources."raw-body-2.5.1" + sources."type-fest-3.5.1" + sources."utf-8-validate-5.0.10" + sources."ws-8.11.0" ]; }) sources."lodash-4.17.21" @@ -91635,9 +92352,13 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p2tr-1.3.3" - (sources."paid-services-4.3.3" // { + (sources."paid-services-4.3.4" // { dependencies = [ - sources."ln-service-54.9.0" + (sources."ln-sync-4.3.1" // { + dependencies = [ + sources."ln-service-54.10.4" + ]; + }) ]; }) sources."parseurl-1.3.3" @@ -91646,7 +92367,17 @@ in sources."pinkie-promise-2.0.1" (sources."probing-3.0.1" // { dependencies = [ + sources."@grpc/grpc-js-1.8.1" + sources."@grpc/proto-loader-0.7.4" + sources."@types/express-4.17.15" + sources."@types/node-18.11.18" + sources."body-parser-1.20.1" + sources."lightning-7.0.3" sources."ln-service-54.9.0" + sources."raw-body-2.5.1" + sources."type-fest-3.5.1" + sources."utf-8-validate-5.0.10" + sources."ws-8.11.0" ]; }) sources."process-nextick-args-2.0.1" @@ -91663,7 +92394,7 @@ in sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.5.1" + sources."raw-body-2.5.2" sources."readable-stream-2.3.8" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -91732,14 +92463,14 @@ in sources."tslib-2.5.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-3.5.1" + sources."type-fest-3.6.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" sources."uint8array-tools-0.0.7" sources."unpipe-1.0.0" sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.3" sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -91752,12 +92483,12 @@ in sources."window-size-1.1.1" (sources."winston-3.7.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."wrap-ansi-7.0.0" // { @@ -91767,7 +92498,7 @@ in sources."color-name-1.1.4" ]; }) - sources."ws-8.11.0" + sources."ws-8.12.1" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -91785,10 +92516,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.2.tgz"; - sha512 = "B/jBGVeRMdQs+fHkEDycxD6L8/nf2WwoH3r+kt+O4GqknZ9AX3gNVE8sGjCOf0iLEvAChi6tqefYRRY2nKM4xw=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.8.3.tgz"; + sha512 = "NJXqzNOClxJ/G6Hr8gafvqcBiY1iNvBACxZlz5tOPyoloTeqyOtl6C9yZUxW8ryW8GAJ2TUS479ly5tq9kjEBA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -91825,7 +92556,7 @@ in sources."web-tree-sitter-0.20.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."zod-3.21.0" + sources."zod-3.21.4" ]; buildInputs = globalBuildInputs; meta = { @@ -91983,7 +92714,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -92045,7 +92776,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.2.0" @@ -92103,7 +92834,7 @@ in sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hash.js-1.1.7" @@ -92178,13 +92909,13 @@ in sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-splicer-2.0.1" @@ -92233,7 +92964,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -92778,7 +93509,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."redis-3.1.2" sources."redis-commands-1.7.0" @@ -92824,7 +93555,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" sources."standard-error-1.1.0" @@ -92913,7 +93644,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -92980,7 +93711,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) @@ -93241,7 +93972,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.17.0" @@ -93801,7 +94532,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-on-first-1.1.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -94009,10 +94740,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.154"; + version = "2.1.158"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.154.tgz"; - sha512 = "hDL2EkHS/hYLxmi6IvJv3JCR2vLCwvIsThc49NkTzMEJpEAsq72BJC1Es+MOI2q9Me8lGrtlj+63nm/U/Ca3uQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.158.tgz"; + sha512 = "8kyCshBRU1gPBHtGJs2VJtk2XB+tRcYoAK8zDd8d4fH0NoawJEk23KLc6T3ee5H2bhrz/8uJLNkO4sqeltSEvA=="; }; dependencies = [ sources."@jsii/check-node-1.77.0" @@ -94030,8 +94761,8 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.7.25" - sources."cdk8s-plus-25-2.4.47" + sources."cdk8s-2.7.30" + sources."cdk8s-plus-25-2.5.4" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -94044,7 +94775,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.272" + sources."constructs-10.1.276" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -94098,14 +94829,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.847" // { + (sources."jsii-srcmak-0.1.851" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.299" + sources."json2jsii-0.3.303" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" @@ -94284,7 +95015,7 @@ in sources."color-name-1.1.3" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.272" + sources."constructs-10.1.276" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -94425,7 +95156,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.847" // { + (sources."jsii-srcmak-0.1.851" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -94485,7 +95216,7 @@ in sources."react-17.0.2" sources."react-devtools-core-4.27.2" sources."react-reconciler-0.26.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -94726,7 +95457,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."strip-final-newline-2.0.0" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" @@ -95315,6 +96046,7 @@ in sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" + sources."array-buffer-byte-length-1.0.0" sources."async-2.6.4" sources."available-typed-arrays-1.0.5" sources."await-semaphore-0.1.3" @@ -95349,7 +96081,7 @@ in sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."execa-1.0.0" @@ -95430,7 +96162,7 @@ in sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -95482,6 +96214,7 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."streamroller-3.1.5" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -95676,7 +96409,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."bash-language-server-4.8.2" + sources."bash-language-server-4.8.3" sources."braces-3.0.2" sources."domino-2.1.6" sources."encoding-0.1.13" @@ -95709,7 +96442,7 @@ in sources."web-tree-sitter-0.20.7" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."zod-3.21.0" + sources."zod-3.21.4" ]; buildInputs = globalBuildInputs; meta = { @@ -95985,7 +96718,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -96022,7 +96755,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -96179,7 +96912,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."remark-13.0.0" sources."remark-parse-9.0.0" @@ -96206,7 +96939,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -97112,7 +97845,7 @@ in sources."ms-2.1.3" sources."one-time-1.0.0" sources."prom-client-14.1.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" @@ -97305,7 +98038,7 @@ in ]; }) sources."read-pkg-up-3.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -97315,7 +98048,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-1.0.1" sources."split2-3.2.2" sources."string-width-4.2.3" @@ -97877,7 +98610,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sshpk-1.17.0" sources."ssri-8.0.1" sources."statuses-2.0.1" @@ -97893,7 +98626,7 @@ in sources."systeminformation-5.17.12" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."through-2.3.8" @@ -98086,7 +98819,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."strip-indent-4.0.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" @@ -98126,7 +98859,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -98391,10 +99124,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.28.0"; + version = "6.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.28.0.tgz"; - sha512 = "HPw7bO0H6l8vXyUF0Ybp9IucVt15Og8YsOfQ4RIaCLU9uJP4RgwjwHVPnCJiQvhC5s4Zbw1WzX/+J8PP83oIUg=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.29.2.tgz"; + sha512 = "WB9FwcUc5viYPm7646bCa7DpNrSc07tXo5o9LuZ2WkmiTNje0RRxneEV9HjRp5t73o2XczSYtbhyVJL08N250Q=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -98409,10 +99142,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.28.0" - sources."@cspell/cspell-pipe-6.28.0" - sources."@cspell/cspell-service-bus-6.28.0" - sources."@cspell/cspell-types-6.28.0" + sources."@cspell/cspell-bundled-dicts-6.29.2" + sources."@cspell/cspell-pipe-6.29.2" + sources."@cspell/cspell-service-bus-6.29.2" + sources."@cspell/cspell-types-6.29.2" sources."@cspell/dict-ada-4.0.1" sources."@cspell/dict-aws-3.0.0" sources."@cspell/dict-bash-4.1.1" @@ -98454,13 +99187,13 @@ in sources."@cspell/dict-rust-4.0.1" sources."@cspell/dict-scala-4.0.1" sources."@cspell/dict-software-terms-3.1.5" - sources."@cspell/dict-sql-2.0.2" + sources."@cspell/dict-sql-2.1.0" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.1" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-6.28.0" - sources."@cspell/strong-weak-map-6.28.0" + sources."@cspell/dynamic-import-6.29.2" + sources."@cspell/strong-weak-map-6.29.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -98483,13 +99216,13 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.1.0" sources."crypto-random-string-2.0.0" - sources."cspell-dictionary-6.28.0" - sources."cspell-gitignore-6.28.0" - sources."cspell-glob-6.28.0" - sources."cspell-grammar-6.28.0" - sources."cspell-io-6.28.0" - sources."cspell-lib-6.28.0" - sources."cspell-trie-lib-6.28.0" + sources."cspell-dictionary-6.29.2" + sources."cspell-gitignore-6.29.2" + sources."cspell-glob-6.29.2" + sources."cspell-grammar-6.29.2" + sources."cspell-io-6.29.2" + sources."cspell-lib-6.29.2" + sources."cspell-trie-lib-6.29.2" sources."dot-prop-5.3.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -98520,7 +99253,7 @@ in sources."resolve-from-4.0.0" ]; }) - sources."import-meta-resolve-2.2.1" + sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -99203,7 +99936,7 @@ in sources."util-deprecate-1.0.2" (sources."utp-native-2.5.3" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."uuid-3.4.0" @@ -99600,7 +100333,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" @@ -99804,7 +100537,7 @@ in sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.2" - sources."listr2-5.0.7" + sources."listr2-5.0.8" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -99910,7 +100643,7 @@ in sources."find-up-2.1.0" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."rechoir-0.8.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -99948,7 +100681,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.1.2" sources."ssri-9.0.1" sources."string-width-4.2.3" @@ -99963,7 +100696,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."through-2.3.8" @@ -100016,10 +100749,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.7.2.tgz"; - sha512 = "S7LKa0mjC6FoWI8/t/ARJj4oi3e+fnZKaWE9iPEXbmeh+t2fZhYHmKm74wKwkJjUhId9zkH5l/ctbx72BrFWbA=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.8.0.tgz"; + sha512 = "nqRdupvtyeNec8DpO9D6RCY/MHVlchASeIUgnBZkS3n9hYkmU9TpVnPB0TvJCLf1SBqn98LbwgUUSLBYjoQM6A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -100050,7 +100783,7 @@ in }) sources."@expo/config-types-47.0.0" sources."@expo/eas-build-job-0.2.106" - (sources."@expo/eas-json-3.7.0" // { + (sources."@expo/eas-json-3.8.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; @@ -100208,7 +100941,7 @@ in sources."dir-glob-3.0.1" sources."domino-2.1.6" sources."dotenv-16.0.3" - sources."ejs-3.1.8" + sources."ejs-3.1.9" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."env-paths-2.2.0" @@ -100324,7 +101057,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -100470,7 +101203,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."widest-line-3.1.0" - sources."wonka-6.2.3" + sources."wonka-6.2.4" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -100670,7 +101403,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -100700,7 +101433,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -100869,7 +101602,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -101011,11 +101744,11 @@ in sources."@fluentui/foundation-legacy-8.2.32" sources."@fluentui/keyboard-key-0.4.5" sources."@fluentui/merge-styles-8.5.6" - sources."@fluentui/react-8.106.4" + sources."@fluentui/react-8.106.5" sources."@fluentui/react-focus-8.8.18" - sources."@fluentui/react-hooks-8.6.18" + sources."@fluentui/react-hooks-8.6.19" sources."@fluentui/react-portal-compat-context-9.0.4" - sources."@fluentui/react-window-provider-2.2.7" + sources."@fluentui/react-window-provider-2.2.8" sources."@fluentui/set-version-8.2.5" sources."@fluentui/style-utilities-8.9.5" sources."@fluentui/theme-2.6.24" @@ -101084,18 +101817,18 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@szmarczak/http-timer-1.1.2" sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" @@ -101259,6 +101992,7 @@ in sources."arr-flatten-1.1.0" sources."arr-map-2.0.2" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-each-1.0.1" sources."array-flatten-1.1.1" (sources."array-initial-1.1.0" // { @@ -101346,7 +102080,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -101506,7 +102240,7 @@ in sources."each-props-1.3.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -101529,7 +102263,7 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-aggregate-error-1.0.9" sources."es-module-lexer-0.9.3" sources."es-set-tostringtag-2.0.1" @@ -101894,7 +102628,7 @@ in ]; }) sources."ip-2.0.0" - sources."ip-num-1.5.0" + sources."ip-num-1.5.1" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -102054,7 +102788,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-7.4.2" sources."minimist-1.2.5" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -102141,7 +102875,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.18.0" + sources."swagger-ui-dist-4.18.1" ]; }) (sources."mixin-deep-1.3.2" // { @@ -102412,7 +103146,7 @@ in ]; }) sources."read-pkg-up-1.0.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ @@ -102582,7 +103316,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."split2-4.1.0" sources."sprintf-js-1.0.3" @@ -102626,6 +103360,7 @@ in }) sources."streamsearch-0.1.2" sources."string-width-4.2.3" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.3.0" // { @@ -102791,7 +103526,7 @@ in }) sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - (sources."webpack-5.76.0" // { + (sources."webpack-5.76.1" // { dependencies = [ sources."acorn-8.8.2" ]; @@ -102917,7 +103652,7 @@ in sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" @@ -103134,6 +103869,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array-uniq-1.0.3" @@ -103221,7 +103957,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.2.0" @@ -103269,7 +104005,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -103546,7 +104282,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.325" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103573,7 +104309,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -103863,7 +104599,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hash-sum-2.0.0" @@ -104774,11 +105510,11 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."split-string-3.1.0" @@ -104816,6 +105552,7 @@ in sources."strip-ansi-5.2.0" ]; }) + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -104848,7 +105585,7 @@ in (sources."tar-6.1.13" // { dependencies = [ sources."chownr-2.0.0" - sources."minipass-4.2.4" + sources."minipass-4.2.5" sources."mkdirp-1.0.4" ]; }) @@ -105197,14 +105934,16 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.35.0"; + version = "8.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; - sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.36.0.tgz"; + sha512 = "Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw=="; }; dependencies = [ - sources."@eslint/eslintrc-2.0.0" - sources."@eslint/js-8.35.0" + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + sources."@eslint/eslintrc-2.0.1" + sources."@eslint/js-8.36.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -105229,15 +105968,10 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.35.0" + sources."eslint-8.36.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -105286,7 +106020,6 @@ in sources."prelude-ls-1.2.1" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - sources."regexpp-3.2.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -105324,8 +106057,10 @@ in sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA=="; }; dependencies = [ - sources."@eslint/eslintrc-2.0.0" - sources."@eslint/js-8.35.0" + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + sources."@eslint/eslintrc-2.0.1" + sources."@eslint/js-8.36.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -105355,15 +106090,10 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.35.0" + sources."eslint-8.36.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -105413,7 +106143,6 @@ in sources."prelude-ls-1.2.1" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - sources."regexpp-3.2.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -105831,7 +106560,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" @@ -105960,7 +106689,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -106036,7 +106765,7 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.29.0" + sources."core-js-compat-3.29.1" sources."core-util-is-1.0.3" (sources."cross-fetch-3.1.5" // { dependencies = [ @@ -106106,7 +106835,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.325" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -106668,7 +107397,7 @@ in sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."regjsparser-0.9.1" // { @@ -106788,7 +107517,7 @@ in sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."split-1.0.1" @@ -106838,7 +107567,7 @@ in sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" sources."mkdirp-1.0.4" ]; }) @@ -106916,7 +107645,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.76.0" // { + (sources."webpack-5.76.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" @@ -106979,7 +107708,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-8.12.1" + sources."ws-8.13.0" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" @@ -107061,7 +107790,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@types/minimist-1.2.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" sources."@types/react-18.0.28" @@ -107092,7 +107821,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -107118,7 +107847,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -107240,7 +107969,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-3.0.0" sources."resolve-1.22.1" sources."resolve-from-3.0.0" @@ -107262,7 +107991,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -107394,7 +108123,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."bluebird-3.7.2" @@ -107747,7 +108476,7 @@ in ]; }) sources."@npmcli/move-file-2.0.1" - sources."@opentelemetry/api-1.4.0" + sources."@opentelemetry/api-1.4.1" sources."@opentelemetry/semantic-conventions-1.3.1" sources."@pnpm/config.env-replace-1.0.0" sources."@pnpm/network.ca-file-1.0.2" @@ -107771,7 +108500,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-5.1.2" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/rimraf-3.0.2" sources."@types/triple-beam-1.3.2" sources."abbrev-1.1.1" @@ -107993,7 +108722,7 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esprima-4.0.1" sources."estraverse-5.3.0" sources."esutils-2.0.3" @@ -108097,7 +108826,7 @@ in sources."gtoken-5.3.2" ]; }) - (sources."google-gax-3.5.7" // { + (sources."google-gax-3.5.8" // { dependencies = [ sources."google-auth-library-8.7.0" ]; @@ -108362,7 +109091,7 @@ in ]; }) sources."re2-1.18.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" (sources."readdir-glob-1.1.2" // { dependencies = [ sources."minimatch-5.1.6" @@ -108456,7 +109185,7 @@ in sources."supports-hyperlinks-2.3.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."tar-stream-2.2.0" @@ -108764,7 +109493,7 @@ in sources."type-fest-1.4.0" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -108783,7 +109512,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" @@ -108835,7 +109564,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.1" sources."@types/inquirer-6.5.0" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -108984,7 +109713,7 @@ in sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."reflect-metadata-0.1.13" sources."request-2.88.2" sources."request-promise-4.2.6" @@ -109492,12 +110221,12 @@ in (sources."winston-3.8.2" // { dependencies = [ sources."async-3.2.4" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."wordwrap-0.0.3" @@ -109560,7 +110289,7 @@ in dependencies = [ sources."@types/bn.js-5.1.1" sources."@types/lru-cache-5.1.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -109685,7 +110414,7 @@ in sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -109712,7 +110441,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109773,7 +110502,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -109917,7 +110646,7 @@ in sources."pump-3.0.0" sources."quick-lru-5.1.1" sources."read-1.0.7" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-3.0.2" sources."redux-4.2.1" sources."regenerator-runtime-0.13.11" @@ -110098,7 +110827,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."argparse-1.0.10" @@ -110118,7 +110847,7 @@ in sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."brace-expansion-2.0.1" @@ -110172,7 +110901,7 @@ in sources."dezalgo-1.0.4" sources."diff-5.1.0" sources."dir-glob-3.0.1" - sources."ejs-3.1.8" + sources."ejs-3.1.9" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."env-paths-2.2.1" @@ -110323,7 +111052,7 @@ in dependencies = [ sources."are-we-there-yet-3.0.1" sources."npmlog-6.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."which-2.0.2" ]; }) @@ -110453,7 +111182,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."string-width-4.2.3" @@ -110468,7 +111197,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."text-table-0.2.0" @@ -110853,7 +111582,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -110926,7 +111655,7 @@ in sources."qs-6.11.1" sources."query-string-7.1.3" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."resolve-alpn-1.2.1" sources."responselike-2.0.1" sources."restore-cursor-4.0.0" @@ -110954,6 +111683,322 @@ in bypassCache = true; reconstructLock = true; }; + "@githubnext/github-copilot-cli" = nodeEnv.buildNodePackage { + name = "_at_githubnext_slash_github-copilot-cli"; + packageName = "@githubnext/github-copilot-cli"; + version = "0.1.21"; + src = fetchurl { + url = "https://registry.npmjs.org/@githubnext/github-copilot-cli/-/github-copilot-cli-0.1.21.tgz"; + sha512 = "+GIGrl5MD8Mt5I/qbJkrqc746BFbdTg08D8kF8ni/jw/6B1MI0NW7zH86zRmiEN37vvBv/iccm6CXmu+16anqg=="; + }; + dependencies = [ + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + (sources."@azure/core-rest-pipeline-1.10.2" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.2.0" + sources."@azure/logger-1.0.4" + sources."@babel/runtime-7.21.0" + sources."@colors/colors-1.5.0" + (sources."@mapbox/node-pre-gyp-1.0.10" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."@microsoft/applicationinsights-web-snippet-1.0.1" + sources."@opentelemetry/api-1.4.1" + sources."@opentelemetry/core-1.10.0" + sources."@opentelemetry/resources-1.10.0" + sources."@opentelemetry/sdk-trace-base-1.10.0" + sources."@opentelemetry/semantic-conventions-1.10.0" + sources."@tootallnate/once-2.0.0" + sources."@types/prop-types-15.7.5" + sources."@types/react-18.0.28" + sources."@types/scheduler-0.16.2" + sources."@types/yoga-layout-1.9.2" + sources."abbrev-1.1.1" + sources."agent-base-6.0.2" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."any-promise-1.3.0" + sources."applicationinsights-2.5.0" + sources."applicationinsights-native-metrics-0.0.9" + sources."aproba-2.0.0" + sources."are-we-there-yet-2.0.0" + sources."arr-rotate-1.0.0" + sources."astral-regex-2.0.0" + sources."async-hook-jl-1.7.6" + sources."async-listener-0.6.10" + sources."asynckit-0.4.0" + sources."auto-bind-4.0.0" + sources."axios-1.3.4" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."big-integer-1.6.51" + sources."bl-5.1.0" + sources."brace-expansion-1.1.11" + sources."broadcast-channel-3.7.0" + sources."buffer-6.0.3" + sources."bufferutil-4.0.7" + sources."cardinal-2.1.1" + sources."chalk-5.2.0" + sources."chardet-0.7.0" + sources."chownr-2.0.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.11" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) + sources."cli-spinners-2.7.0" + sources."cli-table3-0.6.3" + sources."cli-truncate-2.1.0" + sources."cli-width-4.0.0" + sources."cliui-7.0.4" + sources."clone-1.0.4" + sources."cls-hooked-4.2.2" + sources."code-excerpt-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."color-support-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-9.5.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."continuation-local-storage-3.2.1" + sources."convert-to-spaces-1.0.2" + sources."csstype-3.1.1" + sources."debug-4.3.4" + sources."defaults-1.0.4" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-2.0.1" + sources."detect-node-2.1.0" + sources."diagnostic-channel-1.1.0" + sources."diagnostic-channel-publishers-1.0.5" + sources."eastasianwidth-0.2.0" + sources."emitter-listener-1.1.2" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" + sources."escalade-3.1.1" + sources."escape-string-regexp-2.0.0" + sources."esprima-4.0.1" + (sources."external-editor-3.1.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."follow-redirects-1.15.2" + sources."form-data-4.0.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."fs.realpath-1.0.0" + sources."gauge-3.0.2" + sources."get-caller-file-2.0.5" + sources."get-stream-6.0.1" + sources."glob-7.2.3" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."highlight.js-10.7.3" + sources."http-proxy-agent-5.0.0" + sources."https-proxy-agent-5.0.1" + sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" + sources."immer-9.0.19" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."ink-3.2.0" // { + dependencies = [ + sources."chalk-4.1.2" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."ink-divider-3.0.0" + sources."ink-select-input-4.2.2" + sources."ink-spinner-4.0.3" + (sources."ink-text-input-4.0.3" // { + dependencies = [ + sources."chalk-4.1.2" + sources."type-fest-0.15.1" + ]; + }) + (sources."inquirer-9.1.4" // { + dependencies = [ + sources."ansi-escapes-6.0.0" + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."cli-cursor-4.0.0" + sources."emoji-regex-9.2.2" + sources."escape-string-regexp-5.0.0" + sources."figures-5.0.0" + sources."restore-cursor-4.0.0" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + sources."type-fest-3.6.1" + sources."wrap-ansi-8.1.0" + ]; + }) + sources."is-ci-2.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-interactive-2.0.0" + sources."is-unicode-supported-1.3.0" + sources."js-sha3-0.8.0" + sources."js-tokens-4.0.0" + sources."lodash-4.17.21" + sources."lodash.isequal-4.5.0" + sources."log-symbols-5.1.0" + sources."loose-envify-1.4.0" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."marked-4.2.12" + (sources."marked-terminal-5.1.1" // { + dependencies = [ + sources."ansi-escapes-5.0.0" + sources."type-fest-1.4.0" + ]; + }) + sources."match-sorter-6.3.1" + sources."microseconds-0.2.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" + sources."minimatch-3.1.2" + sources."minipass-4.2.5" + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + ]; + }) + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.17.0" + sources."nano-time-1.0.0" + sources."node-emoji-1.11.0" + sources."node-fetch-2.6.9" + sources."node-gyp-build-4.6.0" + sources."nopt-5.0.0" + sources."npmlog-5.0.1" + sources."object-assign-4.1.1" + sources."oblivious-set-1.0.0" + sources."once-1.4.0" + sources."onetime-5.1.2" + (sources."ora-6.1.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."cli-cursor-4.0.0" + sources."restore-cursor-4.0.0" + sources."strip-ansi-7.0.1" + ]; + }) + sources."os-tmpdir-1.0.2" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."patch-console-1.0.0" + sources."path-is-absolute-1.0.1" + sources."prop-types-15.8.1" + sources."proxy-from-env-1.1.0" + sources."radash-9.5.0" + sources."react-17.0.2" + sources."react-devtools-core-4.27.2" + sources."react-dom-17.0.2" + sources."react-is-16.13.1" + sources."react-query-3.39.3" + sources."react-reconciler-0.26.2" + sources."readable-stream-3.6.2" + sources."redeyed-2.1.1" + sources."regenerator-runtime-0.13.11" + sources."remove-accents-0.4.2" + sources."require-directory-2.1.1" + sources."restore-cursor-3.1.0" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."rxjs-7.8.0" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."scheduler-0.20.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."shell-quote-1.8.0" + sources."shimmer-1.2.1" + sources."signal-exit-3.0.7" + sources."slice-ansi-3.0.0" + sources."stack-chain-1.3.7" + sources."stack-utils-2.0.6" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.3.0" + sources."tar-6.1.13" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."through-2.3.8" + sources."tiny-invariant-1.3.1" + sources."tmp-0.0.33" + sources."tr46-0.0.3" + sources."ts-dedent-2.2.0" + sources."tslib-2.5.0" + sources."type-fest-0.12.0" + sources."unload-2.2.0" + sources."use-sync-external-store-1.2.0" + sources."use-zustand-0.0.1" + sources."utf-8-validate-5.0.10" + sources."util-deprecate-1.0.2" + sources."uuid-9.0.0" + sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wide-align-1.1.5" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."ws-7.5.9" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + sources."yoga-layout-prebuilt-1.10.0" + sources."zustand-4.3.6" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A CLI experience for letting GitHub Copilot help you on the command line."; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; @@ -111073,7 +112118,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-7.0.0" + sources."execa-7.1.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -111178,7 +112223,7 @@ in sources."mute-stream-0.0.8" sources."netmask-2.0.2" sources."node-domexception-1.0.0" - sources."node-fetch-3.3.0" + sources."node-fetch-3.3.1" sources."normalize-package-data-4.0.1" sources."normalize-url-8.0.0" (sources."npm-run-path-5.1.0" // { @@ -111225,7 +112270,7 @@ in ]; }) sources."read-pkg-up-9.1.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-4.0.0" sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" @@ -111259,7 +112304,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."statuses-2.0.1" sources."string-width-5.1.2" sources."string_decoder-1.3.0" @@ -111324,7 +112369,7 @@ in sources."fs.realpath-1.0.0" sources."lru-cache-7.18.3" sources."minimatch-7.4.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" sources."path-scurry-1.6.1" ]; buildInputs = globalBuildInputs; @@ -111584,7 +112629,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.11" + sources."@exodus/schemasafe-1.0.0" sources."@graphql-cli/common-4.1.0" (sources."@graphql-cli/init-4.1.0" // { dependencies = [ @@ -111681,7 +112726,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-18.14.6" + sources."@types/node-18.15.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -112171,9 +113216,17 @@ in sources."@graphql-tools/batch-execute-8.5.18" sources."@graphql-tools/delegate-9.0.28" sources."@graphql-tools/executor-0.0.15" - sources."@graphql-tools/executor-graphql-ws-0.0.12" + (sources."@graphql-tools/executor-graphql-ws-0.0.12" // { + dependencies = [ + sources."ws-8.12.1" + ]; + }) sources."@graphql-tools/executor-http-0.1.9" - sources."@graphql-tools/executor-legacy-ws-0.0.9" + (sources."@graphql-tools/executor-legacy-ws-0.0.9" // { + dependencies = [ + sources."ws-8.12.1" + ]; + }) sources."@graphql-tools/graphql-file-loader-7.5.16" sources."@graphql-tools/import-6.7.17" sources."@graphql-tools/json-file-loader-7.4.17" @@ -112188,11 +113241,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@peculiar/asn1-schema-2.3.3" + sources."@peculiar/asn1-schema-2.3.6" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.4" sources."@vue/compiler-core-3.2.47" @@ -112348,7 +113401,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-16.2.0" @@ -112415,7 +113468,7 @@ in (sources."@graphql-tools/url-loader-7.17.14" // { dependencies = [ sources."isomorphic-ws-5.0.0" - sources."ws-8.12.1" + sources."ws-8.13.0" ]; }) sources."@graphql-tools/utils-9.2.1" @@ -112454,12 +113507,12 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@peculiar/asn1-schema-2.3.3" + sources."@peculiar/asn1-schema-2.3.6" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/ws-8.5.4" sources."@whatwg-node/events-0.0.2" sources."@whatwg-node/fetch-0.8.2" @@ -113469,7 +114522,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -113868,7 +114921,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -114287,7 +115340,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1332.0" + sources."aws-sdk-2.1334.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -114426,7 +115479,7 @@ in sources."qs-6.5.3" sources."querystring-0.2.0" sources."read-1.0.7" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."recursive-readdir-sync-1.0.6" (sources."request-2.88.2" // { dependencies = [ @@ -114864,7 +115917,7 @@ in sources."p-limit-3.1.0" sources."path-key-3.1.1" sources."picomatch-2.3.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -114928,10 +115981,10 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.8.0"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.8.0.tgz"; - sha512 = "dOu/+glVyQwPh7myO5ClPykijxCdSrsFAX4bOSqvrYiI9puBZ+5U8ljTc+al4KaUrhaI0QdanzYkqL8jzS5sIw=="; + url = "https://registry.npmjs.org/insect/-/insect-5.8.2.tgz"; + sha512 = "tUESkfAyk3IXd+bHPANmW9j8RV/1zz20hxM6qtL6K3j2lEB2nO55GpFXI4eHkbAKCkBaJA65zHbT2bBK0lNwvw=="; }; dependencies = [ sources."@jcubic/lily-0.3.0" @@ -114942,7 +115995,7 @@ in sources."clipboardy-2.3.0" sources."clone-1.0.4" sources."cross-spawn-6.0.5" - sources."decimal.js-10.4.3" + sources."decimal.js-10.3.1" sources."defaults-1.0.4" sources."end-of-stream-1.4.4" sources."execa-1.0.0" @@ -115011,11 +116064,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.4.0" - sources."@opentelemetry/core-1.9.1" - sources."@opentelemetry/resources-1.9.1" - sources."@opentelemetry/sdk-trace-base-1.9.1" - sources."@opentelemetry/semantic-conventions-1.9.1" + sources."@opentelemetry/api-1.4.1" + sources."@opentelemetry/core-1.10.0" + sources."@opentelemetry/resources-1.10.0" + sources."@opentelemetry/sdk-trace-base-1.10.0" + sources."@opentelemetry/semantic-conventions-1.10.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -115027,7 +116080,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.10.0" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -115167,7 +116220,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -115197,7 +116250,7 @@ in sources."qs-6.5.3" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -115508,7 +116561,7 @@ in sources."pump-3.0.0" sources."qs-6.11.1" sources."raw-body-2.5.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" @@ -115848,20 +116901,20 @@ in sources."@aws-sdk/property-provider-3.226.0" sources."@aws-sdk/protocol-http-3.226.0" sources."@aws-sdk/querystring-builder-3.226.0" - (sources."@aws-sdk/querystring-parser-3.272.0" // { + (sources."@aws-sdk/querystring-parser-3.290.0" // { dependencies = [ - sources."@aws-sdk/types-3.272.0" + sources."@aws-sdk/types-3.290.0" ]; }) sources."@aws-sdk/s3-request-presigner-3.241.0" sources."@aws-sdk/service-error-classification-3.229.0" sources."@aws-sdk/shared-ini-file-loader-3.226.0" sources."@aws-sdk/signature-v4-3.226.0" - (sources."@aws-sdk/signature-v4-crt-3.282.0" // { + (sources."@aws-sdk/signature-v4-crt-3.290.0" // { dependencies = [ - sources."@aws-sdk/signature-v4-3.282.0" - sources."@aws-sdk/types-3.272.0" - sources."@aws-sdk/util-middleware-3.272.0" + sources."@aws-sdk/signature-v4-3.290.0" + sources."@aws-sdk/types-3.290.0" + sources."@aws-sdk/util-middleware-3.290.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.226.0" @@ -115917,7 +116970,7 @@ in sources."gauge-3.0.2" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-5.0.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."rimraf-3.0.2" sources."semver-7.3.8" sources."string-width-4.2.3" @@ -115936,7 +116989,7 @@ in }) sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/ws-8.5.4" sources."abab-2.0.6" sources."abbrev-1.1.1" @@ -116000,7 +117053,7 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."bluebird-3.7.2" @@ -116072,7 +117125,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."console-control-strings-1.1.0" @@ -116274,7 +117327,7 @@ in sources."he-1.2.0" (sources."help-me-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."highlight.js-11.7.0" @@ -116485,7 +117538,7 @@ in (sources."mqtt-4.3.7" // { dependencies = [ sources."duplexify-4.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."utf-8-validate-5.0.10" sources."ws-7.5.9" ]; @@ -116523,7 +117576,7 @@ in sources."gauge-4.0.4" sources."is-fullwidth-code-point-3.0.0" sources."npmlog-6.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."rimraf-3.0.2" sources."semver-7.3.8" sources."string-width-4.2.3" @@ -116669,7 +117722,7 @@ in sources."split-skip-0.0.2" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."splitargs-0.0.7" @@ -116688,7 +117741,7 @@ in sources."string-padding-1.0.2" (sources."string-to-stream-3.0.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."string-width-1.0.2" // { @@ -116725,7 +117778,7 @@ in sources."minipass-3.3.6" ]; }) - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -116737,7 +117790,7 @@ in sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."tcp-port-used-1.0.2" // { @@ -116831,7 +117884,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xml-name-validator-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -117102,7 +118155,7 @@ in sources."path-loader-1.0.12" sources."punycode-2.3.0" sources."qs-6.11.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."side-channel-1.0.4" @@ -117134,13 +118187,15 @@ in sha512 = "PKmTFfiUduibc9QyieY9PDiSG4CttFpqpVkwTvWWbGQaah4Id/gKqn5er4dnynUw4GVdjAzGKjSbBuVIlXM6mw=="; }; dependencies = [ - (sources."@eslint/eslintrc-2.0.0" // { + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + (sources."@eslint/eslintrc-2.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.35.0" + sources."@eslint/js-8.36.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" @@ -117160,6 +118215,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-includes-3.1.6" sources."array.prototype.flat-1.3.1" @@ -117211,14 +118267,14 @@ in sources."encodeurl-1.0.2" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.35.0" // { + (sources."eslint-8.36.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117270,7 +118326,7 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -117473,6 +118529,7 @@ in sources."steno-0.4.4" sources."string-width-4.2.3" sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."strip-ansi-6.0.1" @@ -118027,7 +119084,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."sshpk-1.17.0" (sources."static-extend-0.1.2" // { @@ -118392,7 +119449,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -118629,7 +119686,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@openpgp/hkp-client-0.0.2" sources."@openpgp/wkd-client-0.0.3" - sources."@peculiar/asn1-schema-2.3.3" + sources."@peculiar/asn1-schema-2.3.6" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@tootallnate/once-1.1.2" @@ -118676,6 +119733,7 @@ in sources."ansi-styles-3.2.1" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.reduce-1.0.5" @@ -118710,7 +119768,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -118731,7 +119789,7 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -118770,13 +119828,13 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -118947,7 +120005,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -119063,7 +120121,7 @@ in ]; }) sources."rc-1.2.8" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" sources."require-directory-2.1.1" @@ -119116,6 +120174,7 @@ in }) sources."strict-uri-encode-2.0.0" sources."string-width-4.2.3" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.3.0" @@ -119182,7 +120241,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -119827,18 +120886,18 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.1.7" - sources."@nrwl/cli-15.8.5" - sources."@nrwl/devkit-15.8.5" - sources."@nrwl/nx-darwin-arm64-15.8.5" - sources."@nrwl/nx-darwin-x64-15.8.5" - sources."@nrwl/nx-linux-arm-gnueabihf-15.8.5" - sources."@nrwl/nx-linux-arm64-gnu-15.8.5" - sources."@nrwl/nx-linux-arm64-musl-15.8.5" - sources."@nrwl/nx-linux-x64-gnu-15.8.5" - sources."@nrwl/nx-linux-x64-musl-15.8.5" - sources."@nrwl/nx-win32-arm64-msvc-15.8.5" - sources."@nrwl/nx-win32-x64-msvc-15.8.5" - sources."@nrwl/tao-15.8.5" + sources."@nrwl/cli-15.8.6" + sources."@nrwl/devkit-15.8.6" + sources."@nrwl/nx-darwin-arm64-15.8.6" + sources."@nrwl/nx-darwin-x64-15.8.6" + sources."@nrwl/nx-linux-arm-gnueabihf-15.8.6" + sources."@nrwl/nx-linux-arm64-gnu-15.8.6" + sources."@nrwl/nx-linux-arm64-musl-15.8.6" + sources."@nrwl/nx-linux-x64-gnu-15.8.6" + sources."@nrwl/nx-linux-x64-musl-15.8.6" + sources."@nrwl/nx-win32-arm64-msvc-15.8.6" + sources."@nrwl/nx-win32-x64-msvc-15.8.6" + sources."@nrwl/tao-15.8.6" sources."@octokit/auth-token-3.0.3" sources."@octokit/core-4.2.0" sources."@octokit/endpoint-7.0.5" @@ -119867,17 +120926,17 @@ in sources."@swc-node/core-1.10.1" sources."@swc-node/register-1.6.2" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" sources."@tootallnate/once-2.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -120017,7 +121076,7 @@ in sources."dot-prop-6.0.1" sources."dotenv-10.0.0" sources."duplexer-0.1.2" - sources."ejs-3.1.8" + sources."ejs-3.1.9" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -120304,7 +121363,7 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.8.5" // { + (sources."nx-15.8.6" // { dependencies = [ sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" @@ -120401,7 +121460,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdir-scoped-modules-1.1.0" sources."redent-3.0.0" sources."require-directory-2.1.1" @@ -120439,7 +121498,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -121510,7 +122569,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -122106,6 +123165,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-differ-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" @@ -122184,7 +123244,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -122202,7 +123262,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -122289,7 +123349,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -122320,7 +123380,7 @@ in sources."errno-0.1.8" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -122449,7 +123509,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -122718,7 +123778,7 @@ in }) sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -122832,7 +123892,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."ssri-6.0.2" @@ -122868,6 +123928,7 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" @@ -123407,13 +124468,15 @@ in sources."chalk-2.4.2" ]; }) - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" + sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" + sources."brace-expansion-2.0.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.7" @@ -123435,7 +124498,9 @@ in sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" + sources."glob-9.2.1" sources."has-flag-3.0.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -123447,6 +124512,9 @@ in sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" sources."lines-and-columns-1.2.4" + sources."lru-cache-7.18.3" + sources."minimatch-7.4.2" + sources."minipass-4.2.5" sources."mitt-3.0.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -123455,15 +124523,17 @@ in sources."once-1.4.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" + sources."path-scurry-1.6.1" sources."path-type-4.0.0" sources."pend-1.2.0" sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.7.3" - sources."puppeteer-core-19.7.3" - sources."readable-stream-3.6.1" + sources."puppeteer-19.7.4" + sources."puppeteer-core-19.7.4" + sources."readable-stream-3.6.2" sources."resolve-from-4.0.0" + sources."rimraf-4.4.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."string_decoder-1.3.0" @@ -123651,7 +124721,7 @@ in sources."path-loader-1.0.12" sources."punycode-2.3.0" sources."qs-6.11.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."side-channel-1.0.4" @@ -123725,7 +124795,7 @@ in sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.7" @@ -123819,7 +124889,7 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" @@ -124026,7 +125096,7 @@ in ]; }) sources."react-is-17.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."remove-trailing-slash-0.1.1" @@ -124145,7 +125215,7 @@ in sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" sources."semver-7.3.8" @@ -124272,7 +125342,7 @@ in sources."path-is-absolute-1.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."retry-0.12.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" @@ -124293,7 +125363,7 @@ in sources."strip-ansi-6.0.1" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" ]; }) sources."unique-filename-2.0.1" @@ -124562,7 +125632,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."sshpk-1.17.0" // { dependencies = [ sources."assert-plus-1.0.0" @@ -124763,7 +125833,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.14.6" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -124782,7 +125852,7 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."argparse-2.0.1" @@ -124801,7 +125871,7 @@ in sources."bcryptjs-2.4.3" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."body-parser-1.20.0" @@ -124861,7 +125931,7 @@ in sources."domutils-2.8.0" (sources."duplexify-4.1.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."ee-first-1.1.1" @@ -124909,7 +125979,7 @@ in sources."hash-sum-2.0.0" (sources."help-me-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hpagent-1.0.0" @@ -124987,7 +126057,7 @@ in sources."debug-4.3.4" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."yallist-4.0.0" ]; }) @@ -125080,7 +126150,7 @@ in sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."statuses-2.0.1" @@ -125220,7 +126290,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -125288,7 +126358,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sshpk-1.17.0" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -125431,7 +126501,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -125862,7 +126932,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-1.0.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -126160,7 +127230,7 @@ in sources."mimic-response-4.0.0" sources."minimatch-7.4.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -126266,7 +127336,7 @@ in ]; }) sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."registry-auth-token-5.0.2" sources."registry-url-6.0.1" sources."remote-git-tags-3.0.0" @@ -126311,7 +127381,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."ssri-10.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -126531,7 +127601,7 @@ in sources."@asyncapi/specs-4.1.2" sources."@esbuild/android-arm-0.15.18" sources."@esbuild/linux-loong64-0.15.18" - sources."@exodus/schemasafe-1.0.0-rc.11" + sources."@exodus/schemasafe-1.0.0" sources."@ibm-cloud/openapi-ruleset-0.45.5" sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" sources."@jsdevtools/ono-7.1.3" @@ -126591,7 +127661,7 @@ in sources."@types/es-aggregate-error-1.0.2" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.11" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -126606,6 +127676,7 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."argparse-1.0.10" + sources."array-buffer-byte-length-1.0.0" sources."array-union-2.1.0" sources."as-table-1.0.55" sources."ast-types-0.14.2" @@ -126652,7 +127723,7 @@ in sources."encoding-0.1.13" sources."enquirer-2.3.6" sources."eol-0.9.1" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-aggregate-error-1.0.9" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -126915,6 +127986,7 @@ in sources."statuses-2.0.1" sources."string-argv-0.3.1" sources."string-width-4.2.3" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-0.10.31" @@ -126927,7 +127999,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tsconfck-2.0.3" + sources."tsconfck-2.1.0" sources."tslib-2.5.0" sources."type-check-0.3.2" sources."typed-array-length-1.0.4" @@ -127147,6 +128219,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-equal-1.0.0" sources."array-unique-0.3.2" sources."array.prototype.reduce-1.0.5" @@ -127212,7 +128285,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -127238,7 +128311,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -127264,7 +128337,7 @@ in sources."convert-source-map-1.9.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.29.0" + sources."core-js-compat-3.29.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -127371,7 +128444,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -127381,7 +128454,7 @@ in sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.21.1" // { + (sources."es-abstract-1.21.2" // { dependencies = [ sources."object-inspect-1.12.3" ]; @@ -127473,7 +128546,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" ]; }) @@ -127760,7 +128833,7 @@ in sources."domhandler-2.4.2" sources."entities-1.1.2" sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."posthtml-render-1.4.0" @@ -127806,7 +128879,7 @@ in ]; }) sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -127904,6 +128977,7 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."string_decoder-1.1.1" @@ -128160,7 +129234,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -128209,7 +129283,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.326" + sources."electron-to-chromium-1.4.328" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -129064,7 +130138,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -129401,7 +130475,7 @@ in sources."raw-body-2.5.2" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.3" @@ -129549,7 +130623,7 @@ in sources."base64-js-1.5.1" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."braces-3.0.2" @@ -129612,7 +130686,7 @@ in sources."ms-2.1.2" (sources."multistream-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."napi-build-utils-1.0.2" @@ -129653,7 +130727,7 @@ in sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."to-fast-properties-2.0.0" @@ -130014,23 +131088,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" @@ -130149,7 +131223,7 @@ in sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."simple-concat-1.0.1" @@ -130324,7 +131398,7 @@ in sources."browserslist-4.21.5" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -130337,7 +131411,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.326" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -130554,7 +131628,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.2.0" @@ -130570,7 +131644,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."console-browserify-1.2.0" @@ -130624,7 +131698,7 @@ in sources."has-1.0.3" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hash.js-1.1.7" @@ -130730,7 +131804,7 @@ in sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-splicer-2.0.1" @@ -130988,12 +132062,17 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "23.0.12"; + version = "23.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.12.tgz"; - sha512 = "g8NIN7MyJG9/Lh+2NdQ8vv8tHUNXKNZT0zjFyAVuch7NweuCRA67NLoePSkSbolRq0YmnWbEA/a54VW15dtO+A=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-23.0.17.tgz"; + sha512 = "Jm/C8sdhLGTDSrJO3Ok4g7mdQoI1G+qIZdWLHwRReXjU6JIH0KwspLALRj9VC3kUGVBO+7WOiqubZlzjs+taOQ=="; }; dependencies = [ + (sources."@75lb/deep-merge-1.1.1" // { + dependencies = [ + sources."typical-7.1.1" + ]; + }) sources."@cspotcode/source-map-support-0.8.1" sources."@glideapps/ts-necessities-2.1.2" sources."@jridgewell/resolve-uri-3.1.0" @@ -131004,24 +132083,24 @@ in sources."typescript-4.9.4" ]; }) - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" - sources."@types/node-16.18.14" + sources."@types/node-16.18.15" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" sources."acorn-8.8.2" @@ -131036,32 +132115,25 @@ in sources."browser-or-node-2.1.1" sources."buffer-6.0.3" sources."chalk-4.1.2" + sources."chalk-template-0.4.0" sources."cliui-8.0.1" sources."collection-utils-1.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."command-line-args-5.2.1" - (sources."command-line-usage-6.1.3" // { + (sources."command-line-usage-7.0.1" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."array-back-4.0.2" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - sources."typical-5.2.0" + sources."array-back-6.2.2" + sources."typical-7.1.1" ]; }) sources."concat-map-0.0.1" sources."create-require-1.1.1" sources."cross-fetch-3.1.5" - sources."deep-extend-0.6.0" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."event-target-shim-5.0.1" sources."events-3.3.0" sources."find-replace-3.0.0" @@ -131079,6 +132151,7 @@ in sources."iterall-1.1.3" sources."js-base64-3.7.5" sources."lodash-4.17.21" + sources."lodash.assignwith-4.2.0" sources."lodash.camelcase-4.3.0" sources."make-error-1.3.6" sources."minimatch-3.1.2" @@ -131090,30 +132163,30 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-23.0.12" - sources."quicktype-graphql-input-23.0.12" - sources."quicktype-typescript-input-23.0.12" + sources."quicktype-core-23.0.17" + sources."quicktype-graphql-input-23.0.17" + sources."quicktype-typescript-input-23.0.17" sources."readable-stream-4.3.0" - sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" sources."stream-chain-2.2.5" sources."stream-json-1.7.5" + sources."stream-read-all-3.0.1" (sources."string-to-stream-3.0.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" - (sources."table-layout-1.0.2" // { + (sources."table-layout-3.0.2" // { dependencies = [ - sources."array-back-4.0.2" - sources."typical-5.2.0" + sources."array-back-6.2.2" + sources."typical-7.1.1" ]; }) sources."tiny-inflate-1.0.3" @@ -131133,11 +132206,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wordwrap-1.0.0" - (sources."wordwrapjs-4.0.1" // { - dependencies = [ - sources."typical-5.2.0" - ]; - }) + sources."wordwrapjs-5.1.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -131418,7 +132487,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" @@ -131472,6 +132541,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-union-1.0.2" sources."array-uniq-1.0.3" @@ -131575,7 +132645,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.1.4" @@ -131609,7 +132679,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -131686,7 +132756,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.29.0" + sources."core-js-compat-3.29.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -131830,7 +132900,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -131861,7 +132931,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" @@ -132042,7 +133112,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hash.js-1.1.7" @@ -132575,7 +133645,7 @@ in sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" (sources."regjsparser-0.9.1" // { @@ -132766,7 +133836,7 @@ in sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."split-string-3.1.0" @@ -132801,6 +133871,7 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -132838,7 +133909,7 @@ in dependencies = [ sources."bl-4.1.0" sources."pump-3.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."tar-stream-2.2.0" ]; }) @@ -133221,7 +134292,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -133250,7 +134321,7 @@ in sources."psl-1.9.0" sources."punycode-2.3.0" sources."querystringify-2.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."require-directory-2.1.1" sources."requires-port-1.0.0" sources."rimraf-3.0.2" @@ -133285,7 +134356,7 @@ in sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -133341,7 +134412,7 @@ in sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.11" + sources."@exodus/schemasafe-1.0.0" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -133349,8 +134420,8 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.123" - sources."@types/eslint-8.21.1" + sources."@redocly/openapi-core-1.0.0-beta.124" + sources."@types/eslint-8.21.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" @@ -133412,7 +134483,7 @@ in (sources."browserify-sign-4.2.1" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.2.0" @@ -133424,7 +134495,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" @@ -133439,7 +134510,7 @@ in sources."commander-2.20.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -133461,7 +134532,7 @@ in }) sources."domain-browser-1.2.0" sources."dompurify-2.4.5" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -133501,7 +134572,7 @@ in (sources."hash-base-3.1.0" // { dependencies = [ sources."inherits-2.0.4" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."hash.js-1.1.7" // { @@ -133684,7 +134755,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-2.4.0" sources."webidl-conversions-3.0.1" - sources."webpack-5.76.0" + sources."webpack-5.76.1" sources."webpack-sources-3.2.3" sources."whatwg-url-5.0.0" sources."widest-line-3.1.0" @@ -133821,7 +134892,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -134193,7 +135264,7 @@ in sources."glob-9.2.1" sources."lru-cache-7.18.3" sources."minimatch-7.4.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" sources."path-scurry-1.6.1" ]; buildInputs = globalBuildInputs; @@ -134209,10 +135280,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.19.0"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.19.0.tgz"; - sha512 = "xZzJZlH9Ca6cosfdNGPwl2z7Pby8dTi9TrYLPeg6/j7aUoDOhBd706tCUFvbiBj45h/cS7z/a4gS8xd5Yg0jBw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.19.1.tgz"; + sha512 = "lAbrdN7neYCg/8WaoWn/ckzCtz+jr70GFfYdlf50OF7387HTg+wiuiqJRFYawwSPpqfqDNYqK7smY/ks2iAudg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -134233,13 +135304,15 @@ in version = "0.3.1426"; src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - (sources."@eslint/eslintrc-2.0.0" // { + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + (sources."@eslint/eslintrc-2.0.1" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" ]; }) - sources."@eslint/js-8.35.0" + sources."@eslint/js-8.36.0" sources."@hpcc-js/wasm-2.5.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ @@ -134257,14 +135330,14 @@ in sources."@types/node-16.11.68" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.54.1" - sources."@typescript-eslint/parser-5.54.1" - sources."@typescript-eslint/scope-manager-5.54.1" - sources."@typescript-eslint/type-utils-5.54.1" - sources."@typescript-eslint/types-5.54.1" - sources."@typescript-eslint/typescript-estree-5.54.1" - sources."@typescript-eslint/utils-5.54.1" - sources."@typescript-eslint/visitor-keys-5.54.1" + sources."@typescript-eslint/eslint-plugin-5.55.0" + sources."@typescript-eslint/parser-5.55.0" + sources."@typescript-eslint/scope-manager-5.55.0" + sources."@typescript-eslint/type-utils-5.55.0" + sources."@typescript-eslint/types-5.55.0" + sources."@typescript-eslint/typescript-estree-5.55.0" + sources."@typescript-eslint/utils-5.55.0" + sources."@typescript-eslint/visitor-keys-5.55.0" sources."@vscode/test-electron-2.3.0" sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" @@ -134280,7 +135353,7 @@ in sources."base64-js-1.5.1" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."boolbase-1.0.0" @@ -134354,7 +135427,7 @@ in sources."entities-4.4.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.35.0" // { + (sources."eslint-8.36.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."eslint-scope-7.1.1" @@ -134365,13 +135438,8 @@ in }) sources."eslint-config-prettier-8.7.0" sources."eslint-scope-5.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" (sources."esquery-1.5.0" // { dependencies = [ sources."estraverse-5.3.0" @@ -134512,7 +135580,6 @@ in }) sources."read-1.0.7" sources."readable-stream-2.3.8" - sources."regexpp-3.2.0" sources."require-directory-2.1.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -134539,7 +135606,7 @@ in sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."text-table-0.2.0" @@ -134727,10 +135794,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.58.3"; + version = "1.59.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz"; - sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.59.2.tgz"; + sha512 = "jJyO6SmbzkJexF8MUorHx5tAilcgabioYxT/BHbY4+OvoqmbHxsYlrjZ8Adhqcgl6Zqwie0TgMXLCAmPFxXOuw=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -134740,7 +135807,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."glob-parent-5.1.2" - sources."immutable-4.2.4" + sources."immutable-4.3.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -134939,9 +136006,10 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.8.2" // { + (sources."@serverless/utils-6.9.0" // { dependencies = [ sources."jwt-decode-3.1.2" + sources."ms-2.1.3" sources."uuid-8.3.2" ]; }) @@ -134952,7 +136020,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.191" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -134969,7 +136037,7 @@ in }) (sources."archiver-5.3.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."archiver-utils-2.1.0" @@ -134980,7 +136048,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1332.0" // { + (sources."aws-sdk-2.1334.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -134994,7 +136062,7 @@ in sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."bluebird-3.7.2" @@ -135046,7 +136114,7 @@ in sources."component-emitter-1.3.0" (sources."compress-commons-4.1.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."concat-map-0.0.1" @@ -135060,7 +136128,7 @@ in sources."crc-32-1.2.2" (sources."crc32-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."cross-spawn-6.0.5" // { @@ -135267,7 +136335,7 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -135322,7 +136390,7 @@ in sources."readable-stream-2.3.8" (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."readdir-glob-1.1.2" // { @@ -135357,7 +136425,7 @@ in sources."sort-keys-length-1.0.1" (sources."split2-3.2.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."sprintf-js-1.0.3" @@ -135371,7 +136439,7 @@ in sources."strtok3-6.3.0" (sources."superagent-7.1.6" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."supports-color-8.1.1" // { @@ -135382,7 +136450,7 @@ in sources."tar-6.1.13" (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."throat-5.0.0" @@ -135432,7 +136500,7 @@ in sources."yauzl-2.10.0" (sources."zip-stream-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) ]; @@ -136081,16 +137149,16 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1116.0"; + version = "1.1118.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1116.0.tgz"; - sha512 = "xe14nvgfY4bMC0VZU9Q+0IF4CPNceEaK4R8mqjTvvRjINu0MfV66lhXJnYRU/oaxAWCoAIPYR0J9LpG45r04yg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1118.0.tgz"; + sha512 = "zddbk/h6CHrcSGFB381LsnTIHj4oD0CeCspNnHVsVmExthr1gZWbCzs3aVztN9NSmkfh7Zx8QLnGmvG6b5m7hw=="; }; dependencies = [ - sources."@sentry/core-7.42.0" - sources."@sentry/node-7.42.0" - sources."@sentry/types-7.42.0" - sources."@sentry/utils-7.42.0" + sources."@sentry/core-7.43.0" + sources."@sentry/node-7.43.0" + sources."@sentry/types-7.43.0" + sources."@sentry/utils-7.43.0" sources."agent-base-6.0.2" sources."boolean-3.2.0" sources."cookie-0.4.2" @@ -136143,7 +137211,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.7" @@ -136278,7 +137346,7 @@ in sources."quick-lru-5.1.1" sources."read-pkg-6.0.0" sources."read-pkg-up-8.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."redent-4.0.0" sources."restore-cursor-4.0.0" sources."round-to-6.0.0" @@ -136294,7 +137362,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -136373,6 +137441,7 @@ in sha512 = "+KXfMBecoFFAo0C4FTfSsH2ZXtrL2aQDXgVlQ0NrYdNLHW2TEnibV0hG3yq3hOlAEUQmrwVHZATfVToO825gxA=="; }; dependencies = [ + sources."@alloc/quick-lru-5.2.0" (sources."@sammacbeth/random-access-idb-mutable-file-0.1.1" // { dependencies = [ sources."buffer-5.1.0" @@ -136389,12 +137458,13 @@ in sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-buffer-byte-length-1.0.0" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.1.4" // { + (sources."async-append-only-log-4.3.9" // { dependencies = [ sources."push-stream-11.2.0" ]; @@ -136404,7 +137474,7 @@ in sources."async-write-2.1.0" sources."atob-2.1.2" sources."atomic-file-1.1.5" - sources."atomic-file-rw-0.2.2" + sources."atomic-file-rw-0.3.0" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.5" sources."b4a-1.6.2" @@ -136419,12 +137489,13 @@ in sources."base64-js-1.5.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" - sources."bencode-2.0.3" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" sources."bipf-1.9.0" + sources."blake2b-2.1.4" + sources."blake2b-wasm-2.4.0" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -136434,6 +137505,7 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" + sources."buffer-xor-2.0.2" sources."bufferutil-4.0.7" (sources."cache-base-1.0.1" // { dependencies = [ @@ -136443,6 +137515,7 @@ in sources."call-bind-1.0.2" sources."camelcase-2.1.1" sources."ccount-1.1.0" + sources."chacha20-universal-1.0.4" sources."chalk-1.1.3" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -136529,9 +137602,15 @@ in sources."abstract-leveldown-6.3.0" ]; }) + sources."envelope-js-1.3.2" + (sources."envelope-spec-1.1.1" // { + dependencies = [ + sources."ssb-bfe-1.1.0" + ]; + }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.8" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" (sources."es-get-iterator-1.1.3" // { dependencies = [ sources."isarray-2.0.5" @@ -136555,7 +137634,7 @@ in sources."extglob-0.3.2" sources."fast-varint-1.0.1" sources."fastintcompression-0.0.4" - sources."fastpriorityqueue-0.7.3" + sources."fastpriorityqueue-0.7.4" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" @@ -136604,6 +137683,9 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" + sources."futoin-hkdf-1.5.1" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -136666,6 +137748,7 @@ in sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" + sources."is-buffer-zero-1.0.0" sources."is-callable-1.2.7" sources."is-canonical-base64-1.1.1" sources."is-core-module-2.11.0" @@ -136689,6 +137772,9 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.4" sources."is-map-2.0.2" + sources."is-my-ip-valid-1.0.1" + sources."is-my-json-valid-2.20.6" + sources."is-my-ssb-valid-1.2.2" sources."is-negative-zero-2.0.2" sources."is-number-2.1.0" sources."is-number-object-1.0.7" @@ -136700,6 +137786,7 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" + sources."is-property-1.0.2" sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.2" @@ -136715,15 +137802,17 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-4.1.0" // { + (sources."jitdb-7.0.7" // { dependencies = [ + sources."glob-7.2.3" sources."mkdirp-1.0.4" - sources."obz-1.0.3" sources."push-stream-11.2.0" + sources."rimraf-3.0.2" ]; }) sources."jsesc-3.0.2" sources."json-buffer-2.0.11" + sources."jsonpointer-5.0.1" sources."kind-of-3.2.2" sources."layered-graph-1.2.0" sources."level-5.0.1" @@ -136732,7 +137821,7 @@ in sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."level-js-4.0.2" // { @@ -136804,6 +137893,7 @@ in ]; }) sources."nan-2.17.0" + sources."nanoassert-2.0.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -136816,7 +137906,6 @@ in sources."nearley-2.20.1" sources."next-tick-1.1.0" sources."nice-try-1.0.5" - sources."node-bindgen-loader-1.0.1" sources."node-gyp-build-4.6.0" sources."non-private-ip-2.2.0" sources."normalize-path-2.1.1" @@ -136880,6 +137969,7 @@ in sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" sources."private-box-0.3.1" + sources."private-group-spec-1.2.0" sources."process-nextick-args-2.0.1" sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" @@ -137068,10 +138158,15 @@ in ]; }) sources."sha.js-2.4.5" + sources."sha256-universal-1.2.1" + sources."sha256-wasm-2.2.2" + sources."sha512-universal-1.2.1" + sources."sha512-wasm-2.3.4" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."side-channel-1.0.4" + sources."siphash24-1.3.1" sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -137113,26 +138208,26 @@ in ]; }) sources."sodium-chloride-1.1.2" + sources."sodium-javascript-0.8.0" sources."sodium-native-3.4.1" + sources."sodium-universal-3.1.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.5" // { - dependencies = [ - (sources."ssb-keys-8.5.0" // { - dependencies = [ - sources."ssb-uri2-2.4.1" - ]; - }) - sources."ssb-uri2-1.9.0" - ]; - }) + sources."ssb-about-self-1.1.0" sources."ssb-bfe-3.7.0" sources."ssb-bfe-spec-0.8.0" sources."ssb-blobs-1.2.2" + sources."ssb-box-1.0.1" + sources."ssb-box2-3.0.1" sources."ssb-caps-1.1.0" + (sources."ssb-classic-1.1.0" // { + dependencies = [ + sources."ssb-keys-8.5.0" + ]; + }) sources."ssb-client-4.9.0" (sources."ssb-config-3.4.6" // { dependencies = [ @@ -137140,7 +138235,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.11" // { + (sources."ssb-db2-7.0.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -137157,14 +138252,12 @@ in (sources."ssb-keys-8.5.0" // { dependencies = [ sources."mkdirp-0.5.6" - sources."ssb-uri2-2.4.1" ]; }) - sources."ssb-uri2-1.9.0" ]; }) sources."ssb-ebt-5.6.7" - (sources."ssb-friends-4.4.7" // { + (sources."ssb-friends-4.4.8" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -137178,11 +138271,21 @@ in sources."level-js-5.0.2" ]; }) + (sources."ssb-keyring-2.2.0" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."level-6.0.1" + sources."level-js-5.0.2" + sources."mkdirp-1.0.4" + sources."ssb-private-group-keys-1.1.2" + ]; + }) sources."ssb-keys-7.2.2" sources."ssb-links-3.0.10" sources."ssb-local-1.0.0" sources."ssb-logging-1.0.0" sources."ssb-master-1.0.3" + sources."ssb-msg-content-1.0.1" sources."ssb-msgs-5.2.0" sources."ssb-no-auth-1.0.0" sources."ssb-onion-1.0.0" @@ -137193,6 +138296,7 @@ in ]; }) sources."ssb-plugins-1.0.0" + sources."ssb-private-group-keys-0.4.1" sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" @@ -137204,8 +138308,6 @@ in sources."ssb-keys-8.5.0" ]; }) - sources."ssb-validate2-0.1.2" - sources."ssb-validate2-rsjs-node-1.0.4" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -137313,6 +138415,7 @@ in sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" sources."ws-7.5.9" + sources."xsalsa20-1.2.0" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -137413,7 +138516,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1332.0" // { + (sources."aws-sdk-2.1334.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -137989,7 +139092,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.17.0" // { @@ -138031,7 +139134,7 @@ in sources."mime-2.6.0" sources."ms-2.1.2" sources."qs-6.11.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."string_decoder-1.3.0" @@ -138390,7 +139493,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" @@ -138568,10 +139671,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.1.0"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.1.0.tgz"; - sha512 = "aSdnsGtndfqtb0dmN5qm9Zjl7wGpqh3cWF35WVCcK96TmGn2NEar4M40QW6bvaPPu089mrkZdpeD3Yar2SERBg=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.1.4.tgz"; + sha512 = "25Lb46ZS4IK/XpBMe4IBMrtYf23V8alqBX+szXoccb7uM0D2Wqq5rMRzYBONZnFVuU1bQG3R50lyIT5eRewv2g=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -138613,23 +139716,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/pug-2.0.6" sources."@types/sass-1.45.0" sources."acorn-8.8.2" @@ -138649,7 +139752,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138667,7 +139770,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -138690,7 +139793,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.4" + sources."immutable-4.3.0" sources."import-fresh-3.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -138774,7 +139877,7 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.58.3" + sources."sass-1.59.2" sources."sax-1.2.4" sources."semver-6.3.0" sources."sorcery-0.11.0" @@ -138793,7 +139896,7 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."svelte-3.55.1" + sources."svelte-3.56.0" sources."svelte-preprocess-5.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" @@ -138823,10 +139926,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.6"; + version = "0.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.6.tgz"; - sha512 = "jvzTRy2AFcSx6MJLJFZBK9wrLfLkNMhlL4Gwt2wU81fpZ5Hq6yg64pvQP4spRU8O/OfH6glZ66Wh1dQv4Jhpuw=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.8.tgz"; + sha512 = "WTf/npdGvC2eXuSYHeWbRdcNqgO6xTm679Ag9uQGQIKivBTHSIZVSW1Geia/wjw3HmC0xBNhpD6SvtpcJgkPvw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -138871,23 +139974,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/pug-2.0.6" sources."@types/sass-1.45.0" (sources."@vscode/emmet-helper-2.8.6" // { @@ -138912,7 +140015,7 @@ in sources."browserslist-4.21.5" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138931,7 +140034,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."emmet-2.3.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -138956,7 +140059,7 @@ in sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" - sources."immutable-4.2.4" + sources."immutable-4.3.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -139042,7 +140145,7 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.58.3" + sources."sass-1.59.2" sources."sax-1.2.4" sources."semver-6.3.0" sources."sorcery-0.11.0" @@ -139061,9 +140164,9 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."svelte-3.55.1" + sources."svelte-3.56.0" sources."svelte-preprocess-5.0.1" - sources."svelte2tsx-0.6.3" + sources."svelte2tsx-0.6.9" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" @@ -139563,7 +140666,7 @@ in sources."mime-2.6.0" sources."ms-2.1.2" sources."qs-6.11.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."semver-7.3.8" sources."superagent-7.1.6" sources."yallist-4.0.0" @@ -139817,23 +140920,23 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."acorn-7.4.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" @@ -140455,7 +141558,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -140615,7 +141718,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) @@ -140839,7 +141942,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -141100,7 +142203,7 @@ in sources."inherits-2.0.4" sources."object-assign-4.1.1" sources."object_values-0.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.3" sources."string_decoder-1.3.0" @@ -141219,11 +142322,12 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ + sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" sources."define-properties-1.2.0" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."for-each-0.3.3" @@ -141261,6 +142365,7 @@ in sources."regexp.prototype.flags-1.4.3" sources."safe-regex-test-1.0.0" sources."side-channel-1.0.4" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."typed-array-length-1.0.4" @@ -141288,13 +142393,15 @@ in }; dependencies = [ sources."@babel/runtime-7.21.0" - (sources."@eslint/eslintrc-2.0.0" // { + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + (sources."@eslint/eslintrc-2.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.35.0" + sources."@eslint/js-8.36.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" @@ -141317,6 +142424,7 @@ in sources."ansi-styles-4.3.0" sources."argparse-2.0.1" sources."aria-query-5.1.3" + sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" @@ -141344,13 +142452,13 @@ in sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-get-iterator-1.1.3" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.35.0" // { + (sources."eslint-8.36.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -141368,13 +142476,8 @@ in }) sources."eslint-plugin-react-hooks-4.6.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -141481,7 +142584,6 @@ in sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -141494,6 +142596,7 @@ in sources."side-channel-1.0.4" sources."stop-iteration-iterator-1.0.0" sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."strip-ansi-6.0.1" @@ -141554,7 +142657,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -141614,7 +142717,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141770,7 +142873,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -141833,7 +142936,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -141956,7 +143059,7 @@ in sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -142016,7 +143119,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -142172,7 +143275,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -142235,7 +143338,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -142434,7 +143537,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142658,7 +143761,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" @@ -143028,7 +144131,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143109,7 +144212,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143356,7 +144459,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-2.0.0" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -143496,7 +144599,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -143577,7 +144680,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143824,7 +144927,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-2.0.0" sources."regenerator-runtime-0.13.11" sources."registry-auth-token-4.2.2" @@ -144395,7 +145498,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.6" sources."ajv-6.12.6" @@ -144800,23 +145903,23 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" @@ -144950,7 +146053,7 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.13" sources."@types/http-cache-semantics-4.0.1" - sources."@types/node-16.18.14" + sources."@types/node-16.18.15" sources."@types/triple-beam-1.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -144998,7 +146101,7 @@ in sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."browserify-zlib-0.2.0" @@ -145132,7 +146235,7 @@ in sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."hash.js-1.1.7" @@ -145332,13 +146435,13 @@ in sources."statuses-2.0.1" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-combiner2-1.1.1" (sources."stream-http-3.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-splicer-2.0.1" @@ -145394,12 +146497,12 @@ in sources."which-typed-array-1.1.9" (sources."winston-3.8.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."wrap-ansi-7.0.0" @@ -145441,7 +146544,7 @@ in sources."@types/debug-4.1.7" sources."@types/is-empty-1.2.1" sources."@types/ms-0.7.31" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" @@ -145470,7 +146573,7 @@ in }) sources."has-flag-3.0.0" sources."ignore-5.2.4" - sources."import-meta-resolve-2.2.1" + sources."import-meta-resolve-2.2.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-3.0.1" @@ -145499,7 +146602,7 @@ in sources."path-exists-5.0.0" sources."proc-log-3.0.0" sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."semver-7.3.8" sources."string-width-5.1.2" @@ -145622,7 +146725,7 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -145637,7 +146740,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."require-directory-2.1.1" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -145828,6 +146931,7 @@ in sha512 = "BMf/PYgJ5Tz5q9w/poWCKIQ2XHPiFpU1gdMpujOFlBwNHXp2XbOiIJkoEKSSNzYIJibrpBha/KE93qw4bgFN/w=="; }; dependencies = [ + sources."@adobe/css-tools-4.2.0" sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" sources."@babel/compat-data-7.21.0" @@ -145973,32 +147077,37 @@ in sources."escape-string-regexp-4.0.0" ]; }) - sources."@esbuild/android-arm-0.16.17" - sources."@esbuild/android-arm64-0.16.17" - sources."@esbuild/android-x64-0.16.17" - sources."@esbuild/darwin-arm64-0.16.17" - sources."@esbuild/darwin-x64-0.16.17" - sources."@esbuild/freebsd-arm64-0.16.17" - sources."@esbuild/freebsd-x64-0.16.17" - sources."@esbuild/linux-arm-0.16.17" - sources."@esbuild/linux-arm64-0.16.17" - sources."@esbuild/linux-ia32-0.16.17" - sources."@esbuild/linux-loong64-0.16.17" - sources."@esbuild/linux-mips64el-0.16.17" - sources."@esbuild/linux-ppc64-0.16.17" - sources."@esbuild/linux-riscv64-0.16.17" - sources."@esbuild/linux-s390x-0.16.17" - sources."@esbuild/linux-x64-0.16.17" - sources."@esbuild/netbsd-x64-0.16.17" - sources."@esbuild/openbsd-x64-0.16.17" - sources."@esbuild/sunos-x64-0.16.17" - sources."@esbuild/win32-arm64-0.16.17" - sources."@esbuild/win32-ia32-0.16.17" - sources."@esbuild/win32-x64-0.16.17" + sources."@esbuild/android-arm-0.17.6" + sources."@esbuild/android-arm64-0.17.6" + sources."@esbuild/android-x64-0.17.6" + sources."@esbuild/darwin-arm64-0.17.6" + sources."@esbuild/darwin-x64-0.17.6" + sources."@esbuild/freebsd-arm64-0.17.6" + sources."@esbuild/freebsd-x64-0.17.6" + sources."@esbuild/linux-arm-0.17.6" + sources."@esbuild/linux-arm64-0.17.6" + sources."@esbuild/linux-ia32-0.17.6" + sources."@esbuild/linux-loong64-0.17.6" + sources."@esbuild/linux-mips64el-0.17.6" + sources."@esbuild/linux-ppc64-0.17.6" + sources."@esbuild/linux-riscv64-0.17.6" + sources."@esbuild/linux-s390x-0.17.6" + sources."@esbuild/linux-x64-0.17.6" + sources."@esbuild/netbsd-x64-0.17.6" + sources."@esbuild/openbsd-x64-0.17.6" + sources."@esbuild/sunos-x64-0.17.6" + sources."@esbuild/win32-arm64-0.17.6" + sources."@esbuild/win32-ia32-0.17.6" + sources."@esbuild/win32-x64-0.17.6" sources."@gar/promisify-1.1.3" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" + (sources."@jridgewell/source-map-0.3.2" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" (sources."@mapbox/node-pre-gyp-1.0.10" // { @@ -146051,14 +147160,15 @@ in }) ]; }) - sources."@remix-run/express-1.14.0" - (sources."@remix-run/node-1.14.0" // { + sources."@remix-run/express-1.14.1" + (sources."@remix-run/node-1.14.1" // { dependencies = [ + sources."@remix-run/server-runtime-1.14.1" sources."cookie-signature-1.2.1" ]; }) sources."@remix-run/router-1.3.3" - sources."@remix-run/serve-1.14.0" + sources."@remix-run/serve-1.14.1" sources."@remix-run/server-runtime-1.14.0" sources."@remix-run/web-blob-3.0.4" sources."@remix-run/web-fetch-4.3.2" @@ -146068,18 +147178,18 @@ in sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" sources."@sindresorhus/is-4.6.0" - sources."@swc/core-1.3.38" - sources."@swc/core-darwin-arm64-1.3.38" - sources."@swc/core-darwin-x64-1.3.38" - sources."@swc/core-linux-arm-gnueabihf-1.3.38" - sources."@swc/core-linux-arm64-gnu-1.3.38" - sources."@swc/core-linux-arm64-musl-1.3.38" - sources."@swc/core-linux-x64-gnu-1.3.38" - sources."@swc/core-linux-x64-musl-1.3.38" - sources."@swc/core-win32-arm64-msvc-1.3.38" - sources."@swc/core-win32-ia32-msvc-1.3.38" - sources."@swc/core-win32-x64-msvc-1.3.38" - sources."@swc/wasm-1.3.38" + sources."@swc/core-1.3.40" + sources."@swc/core-darwin-arm64-1.3.40" + sources."@swc/core-darwin-x64-1.3.40" + sources."@swc/core-linux-arm-gnueabihf-1.3.40" + sources."@swc/core-linux-arm64-gnu-1.3.40" + sources."@swc/core-linux-arm64-musl-1.3.40" + sources."@swc/core-linux-x64-gnu-1.3.40" + sources."@swc/core-linux-x64-musl-1.3.40" + sources."@swc/core-win32-arm64-msvc-1.3.40" + sources."@swc/core-win32-ia32-msvc-1.3.40" + sources."@swc/core-win32-x64-msvc-1.3.40" + sources."@swc/wasm-1.3.40" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@ts-morph/common-0.11.1" @@ -146109,10 +147219,10 @@ in sources."@types/scheduler-0.16.2" sources."@types/unist-2.0.6" sources."@vanilla-extract/babel-plugin-debug-ids-1.0.2" - sources."@vanilla-extract/css-1.9.5" - (sources."@vanilla-extract/integration-6.1.2" // { + sources."@vanilla-extract/css-1.10.0" + (sources."@vanilla-extract/integration-6.2.1" // { dependencies = [ - sources."esbuild-0.16.17" + sources."esbuild-0.17.6" ]; }) sources."@vanilla-extract/private-1.0.3" @@ -146205,6 +147315,7 @@ in sources."buffer-from-1.1.2" sources."bufferutil-4.0.7" sources."bytes-3.1.2" + sources."cac-6.7.14" (sources."cacache-15.3.0" // { dependencies = [ sources."minipass-3.3.6" @@ -146218,7 +147329,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -146246,6 +147357,7 @@ in sources."color-name-1.1.3" sources."color-support-1.1.3" sources."comma-separated-tokens-2.0.3" + sources."commander-2.20.3" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -146263,7 +147375,8 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-compat-3.29.0" + sources."copy-anything-2.0.6" + sources."core-js-compat-3.29.1" sources."core-util-is-1.0.3" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" @@ -146304,12 +147417,13 @@ in }) sources."edge-runtime-2.0.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" + sources."errno-0.1.8" sources."esbuild-0.14.47" sources."esbuild-android-64-0.14.47" sources."esbuild-android-arm64-0.14.47" @@ -146464,6 +147578,8 @@ in sources."icss-utils-5.1.0" sources."ieee754-1.2.1" sources."ignore-5.2.4" + sources."image-size-0.5.5" + sources."immutable-4.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" @@ -146495,6 +147611,7 @@ in sources."is-stream-2.0.1" sources."is-typed-array-1.1.10" sources."is-unicode-supported-0.1.0" + sources."is-what-3.14.1" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."javascript-stringify-2.1.0" @@ -146510,6 +147627,13 @@ in sources."jsonfile-6.1.0" sources."keyv-4.5.2" sources."kleur-4.1.5" + (sources."less-4.1.3" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."semver-5.7.1" + sources."source-map-0.6.1" + ]; + }) sources."levn-0.3.0" sources."lilconfig-2.1.0" sources."loader-utils-3.2.1" @@ -146592,7 +147716,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-4.2.5" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -146615,7 +147739,7 @@ in }) sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" - sources."mlly-1.1.1" + sources."mlly-1.2.0" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -146628,6 +147752,11 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanoid-3.3.4" + (sources."needle-3.2.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) sources."negotiator-0.6.3" sources."netmask-2.0.2" sources."node-addon-api-1.7.2" @@ -146658,6 +147787,7 @@ in sources."pako-0.2.9" sources."parse-entities-4.0.1" sources."parse-ms-2.1.0" + sources."parse-node-version-1.0.1" sources."parseurl-1.3.3" sources."path-browserify-1.0.1" sources."path-exists-4.0.0" @@ -146675,6 +147805,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."pify-4.0.1" sources."pkg-types-1.0.2" sources."postcss-8.4.21" sources."postcss-discard-duplicates-5.1.0" @@ -146701,6 +147832,7 @@ in ]; }) sources."proxy-from-env-1.1.0" + sources."prr-1.0.1" sources."pump-2.0.1" sources."pumpify-1.5.1" sources."punycode-2.3.0" @@ -146714,7 +147846,7 @@ in ]; }) sources."react-refresh-0.14.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" (sources."recast-0.21.5" // { dependencies = [ @@ -146726,7 +147858,7 @@ in sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -146745,6 +147877,7 @@ in sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."rollup-3.19.1" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -146762,6 +147895,8 @@ in sources."sade-1.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."sass-1.59.2" + sources."sax-1.2.4" sources."semver-6.1.1" (sources."send-0.18.0" // { dependencies = [ @@ -146820,6 +147955,8 @@ in sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."style-to-object-0.4.1" + sources."stylus-0.59.0" + sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-6.1.13" @@ -146830,6 +147967,7 @@ in ]; }) sources."tar-stream-2.2.0" + sources."terser-5.16.6" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -146890,6 +148028,38 @@ in sources."vfile-5.3.7" sources."vfile-location-4.1.0" sources."vfile-message-3.1.4" + (sources."vite-4.1.4" // { + dependencies = [ + sources."@esbuild/android-arm-0.16.17" + sources."@esbuild/android-arm64-0.16.17" + sources."@esbuild/android-x64-0.16.17" + sources."@esbuild/darwin-arm64-0.16.17" + sources."@esbuild/darwin-x64-0.16.17" + sources."@esbuild/freebsd-arm64-0.16.17" + sources."@esbuild/freebsd-x64-0.16.17" + sources."@esbuild/linux-arm-0.16.17" + sources."@esbuild/linux-arm64-0.16.17" + sources."@esbuild/linux-ia32-0.16.17" + sources."@esbuild/linux-loong64-0.16.17" + sources."@esbuild/linux-mips64el-0.16.17" + sources."@esbuild/linux-ppc64-0.16.17" + sources."@esbuild/linux-riscv64-0.16.17" + sources."@esbuild/linux-s390x-0.16.17" + sources."@esbuild/linux-x64-0.16.17" + sources."@esbuild/netbsd-x64-0.16.17" + sources."@esbuild/openbsd-x64-0.16.17" + sources."@esbuild/sunos-x64-0.16.17" + sources."@esbuild/win32-arm64-0.16.17" + sources."@esbuild/win32-ia32-0.16.17" + sources."@esbuild/win32-x64-0.16.17" + sources."esbuild-0.16.17" + ]; + }) + (sources."vite-node-0.28.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."vm2-3.9.14" sources."wcwidth-1.0.1" sources."web-encoding-1.1.5" @@ -146975,8 +148145,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@eslint/eslintrc-2.0.0" - sources."@eslint/js-8.35.0" + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + sources."@eslint/eslintrc-2.0.1" + sources."@eslint/js-8.36.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -147008,7 +148180,7 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.35.0" + sources."eslint-8.36.0" sources."eslint-plugin-vue-9.9.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { @@ -147017,7 +148189,7 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esprima-4.0.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" @@ -147091,7 +148263,6 @@ in sources."pug-lexer-5.0.1" sources."punycode-2.3.0" sources."queue-microtask-1.2.3" - sources."regexpp-3.2.0" sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -147316,7 +148487,7 @@ in }; dependencies = [ sources."@vscode/l10n-0.0.11" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.11" @@ -147655,7 +148826,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -148343,7 +149514,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -148713,7 +149884,7 @@ in sources."pixelmatch-4.0.2" sources."pngjs-3.4.0" sources."process-0.11.10" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readable-web-to-node-stream-3.0.2" sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" @@ -148799,7 +149970,7 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" @@ -149441,10 +150612,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.76.0"; + version = "5.76.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz"; - sha512 = "l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz"; + sha512 = "4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" @@ -149453,11 +150624,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.21.1" + sources."@types/eslint-8.21.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -149481,10 +150652,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -149525,7 +150696,7 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.76.0" + sources."webpack-5.76.1" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -149554,11 +150725,11 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@types/eslint-8.21.1" + sources."@types/eslint-8.21.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -149585,13 +150756,13 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" sources."commander-9.5.0" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."enhanced-resolve-5.12.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" @@ -149664,7 +150835,7 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.76.0" + sources."webpack-5.76.1" sources."webpack-cli-5.0.1" sources."webpack-merge-5.8.0" sources."webpack-sources-3.2.3" @@ -149701,7 +150872,7 @@ in sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.21.1" + sources."@types/eslint-8.21.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/express-4.17.17" @@ -149709,7 +150880,7 @@ in sources."@types/http-proxy-1.17.10" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.0" @@ -149759,7 +150930,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -149787,7 +150958,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" @@ -149912,7 +151083,7 @@ in sources."bytes-3.1.2" ]; }) - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."require-from-string-2.0.2" sources."requires-port-1.0.0" @@ -149987,7 +151158,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.76.0" // { + (sources."webpack-5.76.1" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150001,7 +151172,7 @@ in sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" ]; buildInputs = globalBuildInputs; meta = { @@ -150031,11 +151202,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.21.1" + sources."@types/eslint-8.21.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -150061,11 +151232,11 @@ in sources."braces-3.0.2" sources."browserslist-4.21.5" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001464" + sources."caniuse-lite-1.0.30001465" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.326" + sources."electron-to-chromium-1.4.328" sources."enhanced-resolve-5.12.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -150137,7 +151308,7 @@ in sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.76.0" // { + (sources."webpack-5.76.1" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -150178,7 +151349,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -150208,7 +151379,7 @@ in dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."bittorrent-tracker-9.19.0" // { @@ -150223,14 +151394,14 @@ in }) (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."blob-to-buffer-1.2.9" sources."block-iterator-1.1.1" (sources."block-stream2-2.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."bn.js-5.2.1" @@ -150263,7 +151434,7 @@ in }) (sources."chunk-store-stream-4.3.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."cli-cursor-3.1.0" @@ -150366,7 +151537,7 @@ in sources."mdns-js-packet-0.2.0" (sources."mediasource-2.4.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."memory-chunk-store-1.3.5" @@ -150379,7 +151550,7 @@ in sources."mp4-box-encoding-1.4.1" (sources."mp4-stream-3.1.3" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."ms-2.0.0" @@ -150430,7 +151601,7 @@ in sources."range-parser-1.2.1" (sources."range-slice-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."rc4-0.1.5" @@ -150462,7 +151633,7 @@ in sources."buffer-6.0.3" sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."simple-sha1-3.1.0" @@ -150470,7 +151641,7 @@ in dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."smart-buffer-4.2.0" @@ -150525,7 +151696,7 @@ in sources."util-deprecate-1.0.2" (sources."utp-native-2.5.3" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."videostream-3.2.2" @@ -150643,10 +151814,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.12.2"; + version = "2.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.12.2.tgz"; - sha512 = "pjdZvcjiFD6mI3Nncsw3hBv3rxjMx0n4Mtp+Tsql/hvr0LpOmHKlW/aMeYx/fVUmjEKfWBSULc1vgM02O2UTWQ=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.12.3.tgz"; + sha512 = "0skqT9qBbchiVY57YwQKFCFnuUo2Lg7e0vCChJ9FWcWZ/CXsPXeBMeVA8N/p72LuhrtZlqTFN7TsNOd8jm8KcQ=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -150695,7 +151866,7 @@ in sources."@miniflare/watcher-2.12.1" sources."@miniflare/web-sockets-2.12.1" sources."@types/better-sqlite3-7.6.3" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/stack-trace-0.0.29" sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" @@ -150790,7 +151961,7 @@ in sources."utf-8-validate-6.0.3" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xxhash-wasm-1.0.2" sources."yallist-4.0.0" sources."youch-2.2.2" @@ -150833,13 +152004,15 @@ in }; dependencies = [ sources."@babel/runtime-7.21.0" - (sources."@eslint/eslintrc-2.0.0" // { + sources."@eslint-community/eslint-utils-4.2.0" + sources."@eslint-community/regexpp-4.4.0" + (sources."@eslint/eslintrc-2.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@eslint/js-8.35.0" + sources."@eslint/js-8.36.0" (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.4" @@ -150860,6 +152033,7 @@ in sources."ansi-styles-4.3.0" sources."argparse-2.0.1" sources."aria-query-5.1.3" + sources."array-buffer-byte-length-1.0.0" sources."array-includes-3.1.6" sources."array.prototype.flat-1.3.1" sources."array.prototype.flatmap-1.3.1" @@ -150886,13 +152060,13 @@ in sources."doctrine-2.1.0" sources."e-prime-0.10.4" sources."emoji-regex-9.2.2" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-get-iterator-1.1.3" sources."es-set-tostringtag-2.0.1" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.35.0" // { + (sources."eslint-8.36.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -150910,13 +152084,8 @@ in }) sources."eslint-plugin-react-hooks-4.6.0" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.4.1" + sources."espree-9.5.0" sources."esquery-1.5.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -151023,7 +152192,6 @@ in sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -151036,6 +152204,7 @@ in sources."side-channel-1.0.4" sources."stop-iteration-iterator-1.0.0" sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" sources."strip-ansi-6.0.1" @@ -151337,7 +152506,7 @@ in sources."binaryextensions-4.18.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."boolean-3.2.0" @@ -151402,7 +152571,7 @@ in sources."config-chain-1.1.13" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.29.0" + sources."core-js-3.29.1" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -151435,7 +152604,7 @@ in sources."dot-prop-5.3.0" sources."downgrade-root-1.2.2" sources."duplexer3-0.1.5" - sources."ejs-3.1.8" + sources."ejs-3.1.9" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -151725,7 +152894,7 @@ in sources."glob-7.2.3" sources."minimatch-3.1.2" sources."npmlog-6.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."semver-7.3.8" ]; }) @@ -152008,7 +153177,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.12" + sources."spdx-license-ids-3.0.13" sources."sprintf-js-1.1.2" sources."ssri-8.0.1" sources."strict-uri-encode-1.1.0" @@ -152063,7 +153232,7 @@ in sources."taketalk-1.0.0" (sources."tar-6.1.13" // { dependencies = [ - sources."minipass-4.2.4" + sources."minipass-4.2.5" sources."mkdirp-1.0.4" ]; }) @@ -152183,7 +153352,7 @@ in sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."semver-7.3.8" ]; }) @@ -152256,23 +153425,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.42.0" // { + (sources."@sentry/core-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.42.0" // { + (sources."@sentry/integrations-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.42.0" // { + (sources."@sentry/node-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.42.0" - (sources."@sentry/utils-7.42.0" // { + sources."@sentry/types-7.43.0" + (sources."@sentry/utils-7.43.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -152379,7 +153548,7 @@ in sources."path-key-3.1.1" sources."proper-lockfile-4.1.2" sources."quick-lru-5.1.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."reflect-metadata-0.1.13" sources."require-directory-2.1.1" sources."resolve-alpn-1.2.1" @@ -152411,7 +153580,7 @@ in sources."winston-daily-rotate-file-4.7.1" sources."winston-transport-4.5.0" sources."wrap-ansi-7.0.0" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xstate-4.29.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -152444,7 +153613,7 @@ in sources."@types/fs-extra-11.0.1" sources."@types/jsonfile-6.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-18.15.0" + sources."@types/node-18.15.2" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.2" sources."braces-3.0.2" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 8447c25cd7..a8e8a9cc84 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; + duneVersion = "3"; pname = "asn1-combinators"; version = "0.2.6"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index e8ff5df1a9..6b52ddf01f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "awa"; - version = "0.1.2"; + version = "0.2.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - hash = "sha256-HfIqvmvmdizPSfSHthj2syszVZXVhju7tI8yNEetc38="; + hash = "sha256-hsmTuoubBdsEyGe8zmfG7JihY0LFM4lErpPKUVobIX8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index 2674369f37..78a01b65f9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -1,24 +1,22 @@ -{ lib, buildDunePackage, ocaml, fetchurl -, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config +{ lib, buildDunePackage, fetchurl +, alcotest, pkg-config }: buildDunePackage rec { pname = "bigarray-overlap"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz"; - sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy"; + url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-${version}.tbz"; + hash = "sha256-L1IKxHAFTjNYg+upJUvyi2Z23bV3U8+1iyLPhK4aZuA="; }; - minimumOCamlVersion = "4.07"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; - propagatedBuildInputs = [ bigarray-compat ]; - - nativeBuildInputs = [ findlib pkg-config ]; - checkInputs = [ alcotest astring fpath bos ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + nativeBuildInputs = [ pkg-config ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/dinosaure/overlap"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix index 192bb470a6..8f84a973bf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix @@ -7,7 +7,7 @@ , bos , core , core_kernel -, core_unix +, core_unix ? null , lwt_react , ocamlgraph , ppx_sexp_conv diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix index 8330ce3e2b..20b2cd66a7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,5 +1,8 @@ { lib, buildDunePackage, fetchFromGitLab -, ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex +, ff-sig, zarith +, zarith_stubs_js ? null +, integers_stubs_js +, integers, hex , alcotest, ff-pbt }: diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix index 2004f8868c..68ba880a79 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix @@ -1,8 +1,6 @@ { lib , buildDunePackage , fetchurl -, ocaml - , alcotest , eqaf , fmt @@ -14,17 +12,16 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; + hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; }; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ fmt eqaf ]; - # alcotest isn't available for OCaml < 4.08 due to fmt - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; checkInputs = [ alcotest ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index 3e6ac4ae2d..3236d47750 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -7,7 +7,7 @@ , async_unix , cohttp , conduit-async -, core_unix +, core_unix ? null , uri , uri-sexp , logs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix index 57647c97c4..1fe020f649 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/async.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "cstruct-async"; inherit (cstruct) src version meta; + duneVersion = "3"; + propagatedBuildInputs = [ async_unix async diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 9efe75af70..9877adbcf8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,13 +2,14 @@ buildDunePackage rec { pname = "cstruct"; - version = "6.1.1"; + version = "6.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0="; + hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI="; }; buildInputs = [ fmt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix index 7226193565..3aa70e5c99 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct lwt ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index b640c9745f..f2b19355b0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -11,6 +11,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index a20911cbb2..3b28cda15a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -9,6 +9,7 @@ buildDunePackage rec { inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; doCheck = true; checkInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix index 064bdadb32..40467a77a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -9,6 +9,7 @@ else inherit (cstruct) version src meta; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix index 5a17abdcc5..2b4013eb46 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -5,7 +5,7 @@ , either , ezjsonm , zarith -, zarith_stubs_js +, zarith_stubs_js ? null , hex , json-data-encoding , json-data-encoding-bson diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix index d2dad611bf..664cb5dead 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dbf/default.nix @@ -7,13 +7,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pveber"; repo = "dbf"; - rev = "${version}"; - sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + rev = version; + hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; }; buildInputs = [ ppx_cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix index f5303db9a3..cdb1e3fc20 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { pname = "dune-configurator"; - useDune2 = true; - inherit (dune_2) src version patches; - minimumOCamlVersion = "4.03"; + duneVersion = "2"; + + minimalOCamlVersion = "4.03"; dontAddPrefix = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix index d3e29be3c6..d777755253 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix @@ -2,12 +2,13 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; + duneVersion = "3"; pname = "eqaf"; version = "0.9"; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-${version}.tbz"; - sha256 = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; + hash = "sha256-7A4oqUasaBf5XVhU8FqZYa46hAi7YQ55z60BubJV3+A="; }; propagatedBuildInputs = [ cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix index 90f56c1596..f24866a815 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, lib, faraday, core_unix, async }: +{ buildDunePackage, lib, faraday, core_unix ? null, async }: buildDunePackage rec { pname = "faraday-async"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 1ffc95d3c2..5e1a0461ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.12.0"; + version = "3.13.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - hash = "sha256-qgd5fny23J6pcOdgwB3Yt1UxJii2XE25OjcSVFdLMKA="; + hash = "sha256-98w2Amze/B+YN/ENfSb0V8I2yyFUf8rSEOcUg1YbVdM="; }; # remove changelog for the carton package diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index 680c77dfa3..1079f55473 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -14,13 +14,6 @@ buildDunePackage { pname = "git-unix"; inherit (git) version src; - patches = [ - (fetchpatch { - url = "https://github.com/mirage/ocaml-git/commit/b708db8319cc456a5640618210d740a1e00468e9.patch"; - hash = "sha256-Fe+eDhU/beZT/8br8XmOhHYJowaVEha16eGqyuu2Zr4="; - }) - ]; - minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix index 8d1414731f..afd49b8716 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, core, core_unix, pkg-config +{ lib, fetchFromGitHub, buildDunePackage, core, core_unix ? null, pkg-config , sqlite }: buildDunePackage rec { pname = "hack_parallel"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix index fc06efae7e..59d47d2daf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildDunePackage -, zarith_stubs_js +, zarith_stubs_js ? null }: buildDunePackage rec { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index b576282224..79142f0e8d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -5,10 +5,11 @@ buildDunePackage rec { version = "3.0.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; + hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/magic-trace/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/magic-trace/default.nix index 1f1417f672..39bdca1119 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/magic-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/magic-trace/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler -, core_unix, owee, ppx_jane, shell }: +{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler ? null +, core_unix ? null, owee, ppx_jane, shell ? null }: buildDunePackage rec { pname = "magic-trace"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix index 78f3e48c5b..a6978d3d58 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix @@ -16,6 +16,7 @@ buildDunePackage rec { ''; minimalOCamlVersion = "4.06"; + duneVersion = "3"; propagatedBuildInputs = [ io-page mirage-block ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 0d0851536b..e32523c85e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -13,6 +13,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 7dee169afd..fc50002da1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/combinators.nix @@ -1,10 +1,12 @@ -{ buildDunePackage, mirage-block, io-page, logs }: +{ buildDunePackage, mirage-block, logs }: buildDunePackage rec { pname = "mirage-block-combinators"; inherit (mirage-block) version src; - propagatedBuildInputs = [ mirage-block io-page logs ]; + duneVersion = "3"; + + propagatedBuildInputs = [ mirage-block logs ]; meta = mirage-block.meta // { description = "Block signatures and implementations for MirageOS using Lwt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix index 161fd4a66e..0cd1f1717e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix @@ -4,11 +4,13 @@ buildDunePackage rec { pname = "mirage-block"; - version = "3.0.0"; + version = "3.0.2"; + + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-v${version}.tbz"; - sha256 = "sha256-NB5nJpppMtdi0HDjKcCAqRjO4vIbAMfnP934P+SnzmU="; + url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-${version}.tbz"; + hash = "sha256-UALUfeL0G1mfSsLgAb/HpQ6OV12YtY+GUOYG6yhUwAI="; }; propagatedBuildInputs = [ cstruct lwt fmt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix index bdafeb4305..74ff38f9a7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -8,10 +8,11 @@ buildDunePackage rec { version = "4.1.0"; minimalOCamlVersion = "4.07"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-${version}.tbz"; - sha256 = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; + hash = "sha256-sBdoUdTd9ZeNcHK0IBGBeOYDDqULM7EYX+Pz2f2nIQA="; }; propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix index 2fcd58973b..b0746c5416 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -7,10 +7,11 @@ buildDunePackage rec { version = "5.1.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz"; - sha256 = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; + hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; }; propagatedBuildInputs = [ lwt mirage-flow ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/unix.nix index 634bcc353a..ca8c2aeac5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/unix.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (mirage-console) version src; + duneVersion = "3"; + propagatedBuildInputs = [ mirage-console cstruct diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index d4904e7743..5500d05512 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -1,11 +1,13 @@ -{ buildDunePackage, mirage-flow, fmt, ocaml_lwt, logs, cstruct, mirage-clock }: +{ buildDunePackage, mirage-flow, fmt, lwt, logs, cstruct, mirage-clock }: buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; - propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; + duneVersion = "3"; + + propagatedBuildInputs = [ lwt logs cstruct mirage-clock mirage-flow ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS specialized to lwt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix index bc987eff98..6b45451291 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchurl, cstruct, fmt, ocaml_lwt }: +{ lib, buildDunePackage, fetchurl, cstruct, fmt, lwt }: buildDunePackage rec { pname = "mirage-flow"; version = "3.0.0"; - useDune2 = true; - minimumOCamlVersion = "4.05"; + duneVersion = "3"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; + hash = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; }; - propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; + propagatedBuildInputs = [ cstruct fmt lwt ]; meta = { description = "Flow implementations and combinators for MirageOS"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 023896447d..12681911a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -5,7 +5,9 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version useDune2 src; + inherit (mirage-flow) version src; + + duneVersion = "3"; # Make tests compatible with alcotest 1.4.0 postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random-test/default.nix index 81d75db772..24339b4956 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random-test/default.nix @@ -6,10 +6,9 @@ buildDunePackage rec { pname = "mirage-random-test"; version = "0.1.0"; - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix index a119395764..ba70665c6e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-random"; version = "3.0.0"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8="; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix index 058261a78d..7960042ff9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix @@ -6,7 +6,7 @@ , cmdliner , core , core_bench -, core_unix +, core_unix ? null , js_of_ocaml , js_of_ocaml-ppx , ppx_deriving_yojson diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix index 0425bcafa6..c1c890f85f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mm/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "mm"; - version = "0.8.2"; + version = "0.8.3"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-mm"; rev = "v${version}"; - sha256 = "sha256-EifM96MWIDyr1EVUZYuISWGwbMshVQppzWLJchqzV2E="; + sha256 = "sha256-pL1e7U5EtbI8bVum7mMHUD8QFMV4jc3YFjhTOvR43kg="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix index ffd1837877..e734928308 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -1,36 +1,32 @@ { lib, buildDunePackage, fetchurl -, ppx_cstruct, ppx_tools -, cstruct, ounit, mmap, stdlib-shims +, ppx_cstruct +, cstruct +, ounit }: buildDunePackage rec { pname = "pcap-format"; - version = "0.5.2"; + version = "0.6.0"; - minimumOCamlVersion = "4.03"; - - # due to cstruct - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-pcap/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "14c5rpgglyz41jic0fg0xa22d2w1syb86kva22y9fi7aqj9vm31f"; + url = "https://github.com/mirage/ocaml-pcap/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-LUjy8Xm6VsnMq1FHKzmJg7uorkTv7cOTsoLwmtNHkaY="; }; buildInputs = [ - ppx_tools ppx_cstruct ]; propagatedBuildInputs = [ cstruct - stdlib-shims ]; doCheck = true; checkInputs = [ ounit - mmap ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix index 078d50da89..45f52ba5bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "randomconv"; version = "0.1.3"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix index d20f994b83..024783cf61 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/default.nix @@ -1,23 +1,23 @@ -{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }: +{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }: let generic = (somePath: let prepkg = import somePath { - inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason; + inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch; inherit (reason-native) console file-context-printer fp pastel rely; }; in buildDunePackage ({ - version = "2021-16-16-aec0ac6"; + version = "2022-08-31-a0ddab6"; src = fetchFromGitHub { owner = "reasonml"; repo = "reason-native"; - rev = "aec0ac681be7211b4d092262281689c46deb63e1"; - sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE="; + rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a"; + hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8="; }; - useDune2 = true; + duneVersion = "3"; meta = with lib; { description = "Libraries for building and testing native Reason programs"; downloadPage = "https://github.com/reasonml/reason-native"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index 1250dc2d3a..9d2770def0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -1,4 +1,4 @@ -{ qcheck-core, reason, console, rely, ... }: +{ qcheck-core, reason, console, rely, fetchpatch, ... }: { pname = "qcheck-rely"; @@ -7,6 +7,17 @@ reason ]; + patches = [ + (fetchpatch { + url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch"; + hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4="; + includes = [ + "src/qcheck-rely/QCheckRely.re" + "src/qcheck-rely/QCheckRely.rei" + ]; + }) + ]; + propagatedBuildInputs = [ qcheck-core console @@ -16,6 +27,5 @@ meta = { description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix index e1a995d33c..fc7f189133 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { src = ./.; - useDune2 = true; + duneVersion = "3"; buildInputs = [ reason diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix index 2755b06d9c..92431fcb34 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/srt/default.nix @@ -6,13 +6,16 @@ buildDunePackage rec { pname = "srt"; - version = "0.2.1"; + version = "0.3.0"; + + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-srt"; rev = "v${version}"; - sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g="; + sha256 = "sha256-iD18bCbouBuMpuSzruDZJoYz2YyN080RK8BavUF3beY="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix index d4eaaae65c..3b0895b7b2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-image"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-u6VYAwq+2oLn2Kw1+KQRVPswAqeKDSAaPfGLPrzn30s="; + hash = "sha256-khLhVJuiLNNWw76gTeg4W32v5XbkwAg11bIOWl67u2k="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 24043ef439..d2721c5398 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-mixer"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-UDRhwnanrn87/PYVnacur1z/LsKuUu2G+0QQXjTw/IE="; + hash = "sha256-HGtO5iO3lxuVa707MDIhw0pgDZLHt9qY+Rd24sFkags="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 0ff1963fca..93bee8f101 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -9,13 +9,15 @@ buildDunePackage rec { pname = "tsdl-ttf"; - version = "0.3.2"; + version = "0.5"; + + duneVersion = "3"; src = fetchFromGitHub { owner = "sanette"; repo = pname; rev = version; - sha256 = "sha256-COBLF9K8thRROJJGeg4wxqrjB3aBa4CGYkf8HdAQ2o0"; + hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index 354a8ca209..14c29f3dae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -7,16 +7,17 @@ else let pname = "tsdl"; - version = "0.9.9"; + version = "1.0.0"; webpage = "https://erratique.ch/software/${pname}"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-${pname}-${version}"; + pname = "ocaml${ocaml.version}-${pname}"; + inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256-GqFz+bYG2ESkAEJyP8DKud4JFfU5MGLulzJa5Z4sptQ="; + hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix index 872d11606f..e727c86676 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix @@ -9,10 +9,11 @@ buildDunePackage rec { version = "6.0.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-vchan/releases/download/v${version}/vchan-${version}.tbz"; - sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; + hash = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix index f7ade2ec80..9dea4a64a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix @@ -15,6 +15,7 @@ buildDunePackage rec { version = "1.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 4b6c0d89a8..b3c8c241ae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (xenstore_transport) src version; + duneVersion = "3"; + buildInputs = [ xenstore_transport xenstore lwt ]; meta = xenstore_transport.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix index a3f4e0abcd..093ca1ffe9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix @@ -7,6 +7,7 @@ buildDunePackage rec { version = "2.2.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix index a7fb853f3b..f0867b4ec3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { version = "1.3.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchFromGitHub { owner = "xapi-project"; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix index c265fe71d4..95ccaf3d05 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/control/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "control"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o="; + sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/database/c_verror.patch b/third_party/nixpkgs/pkgs/development/octave-modules/database/c_verror.patch new file mode 100644 index 0000000000..9726a29512 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/octave-modules/database/c_verror.patch @@ -0,0 +1,11 @@ +--- a/src/error-helpers.h ++++ b/src/error-helpers.h +@@ -64,7 +64,7 @@ + } \ + catch (OCTAVE__EXECUTION_EXCEPTION& e) \ + { \ +- verror (e, __VA_ARGS__); \ ++ c_verror (e, __VA_ARGS__); \ + } + #endif + diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix index 3e1fe86327..811278af50 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/database/default.nix @@ -13,6 +13,10 @@ buildOctavePackage rec { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p"; }; + patches = [ + # Fix for octave 8.x + ./c_verror.patch + ]; propagatedBuildInputs = [ postgresql diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix index 3c02a20cda..456b9810df 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/doctest/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "doctest"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4"; + sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix index 08c4305999..e1410fd836 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/image-acquisition/default.nix @@ -28,5 +28,7 @@ buildOctavePackage rec { The Octave-forge Image Aquisition package provides functions to capture images from connected devices. Currently only v4l2 is supported. ''; + # Got broke with octave 8.x update, and wasn't updated since 2015 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix index 3cce6f2cad..3cc0873e38 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/level-set/default.nix @@ -23,7 +23,7 @@ buildOctavePackage rec { # corrected to have a %s format specifier. However, logic_error() also # exists, (a simple regex also matches that), but logic_error() doesn't # require a format specifier. So, this regex was born to handle that... - patchPhase = '' + postPatch = '' substituteInPlace build.sh --replace "level-set-0.3.1" "${pname}-${version}" \ --replace "\`pwd\`" '/build' sed -i -E 's#[^[:graph:]]error \(# error \(\"%s\", #g' src/*.cpp @@ -51,7 +51,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function"; - # /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory - broken = stdenv.isDarwin; + # Got broke with octave 8.x update, and wasn't updated since 2019 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix index 505670f629..829f6eb928 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/ltfat/default.nix @@ -13,11 +13,11 @@ buildOctavePackage rec { pname = "ltfat"; - version = "2.3.1"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "0gghh5a4w649ff776wvidfvqas87m0n7rqs960pid1d11bnyqqrh"; + sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix index 21ba508500..6c6d306abd 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/ocl/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "ocl"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-jQdwZwQNU3PZZFa3lp0hIr0GDt/XFHLJoq4waLI4gS8="; + sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix index 11fba7d363..45c57d72f2 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/parallel/default.nix @@ -14,6 +14,9 @@ buildOctavePackage rec { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; sha256 = "1h8vw2r42393px6dk10y3lhpxl168r9d197f9whz6lbk2rg571pa"; }; + patches = [ + ../database/c_verror.patch + ]; nativeBuildInputs = [ pkg-config @@ -32,5 +35,8 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Parallel execution package"; + # Although upstream has added an identical patch to that of ../database, it + # still won't build with octave>8.1 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix index 507ed1100a..41ee75cb1a 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix @@ -22,5 +22,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations"; + # Broken since octave>8.x + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix index fa67936d2b..0b161c261c 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/stk/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "stk"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-vIf+XDLvLNOMwptFCgiqfl+o3PIQ+KLpsJhOArd7gMM="; + sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix index 1d3715b3d7..2ca59a972c 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/symbolic/default.nix @@ -14,13 +14,13 @@ let in buildOctavePackage rec { pname = "symbolic"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "cbm755"; repo = "octsympy"; - rev = "v${version}"; - hash = "sha256-FJb5uazqEiyNI6TL9WVewMoQnC3CutcHENl+umNZeto="; + rev = "refs/tags/v${version}"; + hash = "sha256-6LmLzTwcBhvMDBE7u/lIkSUP97qFMPRHkxfbAyvas6M="; }; propagatedBuildInputs = [ pythonEnv ]; diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix index bfe01f10f2..71d05dc7a1 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/tisean/default.nix @@ -1,5 +1,4 @@ { buildOctavePackage -, stdenv , lib , fetchurl # Octave dependencies @@ -30,7 +29,7 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Port of TISEAN 3.0.1"; - # Some gfortran symbols claimed to be missing - broken = stdenv.isDarwin; + # Broken since octave 8.x update, and wasn't updated since 2021 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 8b54c963ce..0a02afc3f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.43"; + version = "9.2.44"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-Nww43TIIWHJo8tKNQoPYWHXzslnsBGftxfTCg3elo6w="; + rev = "refs/tags/v${version}"; + hash = "sha256-KgQX8uVLnRZj2u2gkClX0PkaAPxgJR0D6E4lviZF1gk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 044bbf7be6..aa0414fe79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.14"; + version = "1.4.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AZ6AqobhgMRCrCqtTuCfJjmKZjFlyIIxPqMtHHH9aBA="; + hash = "sha256-Ee6lo1910dR02fAQEkuS+xCzM93UMKkrgbKPd/Id0Uc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index dfb88f77aa..470a600810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.5.1"; + version = "13.6.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ifk1psowUGVG7XafipLq5T2+5K5+psDDsX/u/GYDXdU="; + hash = "sha256-M/KgQFt603V9wzd3SGexjDU7YWwStzVPZOoMBwp52/I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index 893e8ddcdb..28d4f5f368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "22.1.0"; + version = "23.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Tinche"; repo = pname; - rev = "v${version}"; - hash = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ouBqqt0CJYxxQqbG9jn4p8zO+nKjqZgPjZpiZic67ss="; }; nativeBuildInputs = [ @@ -45,10 +45,10 @@ buildPythonPackage rec { "aiofiles" ]; - meta = { + meta = with lib; { description = "File support for asyncio"; homepage = "https://github.com/Tinche/aiofiles"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ fridh ]; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fridh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index c2f06c5833..0e3fde70d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.6"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oYYr7LuTvw7e99930vF7odl2dWA/QPOTEW02l8cqXlc="; + hash = "sha256-hLUITEPUoUKGqN3AnacahnKwoKdfGN3mp34df74gsbE="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to connect to MySensors gateways"; homepage = "https://github.com/MartinHjelmare/aiomysensors"; + changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index aa4edc45fc..027e41f226 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.3"; + version = "3.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LsB3u35PLI/3PcuNbdgcxRoEFZ5CpyINEJa4Nw64NPA="; + hash = "sha256-2bFiOvwbvYy7uw7h0LTX4szSBwgafSYOOixxv+zAYDo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 5275670a42..e7d5994577 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.43"; + version = "9.2.44"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-SHUuKF7rT2x7CxF9s6ntxniOjhf7asY7HJeMi38Dqrc="; + rev = "refs/tags/v${version}"; + hash = "sha256-o2jTRh8N7FfyewGy77+PuOMNZi+8BuuSwS88iTPWNxs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index 468da0499a..ecae25b067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -200,6 +200,8 @@ buildPythonPackage rec { "test_get_output_batch_type" "test_pformat_namedtuple_with_unnamed_fields" "test_row_coder_fail_early_bad_schema" + # See https://github.com/apache/beam/issues/26004. + "test_batch_encode_decode" ]; meta = with lib; { @@ -207,6 +209,5 @@ buildPythonPackage rec { homepage = "https://beam.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index eebbadb366..d5415be2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.43"; + version = "9.2.44"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-j+JzLN6ila3PsTtxespvPKyH6NVO8eFncDw9qPFDLyQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-/3H6Ieq5Qt0BKlgexvJLQ/DtZn+s+k+QV2sraeoioUk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index f996182f84..71e20a6d5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -4,6 +4,8 @@ , uvloop , postgresql , pythonOlder +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { @@ -24,8 +26,14 @@ buildPythonPackage rec { nativeCheckInputs = [ uvloop postgresql + pytest-xdist + pytestCheckHook ]; + preCheck = '' + rm -rf asyncpg/ + ''; + pythonImportsCheck = [ "asyncpg" ]; @@ -33,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio PosgtreSQL driver"; homepage = "https://github.com/MagicStack/asyncpg"; + changelog = "https://github.com/MagicStack/asyncpg/releases/tag/v${version}"; longDescription = '' Asyncpg is a database interface library designed specifically for PostgreSQL and Python/asyncio. asyncpg is an efficient, clean diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index 8faa98cfda..90c4a2bfc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -1,19 +1,17 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, aiosqlite , aiofiles -, pytz -, python-dateutil -, sortedcontainers +, aiosqlite +, buildPythonPackage , cryptography -, typing-extensions -, importlib-metadata -, pytestCheckHook +, fetchFromGitHub , pytest-asyncio , pytest-mock -, asynctest +, pytestCheckHook +, python-dateutil , pythonOlder +, pytz +, sortedcontainers +, typing-extensions }: buildPythonPackage rec { @@ -21,15 +19,21 @@ buildPythonPackage rec { version = "1.0.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "FreeOpcUa"; repo = "opcua-asyncio"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-6A4z+tiQ2oUlB9t44wlW64j5sjWFMAgqT3Xt0FdJCBs="; }; + postPatch = '' + # https://github.com/FreeOpcUa/opcua-asyncio/issues/1263 + substituteInPlace setup.py \ + --replace ", 'asynctest'" "" + ''; + propagatedBuildInputs = [ aiosqlite aiofiles @@ -38,28 +42,27 @@ buildPythonPackage rec { sortedcontainers cryptography typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - - pythonImportsCheck = [ - "asyncua" ]; nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock - asynctest + ]; + + pythonImportsCheck = [ + "asyncua" ]; disabledTests = [ - "test_cli_tools_which_require_sigint" # Hard coded path only works from root of src + # Hard coded path only works from root of src + "test_cli_tools_which_require_sigint" ]; meta = with lib; { description = "OPC UA / IEC 62541 Client and Server for Python"; homepage = "https://github.com/FreeOpcUa/opcua-asyncio"; + changelog = "https://github.com/FreeOpcUa/opcua-asyncio/releases/tag/v${version}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ harvidsen ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index cfd7b70848..ce81248609 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "gremlinpython" "numpy" + "openpyxl" "pandas" "pg8000" "pyarrow" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 89cf42a6a2..f1c8f0bb54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "21.2.0"; + version = "22.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-pJLnSuSbXbarOiXwfnjSDNmyU7ZOl2IUUVaEA8mQriQ="; + hash = "sha256-/nHR81KW3VaeP2yOSWnCDvZGyxrzK8fAn9S/RRgBhyk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix new file mode 100644 index 0000000000..4afabdf64d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-frontdoor/default.nix @@ -0,0 +1,38 @@ +{ azure-common +, azure-mgmt-core +, buildPythonPackage +, fetchPypi +, lib +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-mgmt-frontdoor"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "sha256-nJXQ/BpyOwmybNUqE4cBxq5xxZE56lqgHSTKZTIHIuU="; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.frontdoor" ]; + + meta = with lib; { + description = "Microsoft Azure Front Door Service Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index e82df58832..621f8ef5b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , click , click-log @@ -19,7 +18,7 @@ buildPythonPackage rec { version = "0.34.10"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; @@ -41,8 +40,6 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-timeout - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index d5ddebc9c5..53cd8b17d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -10,16 +10,14 @@ buildPythonPackage rec { pname = "blis"; - # Do not update to BLIS 0.9.x until the following issue is resolved: - # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 - version = "0.9.1"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; + hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; }; postPatch = '' @@ -45,6 +43,12 @@ buildPythonPackage rec { "blis" ]; + passthru = { + # Do not update to BLIS 0.9.x until the following issue is resolved: + # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935 + skipBulkUpdate = true; + }; + meta = with lib; { description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btest/default.nix new file mode 100644 index 0000000000..d993f1a974 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/btest/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "btest"; + version = "1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "btest"; + rev = "refs/tags/v${version}"; + hash = "sha256-QvK2MZTx+DD2u+h7dk0F5kInXGVp73ZTvG080WV2BVQ="; + }; + + # No tests available and no module to import + doCheck = false; + + meta = with lib; { + description = "A Generic Driver for Powerful System Tests"; + homepage = "https://github.com/zeek/btest"; + changelog = "https://github.com/zeek/btest/blob/${version}/CHANGES"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix index 588ca836ad..b93d3baddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix @@ -1,5 +1,6 @@ { absl-py , buildPythonPackage +, cloudpickle , dm-tree , fetchFromGitHub , jax @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ absl-py + cloudpickle dm-tree jax numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 7e8a3b015e..2bead3b4d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.43"; + version = "9.2.44"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g7kXjoJDzc+MPmGR6dO7mGi3LcJQem6pnLvbuoC9Pxw="; + hash = "sha256-+PGCPM3EbdeS7ftqmJBd2F5HOdoXNtBWHvEEWq7JKTs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 4df88d99f9..f22533a8b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.43"; + version = "9.2.44"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; - hash = "sha256-GWChdbQRnoD6hRVONLcFNoW9vJO9iWKLnjd8xiA/7jI="; + rev = "refs/tags/v${version}"; + hash = "sha256-yA7Wh+8ClPl+Eythk9i6cFZnFF481e/UkKMGzmZxdYA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index 278d7c15fa..8d087712a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -70,5 +70,8 @@ buildPythonPackage rec { changelog = "https://github.com/databricks/databricks-sql-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ harvidsen ]; + # No SQLAlchemy 2.0 support + # https://github.com/databricks/databricks-sql-python/issues/91 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index d3592d76a8..bbac242bea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.44.0"; + version = "0.45.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; + hash = "sha256-a//tZ0SMtL9d/1WfsqzuHAbn2oYSuOKnNPJ4tQs5ZgM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix index c1248ad214..87fca9a1b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pydicom ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ckeditor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ckeditor/default.nix new file mode 100644 index 0000000000..93710f606d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ckeditor/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, django +, django-js-asset +, fetchFromGitHub +, python +, setuptools-scm +, django-extensions +, selenium +, pillow +}: + +buildPythonPackage rec { + pname = "django-ckeditor"; + version = "6.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "django-ckeditor"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-Gk8mAG0WIMQZolaE1sRDmzSkfiNHi/BWiotEtIC4WLk="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + django-js-asset + pillow + ]; + + DJANGO_SETTINGS_MODULE = "ckeditor_demo.settings"; + + checkInputs = [ + django-extensions + selenium + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test + runHook postCheck + ''; + + pythonImportsCheck = [ + "ckeditor" + ]; + + meta = with lib; { + description = " Django admin CKEditor integration"; + homepage = "https://github.com/django-ckeditor/django-ckeditor"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix new file mode 100644 index 0000000000..40cc4f6418 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-pattern-library/default.nix @@ -0,0 +1,55 @@ +{ beautifulsoup4 +, buildPythonPackage +, django +, fetchFromGitHub +, lib +, markdown +, poetry-core +, python +, pyyaml +}: + +buildPythonPackage rec { + pname = "django-pattern-library"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + repo = pname; + owner = "torchbox"; + rev = "v${version}"; + sha256 = "sha256-V299HpbfNLa9cpVhBfzD41oe95xqh+ktQVMMVvm5Xao="; + }; + + propagatedBuildInputs = [ + django + pyyaml + markdown + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api + ''; + + nativeBuildInputs = [ poetry-core ]; + + checkInputs = [ + beautifulsoup4 + ]; + + checkPhase = '' + export DJANGO_SETTINGS_MODULE=tests.settings.dev + ${python.interpreter} -m django test + ''; + + pythonImportsCheck = [ "pattern_library" ]; + + meta = with lib; { + description = "UI pattern libraries for Django templates"; + homepage = "https://github.com/torchbox/django-pattern-library/"; + changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix index 6c1d142fcc..b41ec29a41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -2,24 +2,29 @@ , buildPythonPackage , fetchPypi , hypothesis -, isPy27 +, pythonOlder , mock , nose2 , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "dpath"; - version = "2.1.4"; + version = "2.1.5"; + format = "setuptools"; - disabled = isPy27; # uses python3 imports + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; + hash = "sha256-zNlk24ObqtSqggYStLhzGwn0CiRdQBtyMVbOTvRbIrc="; }; - # use pytest as nosetests hangs + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ hypothesis mock @@ -27,11 +32,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "dpath" ]; + pythonImportsCheck = [ + "dpath" + ]; meta = with lib; { description = "Python library for accessing and searching dictionaries via /slashed/paths ala xpath"; homepage = "https://github.com/akesterson/dpath-python"; + changelog = "https://github.com/dpath-maintainers/dpath-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mmlb ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix new file mode 100644 index 0000000000..aac2ed2f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -0,0 +1,45 @@ +{ beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, html5lib +, lib +, lxml +, python +}: + +buildPythonPackage rec { + pname = "draftjs-exporter"; + version = "2.1.7"; + + src = fetchFromGitHub { + repo = "draftjs_exporter"; + owner = "springload"; + rev = "v${version}"; + sha256 = "sha256-tw0r9RnQdIwcY+pqnW8fcV0o2LzmxW0MZPn5drNgK80="; + }; + + passthru.optional-dependencies = { + lxml = [ lxml ]; + html5lib = [ beautifulsoup4 html5lib ]; + }; + + checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib; + + checkPhase = '' + # 2 tests in this file randomly fail because they depend on the order of + # HTML attributes + rm tests/test_exports.py + + ${python.interpreter} -m unittest discover + ''; + + pythonImportsCheck = [ "draftjs_exporter" ]; + + meta = with lib; { + description = "Library to convert Draft.js ContentState to HTML"; + homepage = "https://github.com/springload/draftjs_exporter"; + changelog = "https://github.com/springload/draftjs_exporter/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix index f2212d8c9c..d6fcbccd33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/default.nix @@ -6,11 +6,12 @@ , rfc3987 , ruamel-yaml , setuptools-scm +, libfdt }: buildPythonPackage rec { pname = "dtschema"; - version = "2022.01"; + version = "2022.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,9 +20,14 @@ buildPythonPackage rec { owner = "devicetree-org"; repo = "dt-schema"; rev = "refs/tags/v${version}"; - hash = "sha256-wwlXIM/eO3dII/qQpkAGLT3/15rBLi7ZiNtqYFf7Li4="; + sha256 = "sha256-+wF6WdonZrkZEnlq/P6QeT3X7CMinxbapLa7q0t2zUc="; }; + patches = [ + # Change name of pylibfdt to libfdt + ./fix_libfdt_name.patch + ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -32,6 +38,7 @@ buildPythonPackage rec { jsonschema rfc3987 ruamel-yaml + libfdt ]; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch new file mode 100644 index 0000000000..eb1ec34a95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dtschema/fix_libfdt_name.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 62db8af..4a980c1 100755 +--- a/setup.py ++++ b/setup.py +@@ -52,7 +52,7 @@ setuptools.setup( + 'ruamel.yaml>0.15.69', + 'jsonschema>=4.1.2', + 'rfc3987', +- 'pylibfdt', ++ 'libfdt', + ], + + classifiers=[ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index 343e5705f4..652ac0e1c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.20.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-T7vcnxxN0YUHoDVc98f0QwiMqT88lx8NejTsDfBY5SY="; + hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix index e8859128b5..39e6ff6ed7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dyn"; - version = "1.8.1"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "e112149d48b4500c18b3cfb6e0e6e780bb5aa0e56ff87cac412280200b9ec8bf"; + sha256 = "sha256-933etYrKRgSqJfOMIuIDL4Uv4/RdSEFMNWFtW5qiPpA="; }; buildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix index a77cd77b05..cf16b6ac14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyenergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-jo9Gn5ZPm9jSTB4m1yy779hqzby9abFFDSnKLxYqccg="; + hash = "sha256-xDrfOiAAH6qD7qv0ERlQDJ2+CXJiHgvNhxbSlbhpdtw="; }; postPatch = '' @@ -63,6 +63,7 @@ buildPythonPackage rec { "test_gas_model" "test_gas_none_data" "test_no_gas_data" + "test_electricity_midnight" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix index ae70514ed8..7b6150e46e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/energyzero/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "energyzero"; - version = "0.4.0"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-QSxr4hfNlpIbLpeQ8tcdRP3dARB/OxTP9cVgf+P63Lw="; + hash = "sha256-qBtsNqmGLCUGTYJ8iPL/Ie3yGX7Ocs4e+yp0tRAhK8g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix new file mode 100644 index 0000000000..eb449b53c1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, setuptools +}: + +buildPythonPackage rec { + pname = "farama-notifications"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = pname; + rev = version; + hash = "sha256-UUrJ/5t5x54xs1gweNUhwqrMJQXiyrUPn1bBfTsiPcw="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ setuptools ]; + + pythonImportsCheck = [ "farama_notifications" ]; + + meta = with lib; { + description = "Allows for providing notifications on import to all Farama Packages"; + homepage = "https://github.com/Farama-Foundation/Farama-Notifications"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index 14418d716c..544bb26936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.28"; + version = "1.5.29"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY="; + hash = "sha256-yCPOF150TdkPHfLl8Jo2oow+91IzRKgnXo3eQMn5wK0="; }; propagatedBuildInputs = [ @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Fast AI"; homepage = "https://github.com/fastai/fastcore"; + changelog = "https://github.com/fastai/fastcore/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index f8a5a0826c..a7af6aa70c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.35"; + version = "0.28.36"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-+MbcI/gcoQOpfL77AyA0rZBP5OgP87gSDt4e5pjriqY="; + hash = "sha256-UoWeVLsfc8rK3U7zaF8bKXk/XdrgT6F3biNe/UFq/rE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix index 457d2eab2c..3cfe44c55d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "formulaic" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/transforms/test_poly.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index 1d5cd94588..815b695ce1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.54"; + version = "0.1.55"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-lxifhL70Yn3BIjeRPnWqOs97Oy65RD0Rrgw4bJno2kI="; + hash = "sha256-YPLlrlV8UyoaNtE+LgX7jpZkR7jbSe/2WRR0v0cfACY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix index 6af750b0bd..363fe2b333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gdown"; - version = "4.6.4"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k="; + hash = "sha256-NH8jdpZ5qvfvpz5WVScPzajKVr5l64Skoh0UOYlUEEU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 77698e3ace..a2ed64150f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.28"; + version = "0.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HkOlvZaCQOt+jbmzal17W5eU7SEq+kzTgbFd3fiTY/A="; + hash = "sha256-ukKMWdyaOALA3e68cYilS8TT6aHV3n8qQXobgDTeT2o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1842c9c5be..329db692d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.19.0"; + version = "2.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5bsOrT4IIrxOnPIpvR0T1MOPGeUNU6odcKs82aN8B8I="; + hash = "sha256-DZtfQqcD8yELSzrUWhgTkZH5NHQP3zYpsbIv2VrfC7o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 35066385a7..2b54e9b8fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ylUUxWLe5u1WVyz1rD64u9MJ7qKsLl3cLD4ELcZCI6Y="; + hash = "sha256-JVXRVq7yrRLj15ZMKVCBvCsrRP8KcRj9XNvfeH0rXVc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 021d9533b4..6333f2f72d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-78o/MQFUREOW21BsSezK1QqciPVAEwOd15TRfAhxTWo="; + hash = "sha256-OaF1pzRY5k5SvXNCxTviP/2lhC7Up+oXaQB14f2tGj8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index ce2a5366ac..922f8163e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.28.0"; + version = "3.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3WA2SUC9frxafOXiGquDinwyffNrubQ4QEnfMxxC2KE="; + hash = "sha256-Dk13N2SeCGBjjwXCffLGVM0iOL6fGptRcmNidbxnzQc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 3ab5abb61d..f69cb6709f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7V57grRH2ysU765TDmqq7DOna9o8Nu9v4HjDAIf/ETA="; + hash = "sha256-mbhFBVx6Gye3M0lCny1vag659Am0ze7InfmeFr0ZeDM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index f21dd08b0f..5cabd25b9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k="; + hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix index a9aadb8521..7d6148616e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix @@ -36,9 +36,9 @@ buildPythonPackage rec { --replace 'attrs<=' 'attrs>=' \ --replace 'colorama==' 'colorama>=' \ --replace 'gql[requests]==3.0.0a6' 'gql' \ - --replace 'PyYAML==' 'PyYAML>=' \ + --replace 'PyYAML==5.*' 'PyYAML' \ --replace 'marshmallow<' 'marshmallow>=' \ - --replace 'websocket-client==' 'websocket-client>=' + --replace 'websocket-client==0.57.*' 'websocket-client' ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index 65da72dee7..a16cbd3cca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \ - --replace 'importlib-metadata<5.0.0' 'importlib-metadata' + --replace 'importlib-metadata<5.0.0' 'importlib-metadata' \ + --replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"' ''; # setup-requires requirements diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix new file mode 100644 index 0000000000..67f0ad0945 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, numpy +, cloudpickle +, gym-notices +, jax-jumpy +, typing-extensions +, farama-notifications +, importlib-metadata +, pythonOlder +}: + +buildPythonPackage rec { + pname = "gymnasium"; + version = "0.28.1"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7rRF21H3IxbgmqxvtC370kr0exLgfg3e2tA3J49xuao="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + jax-jumpy + cloudpickle + numpy + gym-notices + typing-extensions + farama-notifications + ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + + pythonImportsCheck = [ "gymnasium" ]; + + meta = with lib; { + description = "A standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; + homepage = "https://github.com/Farama-Foundation/Gymnasium"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iceportal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iceportal/default.nix new file mode 100644 index 0000000000..251f137278 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iceportal/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, httpx +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "iceportal"; + version = "1.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-ecosystem"; + repo = "python-iceportal"; + rev = "refs/tags/${version}"; + hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + pythonImportsCheck = [ + "iceportal" + ]; + + meta = with lib; { + description = "Library for getting data from the ICE Portal"; + homepage = "https://github.com/home-assistant-ecosystem/python-iceportal"; + changelog = "https://github.com/home-assistant-ecosystem/python-iceportal/releases/tag/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax-jumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax-jumpy/default.nix new file mode 100644 index 0000000000..f37677da02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax-jumpy/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, setuptools +}: + +buildPythonPackage rec { + pname = "jumpy"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Farama-Foundation"; + repo = pname; + rev = version; + hash = "sha256-tPQ/v2AVnAEC+08BVAvvgJ8Pj89nXZSn2tQ6nxXuSfA="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "jumpy" ]; + + meta = with lib; { + description = "Jumpy is a common backend for NumPy and optionally JAX"; + homepage = "https://github.com/Farama-Foundation/Jumpy"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix index 010edcd27a..6f22a64317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vg6zF4iR4YqVAsx93Gy5mO2JNldm2f7BhNBtjzVY82w="; + hash = "sha256-7SZw7hRN+VtvHHXG+O/eIrc02vc1nPnn2oJGIg7CtFM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/l18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/l18n/default.nix new file mode 100644 index 0000000000..61ac6fa3ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/l18n/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, django +, fetchFromGitHub +, fetchPypi +, lib +, pytz +, six +}: + +buildPythonPackage rec { + pname = "l18n"; + version = "2021.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; + }; + + propagatedBuildInputs = [ pytz six ]; + + pythonImportsCheck = [ "l18n" ]; + + meta = with lib; { + description = "Locale internationalization package"; + homepage = "https://github.com/tkhyn/l18n"; + changelog = "https://github.com/tkhyn/l18n/blob/${version}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix index ee73eb9405..b3ca15ee3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -60,5 +60,8 @@ buildPythonPackage rec { changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + # Compatibility issues with yara-python v4.3.0 + # https://github.com/CERT-Polska/malduck/issues/88 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix index e285ed0083..fb0640719d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -1,51 +1,67 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi +, hatchling , ipykernel , jupytext -, lib , mkdocs , mkdocs-material , nbconvert , pygments , pytestCheckHook -, pytest-cov +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.22.0"; + version = "0.24.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-WFzGm+pMufr2iYExl43JqbIlCR7UtghPWrZWUqXhIYU="; + pname = "mkdocs_jupyter"; + inherit version; + hash = "sha256-lncDf7fpMSaPPfdZn8CCjCYSR989FXW87TILqLfR1G0="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "nbconvert>=6.2.0,<7.0.0" "nbconvert>=6.2.0" + sed -i "/--cov/d" pyproject.toml substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \ - --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," + --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," ''; + pythonRelaxDeps = [ + "nbconvert" + ]; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ - nbconvert + ipykernel jupytext mkdocs mkdocs-material + nbconvert pygments - ipykernel ]; - pythonImportsCheck = [ "mkdocs_jupyter" ]; - nativeCheckInputs = [ - pytest-cov pytestCheckHook ]; + pythonImportsCheck = [ + "mkdocs_jupyter" + ]; + meta = with lib; { description = "Use Jupyter Notebook in mkdocs"; homepage = "https://github.com/danielfrg/mkdocs-jupyter"; + changelog = "https://github.com/danielfrg/mkdocs-jupyter/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ net-mist ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 59aa62baf7..acce882d87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -84,5 +84,9 @@ buildPythonPackage rec { changelog = "https://github.com/mlflow/mlflow/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ tbenst ]; + knownVulnerabilities = [ + "CVE-2023-1176" + "CVE-2023-1177" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix index 8937c96791..60a1374d9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.8.1"; + version = "5.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-li7QA9jXZL0z4C508bOxwMdaG5L1HwONKhMJwG9OXLg="; + hash = "sha256-tmwY1/SrepS+P5655MpoNurR2lAtYugbf3pIFQ4u05E="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index f159508f90..ba22cca45f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.14.2"; + version = "7.14.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-dcVEIeDsVX9bdi6IgBPHM/aVrRujmd/BHmCUCuD0v8k="; + hash = "sha256-aEmJ4jyIsgAL7CUZek/YZSPrHqW7i+S1bbZv8jH9FGc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 2d10d77f0d..fd40463f2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.97.post2"; + version = "1.26.99"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5fa2iL4H73Ne+U1hVzdJomV6NRJRcmsyXz3OSUcQrQg="; + hash = "sha256-iImkxirshZBr218nJ1YLvUxBy1h0ugZ+JQ8k4J4NmyQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix index 35ac2a4b6c..521295f536 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcloudmonitor/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "nextcloudmonitor"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "meichthys"; repo = "nextcloud_monitor"; rev = "v${version}"; - hash = "sha256-Ivo5dqKcvE1e+1crZNzKHydprtMXkZdzDl4MsZviLQQ="; + hash = "sha256-jyC8oOFr5yVtIJNxVCLNTyFpJTdjHu8t6Xs4il45ysI="; }; propagatedBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "nextcloudmonitor" ]; meta = with lib; { + changelog = "https://github.com/meichthys/nextcloud_monitor/blob/${src.rev}/README.md#change-log"; description = "Python wrapper around nextcloud monitor api"; homepage = "https://github.com/meichthys/nextcloud_monitor"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 7d8443a14b..751160ed74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-9qw3r5WRjgXXod19CwVSuosisuQwhi6zNt5ZLSXITyk="; + hash = "sha256-YiYzbVtu4YhfBXtl2+3oTEqcXk5K51oOjn84PBY+xIA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index a1764765ef..1b7f795738 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.10.4"; + version = "0.11.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XJEzT5Qs1V1F6wxn3TOaU175DiXwW57AFq0YjtDvkEg="; + hash = "sha256-u8xT0stZIMgVwWJsdZkvMZv8RQtziT+nvYqsWGmqSf4="; }; nativeCheckInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser and builder for package URLs"; homepage = "https://github.com/package-url/packageurl-python"; + changelog = "https://github.com/package-url/packageurl-python/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ armijnhemel ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix index 605986514a..0325217946 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "1.5.3.230214"; + version = "1.5.3.230321"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hLQXGnWtjYNzzyHO+p7CCFEHc2lrSwh35Om94K5Ozhk="; + hash = "sha256-RjU762VyDPy86Cvmr8hfPkqLtmntB3F6tf2OAgqmnK4="; }; nativeBuildInputs = [ @@ -107,6 +107,8 @@ buildPythonPackage rec { "test_types_rank" "test_undefined_variable_error" "test_value_label_type_mismatch" + "test_read_sql_via_sqlalchemy_connection" + "test_read_sql_via_sqlalchemy_engine" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index a839667e32..aa0fa253eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "13.4.1"; + version = "13.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f4Xq68QBcnHZdwZrAwg7QUvZrXYvrflEkh1us48YN/g="; + hash = "sha256-/XuaLc6mItjVle9aac3eEMyl22yilNRPydM0k4B7bC4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/permissionedforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/permissionedforms/default.nix new file mode 100644 index 0000000000..db4f02bef9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/permissionedforms/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, django +, django-modelcluster +, fetchFromGitHub +, lib +, python +}: + +buildPythonPackage rec { + pname = "permissionedforms"; + version = "0.1"; + + src = fetchFromGitHub { + repo = "django-permissionedforms"; + owner = "wagtail"; + rev = "v${version}"; + sha256 = "sha256-DQzPGmh5UEVpGWnW3IrEVPkZZ8mdiW9J851Ej4agTDc="; + }; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ django-modelcluster ]; + + checkPhase = '' + ${python.interpreter} runtests.py + ''; + + pythonImportsCheck = [ "permissionedforms" ]; + + meta = with lib; { + description = "A Django extension for creating forms that vary according to user permissions"; + homepage = "https://github.com/wagtail/permissionedforms"; + changelog = "https://github.com/wagtail/permissionedforms/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 9a98f05158..0ba80b1dc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "7.1.1"; + version = "7.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-u6xfsWHod8U7nM5S40ZU1z4qxNMlWdq+7yhnAtBh8oE="; + hash = "sha256-Lm05lqqZM1zucdIDgSnYsCcfo7wCDLcY02vv7CyHTGo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 58bd99ae1f..b94cec2924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.6.0"; + version = "12.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-du6UqzZthjzkRkkqXzl/019bNMQH/K3tqmFOtA/hm6M="; + hash = "sha256-m/U7O859pWOB+qF4PVcXg3pI7M2Zpl2uWPjaubeV2dE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 89ced453a9..81a81f221e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.7"; + version = "0.27.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-MT6P1st3NbHPdulL23zckgliFRTgCn8h9CK3QumXVtQ="; + hash = "sha256-ZxVlMiSMJOr4XxCuSRvTBdcd1295m+d7yqOnNxzRiuI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix index 9bf12055df..f2b5735083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { "test_multi_outpath" "test_mmhint" "test_otf" + # flaky tests (see https://github.com/adobe-type-tools/psautohint/issues/385) + "test_hashmap_old_version" + "test_hashmap_no_version" ]; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix index 86d2f59e94..9ae3a45929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaussiebb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.15"; + version = "0.0.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yaleman"; repo = "aussiebb"; - rev = "v${version}"; - hash = "sha256-V9yN05Bkv5vkHgXZ77ps3d6JS39M5iMuiijOGRBFi0U="; + rev = "refs/tags/v${version}"; + hash = "sha256-dbu26QFboqVaSFYlTXsOFA4yhXXNcB4QBCA8PZTphns="; }; nativeBuildInputs = [ @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with the Aussie Broadband APIs"; homepage = "https://github.com/yaleman/aussiebb"; + changelog = "https://github.com/yaleman/pyaussiebb/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 5fd60d40e1..ed472ce739 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "13.0.4"; + version = "13.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-eS+6PzHklopemcGcdxd0CDoqp+iX6/b14hjjCOM6Rh8="; + hash = "sha256-FJ2tKMvtIpa1B0wyZmLZywCTuDS0F8ue4Fgo6XsoLnM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index aefb4cc43f..2449ecafb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nFdt68QhpX1URLEQtdikR11KFK9E9Y+cTvJQn4/YZlI="; + hash = "sha256-6eiSzuxspWutEKL1pKBeZ0/ZQjS07BpTwgd8dyrePcM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix index 69314340cd..caa013f226 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pydy"; - version = "0.6.0"; + version = "0.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; + hash = "sha256-aaRinJMGR8v/OVkeSp1hA4+QLOrmDWq50wvA6b/suvk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index 4a2300cda4..d41b6e6252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.6"; + version = "1.3.7.post0"; src = fetchPypi { inherit pname version; - hash = "sha256-eAtpPQVVuFfXqrMeNdQpO/Tr253sekW6S7I7RAD2Jtw="; + hash = "sha256-7KHWHTPbYh74An62ka6I25xl0ZarpLLMkMGQy5C7UI4="; }; buildInputs = [ openmp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix index 4c53c37d5c..0b6bb48857 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -12,7 +12,7 @@ let pname = "pyoctoprintapi"; - version = "0.1.11"; + version = "0.1.12"; in buildPythonPackage { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage { owner = "rfleming71"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MlFL8yUCkiMnxPbMGr4jwCs0kYwRM+VGBRQUcQ5Hd6A="; + hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 5fc08dbb53..9421d332f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.37.4"; + version = "0.37.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-2P7hj0kfKLPyuKk6ouHJtkWCUT3EC1spQTjBQarwpbU="; + hash = "sha256-k4uTLiSODjAbwVZjd35RckbDb2DxFCV/Ixo3ErG9FHQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix index 909dad99fb..0b57dce5ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix @@ -4,17 +4,21 @@ , taglib , cython , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytaglib"; - version = "1.5.0-1"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "supermihi"; repo = pname; - rev = "v${version}"; - sha256 = "1nssiqzlzvzdd3pc5xd1qwgwgkyazynmq8qiljz0dhy0c8j6mkfp"; + rev = "refs/tags/v${version}"; + hash = "sha256-CEpyRxC9d7EuxupMQaX7WUCZ7lhyE6LhQY7Koe0NJ1A="; }; buildInputs = [ @@ -26,11 +30,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "taglib" ]; + pythonImportsCheck = [ + "taglib" + ]; meta = with lib; { description = "Python bindings for the Taglib audio metadata library"; homepage = "https://github.com/supermihi/pytaglib"; + changelog = "https://github.com/supermihi/pytaglib/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mrkkrp ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 11d3bdc3ad..dcfed60a8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.9"; + version = "0.5.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9WXj/zFFzPr3YabdEYN+Xn/IwKplPFdHAFDB2S2JUEI="; + hash = "sha256-VOi3v5SPHHx+qgqQmbIcC+APAks9CPklFAlCmHRM1iQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index f1a079d589..d08e62a815 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -4,7 +4,6 @@ , buildPythonPackage , eventlet , fetchFromGitHub -, fetchpatch , iana-etc , libredirect , mock @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.4"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,18 +25,9 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; + hash = "sha256-pixLk9Q7mIw1ReFemDu039lJtCwqi73tvhXl0KhKvgw="; }; - patches = [ - # Address Python 3.11 mocking issue, https://github.com/miguelgrinberg/python-engineio/issues/279 - (fetchpatch { - name = "mocking-issue-py311.patch"; - url = "https://github.com/miguelgrinberg/python-engineio/commit/ac3911356fbe933afa7c11d56141f0e228c01528.patch"; - hash = "sha256-LNMhjX8kqOI3y8XugCHxCPEC6lF83NROfIczXWiLuqY="; - }) - ]; - nativeCheckInputs = [ aiohttp eventlet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 7dd424820c..4e41507632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.2"; + version = "5.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - hash = "sha256-mSFs/k+3Lp5w4WdOLKj65kOA5b+Nc1uuksVmeeqV58E="; + hash = "sha256-3Do3Ql48cmhvrFe14ZYvWH0xi3T8hJ2LP0FyyWin580="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index c21515dcce..b031f3ea12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.43"; + version = "9.2.44"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-X1lFSbVhHBhQ6Y1pbzjObAISqA6rBTpx0Ww5c6p+3LM="; + hash = "sha256-BJw1c9X+rRNiM10Fo514ZybbvM++Ph7te2LuFNNJFTk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index ce04921804..1c63cb4e63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.6"; + version = "0.5.8"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-tkmaWD+OfJfI3QjvdQivmqi8kv5Yuk2UxLlYw8hVocY="; + hash = "sha256-ELAytOxi2wAqt2hbVKFs4+HvJr3V+faWw2leO5bfv9A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0e82762339..6683628679 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.28"; + version = "0.4.30"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RpjjN26zxX1VSm3G/4GMOSUbnDk3mhOSIcpzexGPuUs="; + hash = "sha256-8nmzU+aCBlGZs0O3/7gcP9zDM9LyCb6hVqW4cNKxrU4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix index 97d90cac25..a77e737075 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix index b8f2741cc7..8d6131c811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix @@ -9,6 +9,7 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , redis , starlette }: @@ -27,8 +28,18 @@ buildPythonPackage rec { hash = "sha256-IAB7JW8iVb5M610GVK0POXlSiya22KzNgr26BNvPC4Q="; }; + pythonRelaxDeps = [ + "limits" + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '["redis^3.4.1"]' '["redis"]' + ''; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -44,12 +55,6 @@ buildPythonPackage rec { starlette ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'limits = "^1.5"' 'limits = "*"' \ - --replace 'redis = "^3.4.1"' 'redis = "*"' - ''; - disabledTests = [ # AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. "test_endpoint_request_param_invalid" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix index e84dd51d70..1113083266 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soxr/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "soxr"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "python-soxr"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-g8YS5YgK1uK1kKtR/wn8x5DAUVY/hYmuMIgjgJAC8pM="; + hash = "sha256-/NFGzOF1X9c0yccgtVNUO+1aIWoNdJqP/OKcNj+uKpk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix index 944987f2cd..8ea41f00c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix @@ -27,6 +27,7 @@ , pyserial , ruamel-yaml , sly +, typing-extensions , pytestCheckHook , voluptuous }: @@ -52,8 +53,10 @@ buildPythonPackage rec { "cmsis-pack-manager" "deepmerge" "jinja2" + "pycryptodome" "pylink-square" "pyocd" + "typing-extensions" ]; pythonRemoveDeps = [ @@ -85,6 +88,7 @@ buildPythonPackage rec { pyserial ruamel-yaml sly + typing-extensions ]; nativeCheckInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telepath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telepath/default.nix new file mode 100644 index 0000000000..5a38142ead --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/telepath/default.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, django +, fetchFromGitHub +, lib +, python +}: + +buildPythonPackage rec { + pname = "telepath"; + version = "0.3"; + + src = fetchFromGitHub { + repo = "telepath"; + owner = "wagtail"; + rev = "v${version}"; + sha256 = "sha256-kfEAYCXbK0HTf1Gut/APkpw2krMa6C6mU/dJ0dsqzS0="; + }; + + checkInputs = [ django ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings=telepath.test_settings + ''; + + pythonImportsCheck = [ "telepath" ]; + + meta = with lib; { + description = "A library for exchanging data between Python and JavaScript"; + homepage = "https://github.com/wagtail/telepath"; + changelog = "https://github.com/wagtail/telepath/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix index 3b2701960f..592c5d72da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "tern"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MELPpz7UeOKSAW7hC2xDIog/bdLUflU00vvIbAePNBA="; + hash = "sha256-XvhKe7mf09Nr3sbpMOKOO63HQ+9thgluU02iEIdWSpg="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index a8614aa5bb..185a8a4fdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -1,23 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy +, lxml }: buildPythonPackage rec { pname = "trimesh"; - version = "3.20.2"; + version = "3.21.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-6tSrWovgVTEccDelUFrw8E1ghyiPmUsEASW8kGPUBhM="; + hash = "sha256-VRPE+1QLKGy5W99ia5BuPNtmH/eoXulApS8n8SdQSaQ="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy ]; - # tests are not included in pypi distributions and would require lots of - # optional dependencies - doCheck = false; + nativeCheckInputs = [ lxml ]; + + checkPhase = '' + # Disable test_load because requires loading models which aren't part of the tarball + substituteInPlace tests/test_minimal.py --replace "test_load" "disable_test_load" + python tests/test_minimal.py + ''; pythonImportsCheck = [ "trimesh" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix index 11b43fd992..5a7420a270 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ torch ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ttach" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix index 19190404a6..7710cdc152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-colorama/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-colorama"; - version = "0.4.15.8"; + version = "0.4.15.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xrskWqhox914w7Fr1ISEzTZhJ9YeTvoVZ26sI6zYK3Y="; + hash = "sha256-+25tIa07AbGHj8an0/Jm0fhFiwE9cUWTO9kI6x5mj7I="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 409d6584d7..34306f386f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.25.8"; + version = "1.26.25.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7PQ8QtjuQ51zKhEQtJAekBenmjjayibwjkLIRgBpOSw="; + hash = "sha256-Fgcnh5vb5S8R9f7soJKkc/ONaO076Iq7RhtZzaQPubw="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix new file mode 100644 index 0000000000..990fd0d841 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage +, callPackage +, factory_boy +, fetchFromGitHub +, lib +, wagtail +}: + +buildPythonPackage rec { + pname = "wagtail-factories"; + version = "4.0.0"; + + src = fetchFromGitHub { + repo = pname; + owner = "wagtail"; + rev = version; + sha256 = "sha256-JmFWf+TODQNsSSxYD/JYVhWc82o6rJL13j5J23r8J9A="; + }; + + propagatedBuildInputs = [ + factory_boy + wagtail + ]; + + # Tests require wagtail which in turn requires wagtail-factories + # Note that pythonImportsCheck is not used because it requires a Django app + doCheck = false; + + passthru.tests.wagtail-factories = callPackage ./tests.nix { }; + + meta = with lib; { + description = "Factory boy classes for wagtail"; + homepage = "https://github.com/wagtail/wagtail-factories"; + changelog = "https://github.com/wagtail/wagtail-factories/blob/${version}/CHANGES"; + license = licenses.mit; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/tests.nix new file mode 100644 index 0000000000..b340705f2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-factories/tests.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, django-pattern-library +, pytest-django +, pytestCheckHook +, wagtail +, wagtail-factories +}: + +buildPythonPackage { + pname = "wagtail-factories-tests"; + format = "other"; + inherit (wagtail-factories) src version; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + django-pattern-library + pytestCheckHook + pytest-django + wagtail + wagtail-factories + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix new file mode 100644 index 0000000000..bff5431e18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-localize/default.nix @@ -0,0 +1,59 @@ +{ buildPythonPackage +, dj-database-url +, django +, django-rq +, fetchFromGitHub +, flit-core +, freezegun +, google-cloud-translate +, lib +, polib +, python +, typing-extensions +, wagtail +}: + +buildPythonPackage rec { + pname = "wagtail-localize"; + version = "1.5"; + format = "pyproject"; + + src = fetchFromGitHub { + repo = pname; + owner = "wagtail"; + rev = "v${version}"; + sha256 = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8="; + }; + + propagatedBuildInputs = [ + django + wagtail + polib + typing-extensions + ]; + + checkInputs = [ + dj-database-url + django-rq + freezegun + google-cloud-translate + ]; + + nativeBuildInputs = [ flit-core ]; + + passthru.optional-dependencies = { + google = [ google-cloud-translate ]; + }; + + checkPhase = '' + ${python.interpreter} testmanage.py test + ''; + + meta = with lib; { + description = "Translation plugin for Wagtail CMS"; + homepage = "https://github.com/wagtail/wagtail-localize"; + changelog = "https://github.com/wagtail/wagtail-localize/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix new file mode 100644 index 0000000000..5d14f80369 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/default.nix @@ -0,0 +1,66 @@ +{ anyascii +, beautifulsoup4 +, buildPythonPackage +, callPackage +, django +, django-filter +, django-modelcluster +, django-taggit +, django_treebeard +, djangorestframework +, draftjs-exporter +, fetchPypi +, html5lib +, l18n +, lib +, openpyxl +, permissionedforms +, pillow +, requests +, telepath +, willow +}: + +buildPythonPackage rec { + pname = "wagtail"; + version = "4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-VUdVG2YHfH1Q3QGx8Gvg2DuJolxlq6REZmn8fG8xgxw="; + }; + + propagatedBuildInputs = [ + django + django-modelcluster + django-taggit + django_treebeard + djangorestframework + django-filter + pillow + beautifulsoup4 + html5lib + willow + requests + openpyxl + anyascii + draftjs-exporter + permissionedforms + telepath + l18n + ]; + + # Tests are in separate derivation because they require a package that depends + # on wagtail (wagtail-factories) + doCheck = false; + + passthru.tests.wagtail = callPackage ./tests.nix {}; + + meta = with lib; { + description = "A Django content management system focused on flexibility and user experience"; + homepage = "https://github.com/wagtail/wagtail"; + changelog = "https://github.com/wagtail/wagtail/blob/v${version}/CHANGELOG.txt"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/tests.nix new file mode 100644 index 0000000000..23eb87c1b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail/tests.nix @@ -0,0 +1,42 @@ +{ azure-mgmt-cdn +, azure-mgmt-frontdoor +, boto3 +, buildPythonPackage +, django-pattern-library +, elasticsearch +, freezegun +, jinja2 +, python-dateutil +, python +, pytz +, wagtail +, wagtail-factories +}: + +buildPythonPackage { + pname = "wagtail-tests"; + inherit (wagtail) src version; + format = "other"; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + wagtail + wagtail-factories + jinja2 + freezegun + elasticsearch + azure-mgmt-cdn + python-dateutil + pytz + boto3 + django-pattern-library + azure-mgmt-frontdoor + ]; + + checkPhase = '' + export DJANGO_SETTINGS_MODULE=wagtail.test.settings + ${python.interpreter} -m django test + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix index 4d90e4e17e..fb9f9f930d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix @@ -1,30 +1,21 @@ { lib , babel , buildPythonPackage -, colorama -, cssselect -, feedparser , fetchFromGitLab , fetchpatch -, gdata , gnupg -, google-api-python-client , html2text , libyaml , lxml -, mechanize , nose , packaging -, pdfminer-six , pdm-pep517 , pillow , prettytable -, pyqt5 , python-dateutil , pythonOlder , pyyaml , requests -, simplejson , termcolor , testers , unidecode @@ -47,31 +38,21 @@ buildPythonPackage rec { nativeBuildInputs = [ packaging - pyqt5 pdm-pep517 ]; propagatedBuildInputs = [ babel - colorama - cssselect python-dateutil - feedparser - gdata gnupg - google-api-python-client html2text libyaml lxml - mechanize packaging - pdfminer-six pillow prettytable - pyqt5 pyyaml requests - simplejson termcolor unidecode ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index b9bd837c16..cc881824cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.10"; + version = "2.1.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B1ncj/5Z+V+mXTW+bY7BXsKjwaH8SgZI6nDZn6Qc754="; + hash = "sha256-aTtcp6u+/fPHRB/FShdzfCv5haja+Vyo/WLm7GLvadw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix index 85b8a26abc..c86bc6b2af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.2.3"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; + hash = "sha256-r1qsD5PquOVDEVmrgU2QP5bZpsuZuKlfaaHUjY4AHy4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix index 2de6d70139..e0a50279de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.19.0"; + version = "3.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ in owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-psoFdYETXztPJfOZyfES5ujcUDBp/X7sY/puP66E0Ok="; + hash = "sha256-HYagARlppQpM43ND/CkLL0iHmOmhl/wBDGVlJyOc9dU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index c0d278b498..fa7d513076 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.12"; + version = "0.2.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-k0al/N9xWen/IlE8JfFV98DSRnelQk+MURXz3IjGgNI="; + hash = "sha256-KUG8hixdfLg1qBvwU1s6HFORWKCdSY54wLo0onhXmE0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix index ca5d5c6956..843c42b628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -8,17 +8,17 @@ , y-py , pytest-asyncio , pytestCheckHook +, pythonRelaxDepsHook , websockets }: buildPythonPackage rec { pname = "ypy-websocket"; version = "0.8.4"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "y-crdt"; repo = "ypy-websocket"; @@ -26,8 +26,13 @@ buildPythonPackage rec { hash = "sha256-jl2ciIA3enJRfPgcu96MZN+BmNL+bBet54AFDBy3seY="; }; + pythonRelaxDeps = [ + "aiofiles" + ]; + nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -36,7 +41,9 @@ buildPythonPackage rec { y-py ]; - pythonImportsCheck = [ "ypy_websocket" ]; + pythonImportsCheck = [ + "ypy_websocket" + ]; nativeCheckInputs = [ pytest-asyncio @@ -50,7 +57,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/y-crdt/ypy-websocket/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/y-crdt/ypy-websocket/blob/${version}/CHANGELOG.md"; description = "WebSocket Connector for Ypy"; homepage = "https://github.com/y-crdt/ypy-websocket"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index a2adbeb87d..5bc5ece218 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.25.0"; + version = "0.25.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hpX/qmRRwvCE0N5jIWl6AZkcYaVViK30nPbJwyZD+rM="; + hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for YouTube Music"; homepage = "https://github.com/sigma67/ytmusicapi"; + changelog = "https://github.com/sigma67/ytmusicapi/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index 0852ce740e..59e8d5ca3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.8.2"; + version = "3.7.9"; src = fetchPypi { inherit version pname; - hash = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; + hash = "sha256-q994axJexRU1SUlg9P71NvaZRpR9dj46GX85cbvMEy8="; }; buildInputs = [ openssl bzip2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 997548cc3c..f87d362980 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.94"; + version = "0.0.95"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-WYMl/KN3JUmBV+O29WVxZXFpfJ5of7Jo2hFgrbn2NYc="; + hash = "sha256-LCO4jLwPqPDOoKdzay7cKuAv36UZ+OGu39AoBj6iqpY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 4b55e598e2..f487cc71b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aiosqlite -, asynctest , buildPythonPackage , crccheck , cryptography @@ -21,7 +20,7 @@ buildPythonPackage rec { version = "0.53.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "zigpy"; @@ -41,7 +40,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest freezegun pytest-asyncio pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 2c73f58005..e6aa92cd35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "4.4"; + version = "5.0"; format = "setuptools"; src = fetchPypi { pname = "zope.cachedescriptors"; inherit version; - hash = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; + hash = "sha256-MVe+hm/Jck0Heotb9sP8IcOKQUerZk5yRiLf5fr/BIo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index 0ff47dae38..be67115333 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.17"; + version = "5.0.19"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-UX7WqQt5inVldrXG3bIVmR8ucCvbHdyVLgQ/srhpCak="; + sha256 = "sha256-ziJz9bJm4TxKzpGOBv1JwTnjgmloGBa9SCAUbg0WoLU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 93f26dc7d5..fcb849d436 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.9.2"; + version = "10.9.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-XsWzSg/bwP+O454oQSVDrvmjWKVZpLyfGB47olqRSUY="; + sha256 = "sha256-728SBtKcYTRA8ogNMX6XD3aFbz14GjyNvBVkjdiASPE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index 2e1a77eda9..276057583f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - hash = "sha256-96EzipCd5GX1bkpZIXZp1ZUVO+Oe4t5bhthGZHUVmFk="; + hash = "sha256-cauA/DyKycgKEAANg4EoryigXTGg7hg5AMLFxuNQ7KM="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index 390b25b642..158e73ccd9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.6.1"; + version = "0.7.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rPgURBjhfCRO7XFtr24Y7Dvcm/VEv7frq8p6wvtgjdY="; + sha256 = "sha256-FLyD6fbcBi15gSh4dB9titqrJS3COfJYhxA3uroD24k="; }; - cargoSha256 = "sha256-IFoK52Qmw34oghAwlGtGFLl9MWXtJkMcx86jIqiwjuQ="; + cargoHash = "sha256-yD7oQyT7QimUOtaqaUURPP8hV0z6QKBhItk5C+rJjwo="; cargoBuildFlags = [ "--bin" "svlint" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 6ede440cc6..30f9097be3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.11"; + version = "0.10.12"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-B47C7sqOqiHa/2kC5lk/J1pXK61l1M5umVKaCfVO7cc="; + hash = "sha256-MlPnJMuz35Zd+VQwvsadRRPULebR7GWN1vGV+cJ7s4c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix index a96cf652df..48e47dd066 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix @@ -29,12 +29,9 @@ buildGoModule rec { hash = "sha256-nRmEXR9fjDxvpbnT+qpGeM0Cc/qW/kN53sKOXwZiBXY="; }; - subPackages = [ "cmd/..." ]; - vendorHash = "sha256-+AvmJkZCFovE2+5Lg98tUvA7f2kBHUMzhl5IyrEGuy8="; - # integration tests require network access - doCheck = false; + tags = [ "embed" ]; ldflags = [ "-s" @@ -42,6 +39,8 @@ buildGoModule rec { "-X github.com/coder/coder/buildinfo.tag=${version}" ]; + subPackages = [ "cmd/..." ]; + preBuild = '' export HOME=$TEMPDIR @@ -57,8 +56,6 @@ buildGoModule rec { popd ''; - tags = [ "embed" ]; - nativeBuildInputs = [ fixup_yarn_lock installShellFiles @@ -79,10 +76,15 @@ buildGoModule rec { wrapProgram $out/bin/coder --prefix PATH : ${lib.makeBinPath [ terraform ]} ''; - meta = with lib; { + # integration tests require network access + doCheck = false; + + meta = { description = "Provision software development environments via Terraform on Linux, macOS, Windows, X86, ARM, and of course, Kubernetes"; homepage = "https://coder.com"; - license = licenses.agpl3; - maintainers = with maintainers; [ ghuntley urandom ]; + license = lib.licenses.agpl3; + maintainers = [ lib.maintainers.ghuntley lib.maintainers.urandom ]; + # Failed to download Chromium 109.0.5414.46 + broken = true; # At 2023-03-30 }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 23d4e7a1b4..0c13401c5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-QthFKdO68kFePAMQX239f4HJNG5ZkOyxEq6zmHuDNE4="; + hash = "sha256-4rAu81f2ZkYbK+DQHXlAwFexauWWEo+XaPfcrP2/pbQ="; }; - vendorHash = "sha256-6JYn8o696uDKayw5zLoys5UNIFS2FK2LOZw62rgP72Y="; + vendorHash = "sha256-4geHr4bbvnKViC754YznhR33wXbkUxwlV5NNjwhpssY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index 05b3038787..334c52cd47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-d7Yz5MgV5l54uGbQPmGUVZuz4xdGO+gSiI9/6Axqsb0="; + hash = "sha256-R9O+ilOz5AZmsSR0uoOhXLNMTUEej9sV4ONaIF6ZnVc="; }; - vendorHash = "sha256-fRHs2B/pea9FIqPpOaR6z3do+tpnaGlKTbwfF/smC4w="; + vendorHash = "sha256-/ZwIuzUvs7GvpoR6CfxdCivyOS8kDOukM92NuWFXJCY="; proxyVendor = true; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix b/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix index badc9aba08..d8438b85b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "csvq"; - version = "1.17.11"; + version = "1.18.1"; src = fetchFromGitHub { owner = "mithrandie"; repo = "csvq"; rev = "v${version}"; - sha256 = "sha256-jhj03xpWBcLVCCk1S9nsi8O6x1/IVwNT3voGfWBg2iw="; + sha256 = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE="; }; - vendorSha256 = "sha256-C+KQHSp4aho+DPlkaYegjYSaoSHaLiQOa1WJXIn9FdQ="; + vendorHash = "sha256-byBYp+iNnnsAXR+T3XmdwaeeBG8oB1EgNkDabzgUC98="; meta = with lib; { description = "SQL-like query language for CSV"; diff --git a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix index 084b14b017..46ebf768a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dapr/cli/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { meta = with lib; { description = "A CLI for managing Dapr, the distributed application runtime"; homepage = "https://dapr.io"; - license = licenses.mit; + license = licenses.asl20; maintainers = with maintainers; [ joshvanl lucperkins ]; mainProgram = "dapr"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix index 36055cc2b8..ed46312a58 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-1CdZVh7pbupCNOE1ydgYEqX4rYo2LRddlNRNf0QjlN0="; + sha256 = "sha256-6ofLXGrwkPBXQC+wb3sNqeMsVin5kBD8GyM7Ywu7xDs="; }; - vendorSha256 = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0="; + vendorHash = "sha256-6JfxKzYAjSQ9JFuFGDUZ0ALS1D7f2LK3bP0Fbl2ivo0="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index 3f969acf89..09d4aaa074 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.45"; + version = "1.8.46"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-11bwb8Nnr5RmRes/qUAoxMJ9vpwkIyB1113X3HDjYKA="; + hash = "sha256-sSMJxR8ZizQtWjiDbuc8pH5GltZ7YVzZrwOuz7Ih9iw="; }; vendorHash = "sha256-MrVIpr2iwddW3yUeBuDfeg+Xo9Iarr/fp4Rc4WGYGeU="; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 0136d25741..30c689f1dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.13"; + version = "0.17.14"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-b9hepd8rF96lU/986Kgc0aSulUylecu73cuxM6Kuu24="; + hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix index dfeab3a6ef..b53298046a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fundoc/default.nix @@ -2,29 +2,29 @@ rustPlatform.buildRustPackage rec { pname = "fundoc"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "csssr"; + owner = "daynin"; repo = pname; rev = "v${version}"; - hash = "sha256-qmsr4bhErpMzS71NhLep0EWimZb/S3aEhMbeBNa5y8E="; + hash = "sha256-8WWaYgfqGWrTV2EEeSPz1BN2ur7gsxFiHeDNMJdVDcw="; }; cargoPatches = [ - # https://github.com/CSSSR/fundoc/pull/36 + # updates outdated lock file and fixes a test (fetchpatch { - name = "update-dependencies-for-rust-1.64.patch"; - url = "https://github.com/CSSSR/fundoc/commit/9e0c5f747088467b70bd385fcb8888950351143f.patch"; - hash = "sha256-JUTwMdxxt+2jst9DyqgkblZodBSYJzaDtjiLRQ8mJFU="; + name = "fix-tests.patch"; + url = "https://github.com/daynin/fundoc/commit/7dd3cf53a1d1ed72b00bf38ea3a45ba4590da7ef.patch"; + hash = "sha256-9Xsw2P4t9gzwc/qDU6U5+HZevPiQOOQo88gybC8QpyM="; }) ]; - cargoHash = "sha256-1gKxFznoGYGme0UicP73FQt8CnI9IeyHJxLgRcLffm0="; + cargoHash = "sha256-yapFUkG2JfGb3N3iVEDpQunOyRnbNTs+q3zQ23B23/s="; meta = with lib; { description = "Language agnostic documentation generator"; - homepage = "https://github.com/csssr/fundoc"; + homepage = "https://github.com/daynin/fundoc"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix index d2c3202f21..142abf1dec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint-langserver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "golangci-lint-langserver"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "nametake"; repo = "golangci-lint-langserver"; rev = "v${version}"; - sha256 = "sha256-VsS0IV8G9ctJVDHpU9WN58PGIAwDkH0UH5v/ZEtbXDE="; + sha256 = "sha256-UdDWu3dZ/XUol2Y8lWk6d2zRZ+Pc1GiR6yqOuNaXxZY="; }; - vendorSha256 = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; + vendorHash = "sha256-tAcl6P+cgqFX1eMYdS8vnfdNyb+1QNWwWdJsQU6Fpgg="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 0f0c486ee6..30529f03ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-Du0u31P2Ay4MVLmgrQmbAstmczuIy+ONIUAUEbbK+j4="; + hash = "sha256-FmNXjOMDDdGxMQvy5f1NoaqrKFpmlPWclXooMxXP8zg="; }; - vendorHash = "sha256-N20AJaREqmvCey5P0YuUd3l/5xRzrIG+mPOiVHOUFWc="; + vendorHash = "sha256-BhD3a0LNc3hpiH4QC8FpmNn3swx3to8+6gfcgZT8TLg="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix b/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix index 245f86788a..acefcfb726 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goresym/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goresym"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tf/oD0f8XLG2CuiQvduVberzWSetojVRBrSd83snK5Q="; + sha256 = "sha256-he71OrOIZ75Z4S3mf7AuQsupnLu/rsLGV2DRXyxRGS4="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index f76c120b87..eab14d4541 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.104.0"; + version = "0.105.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-rqsmhCeVhlm/qnz3lDKCUenfkvnkI/Gsysh2hF02cIQ="; + sha256 = "sha256-bkjXvubZVwmZgaTAa+ieJCAUplL7UTj11hJIMaQf8TA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix index fef2306b1c..e568568ccd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+auy6LfvT7OCCSM/WNjnzFsBTAHS+kcghOaMpG3f9dA="; + sha256 = "sha256-vUvDdeowbrmDQvUCUYRjOGQQrlyGGKrnXsYFsMWMfFw="; }; - cargoHash = "sha256-ZNYYb0Ji4AmiXfhKMPK/4MPfFYSmnUeeeTmiq6rpBvg="; + cargoHash = "sha256-zb1F3bv1MrXkoBzTaVXbHcKFlg5R9Ulq6eN8mh8WKSg="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock new file mode 100644 index 0000000000..00dc9c8b1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -0,0 +1,1932 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "append-only-vec" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5608767d94038891df4c7bb82f6b1beb55fe3d204735985e20de329bc35d5fee" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[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.11", +] + +[[package]] +name = "auto_impl" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "biblatex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc17a7f4d461f93f5dbbae4c961746cb4aafb5c6c1a61089a86836614932a3c" +dependencies = [ + "chrono", + "numerals", + "paste", + "strum", + "unicode-normalization", + "unscanny", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "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 = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "comemo" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22bf2c21093020535dd771993fedae8dd55393a4258cca501a9b55a962d350a5" +dependencies = [ + "comemo-macros", + "siphasher", +] + +[[package]] +name = "comemo-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9faa23f4534253fa656b176ff524d5cd7306a6fed3048929f9cc01ab38ab5a5a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "csv" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-url" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" +dependencies = [ + "matches", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ecow" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60e2840fbfc397c7972b11a6e6bd99a0248921cc1e31f293c5f6c5ac24831da" + +[[package]] +name = "elsa" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f74077c3c3aedb99a2683919698285596662518ea13e5eedcf8bdd43b0d0453b" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "fancy-regex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "filetime" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.45.0", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide 0.6.2", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" + +[[package]] +name = "futures-io" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-macro" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "futures-sink" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" + +[[package]] +name = "futures-task" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" + +[[package]] +name = "futures-util" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[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 = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hayagriva" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55fc197906e4c8f799311502776bd69f8b8a50cb26173ef915d87384786d181e" +dependencies = [ + "biblatex", + "chrono", + "isolang", + "lazy_static", + "linked-hash-map", + "paste", + "regex", + "strum", + "thiserror", + "unic-langid", + "unicode-segmentation", + "url", + "yaml-rust", +] + +[[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.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "hypher" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cf92443ef10ecfc1b8b4b65a93e31d983f020a355699d83874b12a7c797ac3" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif 0.12.0", + "jpeg-decoder 0.3.0", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "isolang" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b64fd6448ee8a45ce6e4365c58e4fa7d8740cba2ed70db3e9ab4879ebd93eaaa" +dependencies = [ + "phf", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jpeg-decoder" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec 0.7.2", +] + +[[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.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "lipsum" +version = "0.8.2" +source = "git+https://github.com/reknih/lipsum#025427353ab32268daa3d96feda380a96db529c5" +dependencies = [ + "rand", + "rand_chacha", +] + +[[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 = "lsp-types" +version = "0.94.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237" +dependencies = [ + "bitflags", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +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 = "notify" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +dependencies = [ + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.42.0", +] + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "libc", +] + +[[package]] +name = "numerals" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[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", + "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 = "pdf-writer" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249f9b33a3192626f2cd9f4b0cd66c1ec32d65968d58cf4d8239977feddddead" +dependencies = [ + "bitflags", + "itoa", + "ryu", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pixglyph" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" +dependencies = [ + "ttf-parser 0.18.1", +] + +[[package]] +name = "png" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide 0.6.2", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "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" + +[[package]] +name = "rctree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "resvg" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e702d1e8e00a3a0717b96244cba840f34f542d8f23097c8903266c4e2975658" +dependencies = [ + "gif 0.11.4", + "jpeg-decoder 0.2.6", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "roxmltree" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] +name = "rustybuzz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" +dependencies = [ + "bitflags", + "bytemuck", + "smallvec", + "ttf-parser 0.15.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "safe_arch" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" +dependencies = [ + "bytemuck", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.11", +] + +[[package]] +name = "serde_json" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.11", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subsetter" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" + +[[package]] +name = "svg2pdf" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd5736713f3850a24060c3cdd7ac9efdc0c5138779386c6c8975b46d54d2d3d5" +dependencies = [ + "image", + "miniz_oxide 0.5.4", + "pdf-writer", + "usvg", +] + +[[package]] +name = "svgtypes" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" +dependencies = [ + "siphasher", +] + +[[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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syntect" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" +dependencies = [ + "bincode", + "bitflags", + "fancy-regex", + "flate2", + "fnv", + "lazy_static", + "once_cell", + "regex-syntax", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "walkdir", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thin-vec" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" + +[[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.11", +] + +[[package]] +name = "tiny-skia" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d049bfef0eaa2521e75d9ffb5ce86ad54480932ae19b85f78bec6f52c4d30d78" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "bytemuck", + "cfg-if", + "png", + "safe_arch", +] + +[[package]] +name = "tinystr" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "num_cpus", + "pin-project-lite", + "tokio-macros", + "windows-sys 0.45.0", +] + +[[package]] +name = "tokio-macros" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.11", +] + +[[package]] +name = "tokio-util" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-lsp" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b38fb0e6ce037835174256518aace3ca621c4f96383c56bb846cfc11b341910" +dependencies = [ + "async-trait", + "auto_impl", + "bytes", + "dashmap", + "futures", + "httparse", + "lsp-types", + "memchr", + "serde", + "serde_json", + "tokio", + "tokio-util", + "tower", + "tower-lsp-macros", + "tracing", +] + +[[package]] +name = "tower-lsp-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34723c06344244474fdde365b76aebef8050bf6be61a935b91ee9ff7c4e91157" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "ttf-parser" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typst" +version = "0.0.0" +source = "git+https://github.com/typst/typst.git?tag=v23-03-28#056d15aa49f545980b03068684f0d44e35248cd6" +dependencies = [ + "bitflags", + "bytemuck", + "comemo", + "ecow", + "flate2", + "if_chain", + "image", + "log", + "miniz_oxide 0.5.4", + "once_cell", + "pdf-writer", + "pixglyph", + "regex", + "resvg", + "roxmltree", + "rustybuzz", + "serde", + "siphasher", + "subsetter", + "svg2pdf", + "thin-vec", + "tiny-skia", + "ttf-parser 0.18.1", + "typst-macros", + "unicode-math-class", + "unicode-segmentation", + "unicode-xid", + "unscanny", + "usvg", + "xmp-writer", +] + +[[package]] +name = "typst-library" +version = "0.0.0" +source = "git+https://github.com/typst/typst.git?tag=v23-03-28#056d15aa49f545980b03068684f0d44e35248cd6" +dependencies = [ + "comemo", + "csv", + "ecow", + "hayagriva", + "hypher", + "kurbo", + "lipsum", + "log", + "once_cell", + "roxmltree", + "rustybuzz", + "serde_json", + "smallvec", + "syntect", + "ttf-parser 0.18.1", + "typed-arena", + "typst", + "unicode-bidi", + "unicode-math-class", + "unicode-script", + "unicode-segmentation", + "xi-unicode", +] + +[[package]] +name = "typst-lsp" +version = "0.3.0" +dependencies = [ + "append-only-vec", + "codespan-reporting", + "comemo", + "dirs", + "elsa", + "memmap2", + "notify", + "once_cell", + "parking_lot", + "regex", + "same-file", + "serde_json", + "siphasher", + "tokio", + "tower-lsp", + "typst", + "typst-library", + "walkdir", +] + +[[package]] +name = "typst-macros" +version = "0.0.0" +source = "git+https://github.com/typst/typst.git?tag=v23-03-28#056d15aa49f545980b03068684f0d44e35248cd6" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", + "unscanny", +] + +[[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 = [ + "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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-math-class" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" + +[[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-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a261d60a7215fa339482047cc3dafd4e22e2bf34396aaebef2b707355bbb39c0" +dependencies = [ + "base64", + "data-url", + "flate2", + "float-cmp", + "kurbo", + "log", + "pico-args", + "rctree", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +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 = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[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_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[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_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xmlparser" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" + +[[package]] +name = "xmp-writer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd742bbbb930fc972b28bf66b7546dfbc7bb9a4c7924299df0ae6a5641fcadf" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix new file mode 100644 index 0000000000..e824ff27f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -0,0 +1,33 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "typst-lsp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "nvarner"; + repo = pname; + rev = "v${version}"; + hash = "sha256-WLfGrYrhOXesdlyDwUb2iUgTAHW1ASolT/JjGKq60OU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "lipsum-0.8.2" = "sha256-deIbpn4YM7/NeuJ5Co48ivJmxwrcsbLl6c3cP3JZxAQ="; + "typst-0.0.0" = "sha256-0fTGbXdpzPadABWqdReQNZf2N7OMZ8cs9U5fmhfN6m4="; + }; + }; + + cargoHash = "sha256-ISkw0lhUKJG8nWUHcR93sLUFt5dDEyK7EORcOXEmVbE="; + + meta = with lib; { + description = "A brand-new language server for Typst"; + homepage = "https://github.com/nvarner/typst-lsp"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 0b44b662a7..f0d5f18961 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23845"; + version = "0.1.25085"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oLjr3aWJ8+X+T7oD1NdDfNDBuufwA180AOT3K8WR/q0="; + sha256 = "sha256-NPDJutiM4SkK1LxwncPq2Af7ogqPEZ0lmshjb568BUw="; }; - vendorHash = "sha256-8HAiZ0zEJ+nnCsSUrNv0qQlvROCyNXO49fLWnKi6anE="; + vendorHash = "sha256-xg981yv+LrV/OyPhb3vElfIVQ66rfkm1f8k0dacWsyQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix new file mode 100644 index 0000000000..b14c05351f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, withSimd ? stdenv.isx86_64 +}: + +rustPlatform.buildRustPackage rec { + pname = "rsonpath"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "v0ldek"; + repo = "rsonpath"; + rev = "v${version}"; + hash = "sha256-kbtw8PhUecxIAxBdklbXtzS3P9o2aw8DCCJaC+vkNT0="; + }; + + cargoHash = "sha256-ZcnMpGgs/3VLdFsPPYzt2EkHNU26dvLnuOHy8OOtp0k="; + + buildNoDefaultFeatures = true; + buildFeatures = [ + "default-optimizations" + ] ++ lib.optionals withSimd [ + "simd" + ]; + + meta = with lib; { + description = "Blazing fast Rust JSONPath query engine"; + homepage = "https://github.com/v0ldek/rsonpath"; + changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock index 59566d3b49..7349b26f7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock @@ -1593,7 +1593,7 @@ dependencies = [ [[package]] name = "texlab" -version = "5.4.0" +version = "5.4.1" dependencies = [ "anyhow", "assert_unordered", diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 63f4ca45a9..2f47fb46ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,13 +15,13 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2P+aidfYkO8l9VjqTstXbksyGTQ3porJhrBYod9oCYQ="; + sha256 = "sha256-rTYcYq8SL404A/ke5Rb9QcCtwHKhs+84TQGNqRn11HM="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index 5a2c7dae9b..05ac41f3b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.14.3"; + version = "14.22.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rxsc77M30aDuDgOtXWF2sQkzv2Xv4sxZ5JlkaqO/AbI="; + hash = "sha256-kyASLWzjTFc10XWDLbc66+kaXjBaYmlgBc0Y8fF23Jk="; }; - vendorHash = "sha256-eMmp67B2udc8mhpVq2nHX+v1l1h3dXvjVXenZqCA6m4="; + vendorHash = "sha256-MM6WwEs2BMkfpTsDFIqwpIROMs8zbbT5OsP6FXwRvy8="; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 530d349303..2835e19876 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.48.0"; + version = "0.50.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-//xwk5T477Ae61MqZCrj8VcG23mqrP04/VVuUwtxyio="; + hash = "sha256-xoU6S8tQaJgJnF+zLWEhgoznwMY1orE/0QI9KAqr0Gk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix index 13b61e1d69..0102a34994 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-5Vr7qE6AFesvBkOpgStxI26m8rbQ8pXOXvNxbcX/ilc="; + sha256 = "sha256-yo0/RhUs9KUdY0l0qqRs3eGWr4y183ZNSCsWihFK++4="; }; - vendorSha256 = "sha256-D8ITrzEwas/UElfsXBG2BfHGFcFsxzWFar2ehgLwy5U="; + vendorHash = "sha256-yGQO5vTdkAr6bKnpaQz//n7r07NGyQg+vQ2BqPGe8Nk="; excludedPackages = [ "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index e6798260f9..b16f04cef2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.130.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-rrrjIyIMoCshq348bUBGzMcwYhEZMt1OA/pOoE4PEY8="; + sha256 = "sha256-2yCtpxrw05Vh098wBH5FwdbvRtMmyyihzQUzQgH0vyo="; }; - vendorHash = "sha256-shs05gXqLjp+L3t5f7oh0BV8YRPtcoCzrTlmx1tOvP0="; + vendorHash = "sha256-JJwMucS03LdGCnlHqPych73KVcSZ3S9Y1nNr4V6CB+o="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index 0dc9249d55..ea1bf907d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.0.13"; + version = "3.0.18"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ZLzIbA/eIu8cP9F6xSl8exFXDuyw7cYLAy0Zg+dJEzw="; + hash = "sha256-CL75WefdcBmGSoqReHM2eecsQPcciRfat7ULhc4TfV4="; }; - cargoHash = "sha256-1CqGs1pT/QaA+fFfuhP/O74wpFeVCHFsubIIo+UVLf8="; + cargoHash = "sha256-/uiz7dmuuByS99y7rXwyCtFGIR+DIenky4dusJCMFZg="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix index 6b3965afc2..a61d558821 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -1,17 +1,18 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib +, rustPlatform +, fetchCrate +}: rustPlatform.buildRustPackage rec { pname = "cargo-all-features"; - version = "1.7.0"; + version = "1.9.0"; - src = fetchFromGitHub { - owner = "frewsxcv"; - repo = pname; - rev = version; - sha256 = "sha256-p9UQaqytqpD2u9X9zaTPIgVEloU2UbD/AxVERNs1Lt8="; + src = fetchCrate { + inherit pname version; + hash = "sha256-OLnz1SmMLs/yats/lZugqNUlBQHSNR1bOuEmnHGdoN8="; }; - cargoSha256 = "sha256-krtuLFQlInqdv7j8v13/X3lL0JdaMsApb9Ga5muThgw="; + cargoHash = "sha256-Gg5tF8IvbtIoqR0AKRS7IbcCNOCJO8oxwX0KkUr+l/M="; meta = with lib; { description = "A Cargo subcommand to build and test all feature flag combinations"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix index 7ad698530e..a6ac5c7227 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.51"; + version = "0.1.52"; src = fetchCrate { inherit pname version; - sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o="; + sha256 = "sha256-eUFQT2zYABRtTqWxMi+AyU1ZHdt8+B1nMC0Sz6IK6+w="; }; - cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks="; + cargoHash = "sha256-uzuITRUvAOsuFaq+dkO8tRyozwUt4xB/3BP3mNCxr2g="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index a582ce805a..e7e9f3982d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.23"; + version = "1.0.24"; src = fetchCrate { inherit pname version; - sha256 = "sha256-H8odIEGtAMP1SQMdlgvFbduoLEaze89MFarN8AxBkK4="; + sha256 = "sha256-oMqmivRKnrhkvGnkj9fmFUhqkh846lABfAWg/6+a/yM="; }; - cargoSha256 = "sha256-pVHBFub5OTkL6e8ftI0nNisH+vJBOlcq4W0gwzz7vtA="; + cargoSha256 = "sha256-mZ7EV3ZnmfhGOmmUUEHX71ssHNBT6u1l4U7H/b727hE="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix index 468a5dd04c..51d33f517d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-vet"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = version; - sha256 = "sha256-+Qbq3EARedsaPtSTfR/UCC/1p0b/QmvriG2AIyx8coo="; + sha256 = "sha256-PAqpVixBdytHvSUu03OyoA1QGBxmmoeV78x6wCiCemQ="; }; - cargoSha256 = "sha256-Vij4vq+04fLpbcDpYVMBVl3QNVZprUYcVLB28mrjUOg="; + cargoSha256 = "sha256-dsaDpDa/BNqnL3K4a1mg3uEyM094/UO73MzJD9YaAwE="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 5595b4dbae..9ae762a7d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-95cmmYHRS9BS+CtVE/sV2dwmoAk1EKJjX7NulKRuPLs="; + sha256 = "sha256-KyfwH2zdKUUazIZoea8XVOo+vGbPrx5x00IceUuAPXM="; }; - cargoSha256 = "sha256-5zdakF/6pDNWcAw8IXCe4Jl246V/Jdto1FPBFkKy6gg="; + cargoSha256 = "sha256-z+NTfF+7zbfRt5/uvno4Z2hA6onVBWKR6Tje2KClkc0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index 0033a1c5f0..ac6e9e5d85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.6"; + version = "0.3.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk="; + hash = "sha256-GLJrM5vIGYH5lNvwmpYKE/ISTRUwikCCj2o5h6Y9kW4="; }; - cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk="; + cargoHash = "sha256-YevCel3HqwslwVmEA1vncsYYPMGQPUnwlkxLNQsnKG0="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index f37475d454..94edc184b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-03-20"; - cargoSha256 = "sha256-2r9Z3nzHENonhR3CmQ8ofm5Qa7g7FqLy5pTbhNCSaZE="; + version = "2023-03-27"; + cargoSha256 = "sha256-9yMDyjBFv4CIo6msseTzO+gsoH+vK90sb0g/wiTYlWU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-TnMPQPXDXLGLJu5PvEMglPidrtxH89P9dj/YmWc5JiQ="; + sha256 = "sha256-cG5g+rNGqCVMlQqNXhP40OtCqkYwTG/C4C353e4z2cU="; }; auditable = true; # TODO: remove when this is the default diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 812a02b2ed..c4e81d4eca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.1"; - vendorHash = "sha256-OMQaYvNt4VeLoNVL/syQlIlGsP4F0C2A679OLbXIXng="; + version = "5.5.2"; + vendorHash = "sha256-hDr/ByBCjKE+B698IXzDFq1ovS6Nfs4O32aF7HKmrcY="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-sTgnDe3cjisdmJPtqNkjPF5XncC25Leud4ASai9peJE="; + sha256 = "sha256-Bo9oT6POywVYfZwXFfSGMZTf4XhSm0hgG2cQg6W1A2U="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md deleted file mode 100644 index d5a6460ed9..0000000000 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md +++ /dev/null @@ -1,24 +0,0 @@ - -# `cypress-example-kitchensink` - -This directory 'packages' [cypress-example-kitchensink](https://github.com/cypress-io/cypress-example-kitchensink), -which is used in `cypress.passthru.tests`. - -The app is not really intended for deployment, so I didn't bother with actual packaging, just testing. -If your real-world app looks like `cypress-example-kitchensink`, you'll want to use Nix multiple outputs so you don't deploy your test videos along with your app. -Alternatively, you can set it up so that one derivation builds your server exe and another derivation takes that server exe and runs it with the cypress e2e tests. - -## Peculiarities - -**cypress and Cypress** are distinct names. - - `cypress` is the npm module, containing the executable `cypress` - - whereas the executable `Cypress` comes from `pkgs.cypress`, a binary distribution (as of writing) by cypress.io. - -**updateScript** is not provided for this example project. This seems preferable, - because updates to it aren't particularly valuable and have a significant overhead. - The goal is to smoke test `cypress`; not run the latest test suite (which it isn't anyway). - -## Updating - - - update the hash in `src.nix` - - run `regen-nix` diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix deleted file mode 100644 index 20a946ac32..0000000000 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit callPackage; - inherit nodeEnv; -} diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix deleted file mode 100644 index a98493ab20..0000000000 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage -, cypress -, nodejs-14_x -, # FIXME: duplicated from ./regen-nix. node2nix should expose this - nodePackages -, xorg -, pkgs -, stdenv -, -}: - -let - fromNode2nix = import ./cypress-example-kitchensink.nix { - inherit pkgs; - }; - - nodeDependencies = fromNode2nix.shell.nodeDependencies.overrideAttrs (o: { - CYPRESS_INSTALL_BINARY = "0"; - PUPPETEER_SKIP_DOWNLOAD = "1"; - }); - - fontConfigEtc = ( - pkgs.nixos { config.fonts.fontconfig.enable = true; } - ).config.environment.etc.fonts.source; - -in -stdenv.mkDerivation { - name = "cypress-example-kitchensink"; - src = callPackage ./src.nix { }; - passthru.fc = fontConfigEtc; - nativeBuildInputs = [ - cypress - nodejs-14_x - xorg.xorgserver - nodePackages.jsonplaceholder - ]; - FONTCONFIG_PATH = fontConfigEtc; - postPatch = '' - # Use our own offline backend. 15011 means js0n ;) - sed -e 's^https://jsonplaceholder.cypress.io^http://localhost:15011^g' -i $(find . -type f) - ''; - buildPhase = '' - ln -s ${nodeDependencies}/lib/node_modules ./node_modules - PATH="${nodeDependencies}/bin:$PATH" - runHook preBuild - PORT=15011 jsonplaceholder & - # assumption: jsonplaceholder start far quicker than cypress run - - export CYPRESS_RUN_BINARY=${cypress}/bin/Cypress - export HOME=$PWD/home - mkdir $HOME - npm run test - runHook postBuild - ''; - installPhase = '' - mkdir $out - cp -r cypress/videos $out/ - ''; -} diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix deleted file mode 100644 index 2590dd267a..0000000000 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix +++ /dev/null @@ -1,598 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Patch the shebang lines of all the executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - patchShebangs "$file" - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell </dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -249,6 +251,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec steam ${extraArgs} "$@" ''; @@ -272,8 +277,7 @@ in buildFHSUserEnv rec { inherit multiPkgs profile extraInstallCommands; inherit unshareIpc unsharePid; - runScript = writeScript "steam-run" '' - #!${runtimeShell} + runScript = writeShellScript "steam-run" '' run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 @@ -283,6 +287,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec -- "$run" "$@" ''; diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index f0ec6ab30f..0e5cf615a7 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.5.10"; + version = "4.5.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-vV0Ux1TWwDlgDzQyIalMRcktP3SYP2RPacTIY9VV0W8="; + hash = "sha256-wagguIz4g4DT5aCw6DzFHpHcDznGnkeyG588cSiTtds="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index 26dfcdcfe7..b1adf5b956 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -31,6 +31,8 @@ , warzone2100 , nixosTests +, gitUpdater + , withVideos ? false }: @@ -44,11 +46,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-PDy5mIYAoQ9VAJCTRMiBqUlRtKIqVHiMuBiozTtH5Z4="; + sha256 = "sha256-l4QAF+mTaWi/BNPizqpTPw0KdcrYjw71K+D325/BKdo="; }; buildInputs = [ @@ -115,6 +117,10 @@ stdenv.mkDerivation rec { nixosTest = nixosTests.warzone2100; }; + passthru.updateScript = gitUpdater { + url = "https://github.com/Warzone2100/warzone2100"; + }; + meta = with lib; { description = "A free RTS game, originally developed by Pumpkin Studios"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/games/xgalaga++/default.nix b/third_party/nixpkgs/pkgs/games/xgalaga++/default.nix new file mode 100644 index 0000000000..ba78e28644 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/xgalaga++/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, libX11 +, libXpm +}: + +stdenv.mkDerivation rec { + pname = "xgalaga++"; + version = "0.9"; + src = fetchurl { + url = "https://marc.mongenet.ch/OSS/XGalaga/xgalaga++_${version}.tar.gz"; + sha256 = "sha256-yNtLuYCMHLvQAVM7CDGPardrh3q27TE9l31qhUbMf8k="; + }; + + buildInputs = [ + libX11 + libXpm + ]; + + buildPhase = '' + make all HIGH_SCORES_FILE=.xgalaga++.scores + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/man + mv xgalaga++ $out/bin + mv xgalaga++.6x $out/share/man + ''; + + meta = with lib; { + homepage = "https://marc.mongenet.ch/OSS/XGalaga/"; + description = "XGalaga++ is a classic single screen vertical shoot ’em up. It is inspired by XGalaga and reuses most of its sprites."; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix index f5a104fd08..7cdf66377d 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/gutenprint/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; - nativeBuildInputs = [ makeWrapper pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper pkg-config ] + ++ lib.optional cupsSupport cups; # for cups-config buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index f55d2d2cf2..38b7ee476d 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "8.1.0"; + version = "8.1.2"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-4RynQS3Y+Aa93hYWyvZSkAq2teUKJhqAn8NSvnEEdzE="; + hash = "sha256-M/2ShE1lmT7DLUSANt+JVGUPhXoXkIyachtfXpbu5MU="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix index 6444c7f0e0..e085269054 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "karabiner-elements"; - version = "14.8.0"; + version = "14.11.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${version}/Karabiner-Elements-${version}.dmg"; - sha256 = "sha256-sQJgK3EoJf8wcr0iL9iZXl6NJArptUDTrDeNKwgEfuM="; + sha256 = "sha256-InuSfXbaSYsncq8jVO15LbQmDTguRHlOiE/Pj5EfX5c="; }; outputs = [ "out" "driver" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix new file mode 100644 index 0000000000..ea635312d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/raycast/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: + +stdenvNoCC.mkDerivation rec { + pname = "raycast"; + version = "1.49.0"; + + src = fetchurl { + # https://github.com/NixOS/nixpkgs/pull/223495 + # official download API: https://api.raycast.app/v2/download + # this returns an AWS CloudFront signed URL with expiration timestamp and signature + # the returned URL will always be the latest Raycast which might result in an impure derivation + # the package maintainer created a repo (https://github.com/stepbrobd/raycast-overlay) + # to host GitHub Actions to periodically check for updates + # and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast) + url = "https://archive.org/download/raycast/raycast-${version}.dmg"; + sha256 = "sha256-6j5PyzJ7g3p+5gE2CQHlZrLj5b3rLdpodl+By7xxcjo="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "Raycast.app"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications/Raycast.app + cp -R . $out/Applications/Raycast.app + + runHook postInstall + ''; + + meta = with lib; { + description = "Control your tools with a few keystrokes"; + homepage = "https://raycast.app/"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ lovesegfault stepbrobd ]; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index faa98ee8fe..bee04112ad 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -966,7 +966,7 @@ let FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; - ANDROID = { optional = true; tristate = whenAtLeast "5.0" "y";}; + ANDROID = { optional = true; tristate = whenBetween "5.0" "5.19" "y";}; ANDROID_BINDER_IPC = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";}; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 4d4a704e21..c3c149aea1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/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.2.7"; #zen + version = "6.2.9"; #zen suffix = "zen1"; #zen - sha256 = "1giy45ndzs4pfvwlc1p8zb7qci86ampbjwl93jwxcdn76k8gygzh"; #zen + sha256 = "0s4s36pr1h6q0qnf0bnk6in3aah5yj0f29akf4ci9m3jndbwk7f2"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.2.7"; #lqx + version = "6.2.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "0dk79cglqrbsmlz9vimd714km5v717r1066r4bas20r3gi0zlzhi"; #lqx + sha256 = "1rw85gallk7r15adrvi8597zwkib2qsq9ir2lg7v2ivk85mivbq9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh index 1cf1400f99..2ca74fb5f0 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup unpackManually() { skip=$(sed 's/^skip=//; t; d' $src) - tail -n +$skip $src | xz -d | tar xvf - + tail -n +$skip $src | bsdtar xvf - sourceRoot=. } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 55c18e869f..15a3c9e6c1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -33,19 +33,19 @@ rec { }; latest = selectHighestVersion production (generic { - version = "520.56.06"; - sha256_64bit = "sha256-UWdLAL7Wdm7EPUHKhNGNaTkGI0+FUZBptqNB92wRPEY="; - openSha256 = "sha256-miIxF/0fA7v8fU+oh/mx0DRqJdPBzmz14IqgPWJQeKU="; - settingsSha256 = "sha256-NeT3tb7NGicKHnNkuOwbte6BJsP1bUzPSE+TXnevCAM="; - persistencedSha256 = "sha256-3nWtnwpLaal3ty8GNMFa4zeonT8nKpYs6DIgsAq9+84="; + version = "530.41.03"; + sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE="; + openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g="; + settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; + persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; }); beta = selectHighestVersion latest (generic { - version = "525.53"; - sha256_64bit = "sha256-dLsJcfBPHd3TxGQciRcG+5bo3lLiL2B55Q3nbTpRaH8="; - openSha256 = "sha256-XA5RY+dQZv+dTHF7rm/bXnPZLj1G75PJKSTfREpuKag="; - settingsSha256 = "sha256-N3+EOm2D2NSmD/cai+Pm2z5WHmV+GEJVr9KTQv/7j88="; - persistencedSha256 = "sha256-AhB6zetbejQzajg76+hqpbfv3OzftueXGpviepH/xss="; + version = "530.30.02"; + sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM="; + openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk="; + settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo="; + persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E="; }); # Vulkan developer beta driver diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index e56318deca..b76e64232b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -20,7 +20,7 @@ }@args: { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl -, kernel ? null, perl, nukeReferences, which +, kernel ? null, perl, nukeReferences, which, libarchive , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -98,8 +98,7 @@ let libPath = libPathFor pkgs; libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); - buildInputs = [ which ]; - nativeBuildInputs = [ perl nukeReferences ] + nativeBuildInputs = [ perl nukeReferences which libarchive ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; disallowedReferences = optionals (!libsOnly) [ kernel.dev ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index b0769f70ca..b800e2ee98 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,28 +1,39 @@ -{ stdenv -, lib +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, bbe , makeWrapper , p7zip -, gawk -, util-linux -, xorg -, glib -, dbus-glib -, zlib -, bbe -, bash -, timetrap -, netcat -, cups -, kernel ? null -, libsOnly ? false -, fetchurl -, undmg , perl -, autoPatchelfHook +, undmg +, dbus-glib +, glib +, xorg +, zlib +, kernel +, bash +, cups +, gawk +, netcat +, timetrap +, util-linux }: -assert (!libsOnly) -> kernel != null; +let + kernelVersion = kernel.modDirVersion; + kernelDir = "${kernel.dev}/lib/modules/${kernelVersion}"; + libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; + scriptPath = lib.concatStringsSep ":" [ + "${bash}/bin" + "${cups}/sbin" + "${gawk}/bin" + "${netcat}/bin" + "${timetrap}/bin" + "${util-linux}/bin" + ]; +in stdenv.mkDerivation rec { version = "18.2.0-53488"; pname = "prl-tools"; @@ -36,124 +47,132 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; - nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] - ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ + autoPatchelfHook + bbe + makeWrapper + p7zip + perl + undmg + ] ++ kernel.moduleBuildDependencies; - buildInputs = with xorg; [ libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]; + buildInputs = [ + dbus-glib + glib + xorg.libX11 + xorg.libXcomposite + xorg.libXext + xorg.libXrandr + xorg.libXi + xorg.libXinerama + zlib + ]; - runtimeDependencies = [ glib xorg.libXrandr ]; - - inherit libsOnly; + runtimeDependencies = [ + glib + xorg.libXrandr + ]; unpackPhase = '' + runHook preUnpack + undmg $src export sourceRoot=prl-tools-build 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot - if test -z "$libsOnly"; then - ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) - fi + ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) + + runHook postUnpack ''; - kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; - kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; - - libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; - - scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ - "${util-linux}/bin" - "${gawk}/bin" - "${bash}/bin" - "${timetrap}/bin" - "${netcat}/bin" - "${cups}/sbin" - ]); + env.NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast kernelVersion "6.3") "-Wno-incompatible-pointer-types"; buildPhase = '' - if test -z "$libsOnly"; then - ( # kernel modules - cd kmods - make -f Makefile.kmods \ - KSRC=$kernelDir/source \ - HEADERS_CHECK_DIR=$kernelDir/source \ - KERNEL_DIR=$kernelDir/build \ - SRC=$kernelDir/build \ - KVER=$kernelVersion - ) - fi + runHook preBuild + + ( # kernel modules + cd kmods + make -f Makefile.kmods \ + KSRC=${kernelDir}/source \ + HEADERS_CHECK_DIR=${kernelDir}/source \ + KERNEL_DIR=${kernelDir}/build \ + SRC=${kernelDir}/build \ + KVER=${kernelVersion} + ) + + runHook postBuild ''; installPhase = '' - if test -z "$libsOnly"; then - ( # kernel modules - cd kmods - mkdir -p $out/lib/modules/${kernelVersion}/extra - cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra - cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra - cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra - ${lib.optionalString stdenv.isAarch64 - "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} - ) - fi + runHook preInstall + + ( # kernel modules + cd kmods + mkdir -p $out/lib/modules/${kernelVersion}/extra + cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra + cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra + cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra + ${lib.optionalString stdenv.isAarch64 + "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} + ) ( # tools cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} mkdir -p $out/lib - if test -z "$libsOnly"; then - # prltoolsd contains hardcoded /bin/bash path - # we're lucky because it uses only -c command - # => replace to /bin/sh - bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd - rm -f bin/prltoolsd - mv bin/prltoolsd.tmp bin/prltoolsd + # prltoolsd contains hardcoded /bin/bash path + # we're lucky because it uses only -c command + # => replace to /bin/sh + bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd + rm -f bin/prltoolsd + mv bin/prltoolsd.tmp bin/prltoolsd - # install binaries - for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do - # also patch binaries to replace /usr/bin/XXX to XXX - # here a two possible cases: - # 1. it is uses as null terminated string and should be truncated by null; - # 2. it is uses inside shell script and should be truncated by space. - for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do - p=$(basename $p) - bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i - bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp - bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i - bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp - done - - install -Dm755 $i $out/$i + # install binaries + for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do + # also patch binaries to replace /usr/bin/XXX to XXX + # here a two possible cases: + # 1. it is uses as null terminated string and should be truncated by null; + # 2. it is uses inside shell script and should be truncated by space. + for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do + p=$(basename $p) + bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp + bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp done - install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd - for f in $out/bin/* $out/sbin/*; do - wrapProgram $f \ - --prefix LD_LIBRARY_PATH ':' "$libPath" \ - --prefix PATH ':' "$scriptPath" - done + install -Dm755 $i $out/$i + done - for i in lib/libPrl*.0.0; do - cp $i $out/lib - ln -s $out/$i $out/''${i%.0.0} - done + install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + for f in $out/bin/* $out/sbin/*; do + wrapProgram $f \ + --prefix LD_LIBRARY_PATH ':' "${libPath}" \ + --prefix PATH ':' "${scriptPath}" + done - mkdir -p $out/share/man/man8 - install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 + for i in lib/libPrl*.0.0; do + cp $i $out/lib + ln -s $out/$i $out/''${i%.0.0} + done - substituteInPlace ../99prltoolsd-hibernate \ - --replace "/bin/bash" "${bash}/bin/bash" + mkdir -p $out/share/man/man8 + install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 - mkdir -p $out/etc/pm/sleep.d - install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d - fi + substituteInPlace ../99prltoolsd-hibernate \ + --replace "/bin/bash" "${bash}/bin/bash" + + mkdir -p $out/etc/pm/sleep.d + install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d ) + + runHook postInstall ''; meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; - platforms = platforms.linux; license = licenses.unfree; maintainers = with maintainers; [ catap wegank ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 750586ff1b..8655bd2ed3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -210,7 +210,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin raitobezarius ]; + maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. diff --git a/third_party/nixpkgs/pkgs/servers/authelia/default.nix b/third_party/nixpkgs/pkgs/servers/authelia/default.nix index 3e71fc7765..4a2ed9bd57 100644 --- a/third_party/nixpkgs/pkgs/servers/authelia/default.nix +++ b/third_party/nixpkgs/pkgs/servers/authelia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, callPackage, nixosTests }: let inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version src vendorHash; @@ -56,6 +56,7 @@ buildGoModule rec { # if overriding replace the postPatch to put your web UI output in internal/server/public_html inherit web; updateScript = ./update.sh; + tests = { inherit (nixosTests) authelia; }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/honk/default.nix b/third_party/nixpkgs/pkgs/servers/honk/default.nix index 913b607ac8..cdcc0ddb63 100644 --- a/third_party/nixpkgs/pkgs/servers/honk/default.nix +++ b/third_party/nixpkgs/pkgs/servers/honk/default.nix @@ -2,11 +2,11 @@ buildGoModule rec { pname = "honk"; - version = "0.9.8"; + version = "0.9.91"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - sha256 = "0vh8y1aj2w0y2zxmybhik4iv7myyldfzkd75nzgmlz3vycr60rh6"; + hash = "sha256-+NFWTTMVdngWsC8/EIN2xJC/5C4naaAekk/YoA17wFk="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index fa20e46055..11d97faaaf 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.55"; + version = "2.4.56"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-Eda6GeNsC5PKYuR+b/wtLyiElCaUvODyPznHG9xfaaw="; + sha256 = "sha256-2NRfE5i6hO3QW7M8p1k6wpibF8ucegyv5UQtQa/bLXw="; }; # FIXME: -dev depends on -doc diff --git a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix index d78a4cc74c..e867b79fff 100644 --- a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix @@ -14,12 +14,12 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - sha256 = "sha256-wsfbG4VAS3U3voDdry35QlWknlWIfThZQalf9S/9GO0="; + sha256 = "sha256-OB44/6ha72882SzaMpotchU8RrU10rvUL58sCiCKcok="; }; vendorSha256 = "sha256-8g3jhxKIT0EGUXh0hrvDbw3i04khqlAfGzM6k4q3O8g="; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 004aa72c7c..440c9c6751 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3670"; + version = "0.20.3689"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-n+dZ5YsluZK45QCHcc2leFwfBEUXHvlAC9LBni5L+lDmNVNkH4Qz+nbJHOiK/WNeTn6aAUADhGk6vUJoaFUqEQ=="; + hash = "sha512-nsbzTR748vyojwju8ydXTNqgXaMPC2jLCLWPh0kVxzi2M0mG5hk6z1GSWIkfUPk6CogAWlfyFmyY/iMONgXQdw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index 22a3f982ca..046ad48145 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule +{ lib, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: @@ -24,7 +24,6 @@ buildGoModule rec { buildInputs = [ ffmpeg gnutls ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Official Go implementation of the Livepeer protocol"; homepage = "https://livepeer.org"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix index 5c1a1e3d98..3e1632860b 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/gemset.nix @@ -353,15 +353,14 @@ version = "1.0.0"; }; blurhash = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rs61mwdiyriq8mb8na2sfrqzz8igls04md63ajyhk4yj8d2j0sz"; + sha256 = "057afgqy73n8vm7k3cr4pbwm1hhqnm58lp4x7bgm5wzbs39m7xf8"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; bootsnap = { dependencies = ["msgpack"]; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix index b51afb602c..eced26d6f8 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/source.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/source.nix @@ -1,5 +1,5 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchgit, applyPatches }: let +{ fetchgit, applyPatches, fetchpatch }: let src = fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v4.1.1"; @@ -7,5 +7,10 @@ }; in applyPatches { inherit src; - patches = []; + patches = [ + (fetchpatch { + url = "https://github.com/mastodon/mastodon/commit/e7b81d7d9625893b1323e12215a2a98c0f19f58f.patch"; + hash = "sha256-cF0wtbjTNbsyqHb3uy5zYFaACIcziJ2ulJpOT5VoDO0="; + }) + ]; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 3e9fadea76..0061fa71e6 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.79.0"; + version = "1.80.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-2MHP4Gu+C5yyXObbd7NLYWCy1E0L7fUwpzYsoD7ULDo="; + hash = "sha256-Lw6gmuI+ntOW54HQbmDoY9QYNDTu5vgtrJz6HMWWmMM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yDKs6KRStjJMC/48dZcyQ4OmBXY1TombjH/ZDfBJbSc="; + hash = "sha256-KqPpaIJ8VuVV6f6n14/7wbA+Vtk7NvWm09bUBWuAAlY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index aa7e413601..037f5f81f5 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.18"; + version = "1.6.19"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-y91quIEGSaxdkvzQ/LDKkx2Knb0K2MxXW0ciLu3WQVg="; + sha256 = "sha256-L9SLBHFGOYsHOliOl5F9m8kIzlGXhYDY4L7aoSO0xw0="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index d66397c761..e03bd66711 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2023-03-13T19-46-17Z"; + version = "2023-03-24T21-41-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-dv1u/D0tU1PD6YfrDFICIC1S0Y4xgNcwYSTl9rJlufs="; + sha256 = "sha256-n42At76bE0LQUiGeW4a9KeVcqVJ+pD9t2WGlUbwZ0Tg="; }; - vendorHash = "sha256-iBgvfnXQnh5ZV8QsK6nK6hiHVB7l+ui7tVTGfa/Vuhc="; + vendorHash = "sha256-OFHifFSsyKIpiffxgVxF538AFBUrJrrcwkqkYyArY7o="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/notify_push.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/notify_push.nix index b6f916f182..63bce5c025 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/notify_push.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/notify_push.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "notify_push"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-DGWdVsKA8Y1r+/n+vPkRmFt1EAwPYDmFiUcyWZrXeRM="; + hash = "sha256-YCIXpCNKqdCSvq7CSPSwoPc2gpCnnda8S7I4FzpezMc="; }; - cargoHash = "sha256-H0rkY3hQaOBP8Cai22ppQpZJS1vyFx5uo4k9Paa2yS0="; + cargoHash = "sha256-l6gMz/iJeLl+RLjOiR9U1m6V/rK+RWM84bQiz4jCFtY="; passthru = { test_client = rustPlatform.buildRustPackage { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; - cargoHash = "sha256-a8KcWnHr1bCS255ChOC6piXfVo/nJy/yVHNLCuHXoq4="; + cargoHash = "sha256-4jQvlxU3S3twTpiLab8BXC6ZSPSWN6ftK3GzfKnjHSE="; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json index 018bdb00b1..9933a8e436 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1gf1gn8n85dya47y286hwknms2pj0lhgj09c29gkzgzb4wipa3ww", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.5/calendar-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "1cb3rjqgjysmirfvda4fqyr24ljh1203bzygmzzm9n26ji72636f", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v3.5.6/calendar-v3.5.6.tar.gz", + "version": "3.5.6", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -90,9 +90,9 @@ ] }, "keeweb": { - "sha256": "a3281fcfdb4058971a3b5c838870a8d5b533445c999b8e921fb8758b216dadbc", - "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz", - "version": "0.6.10", + "sha256": "19wzp588p3a87bi7ajn2r8jmsjjzzc1g8bkpwkidv66gi87gv9sr", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.12/keeweb-0.6.12.tar.gz", + "version": "0.6.12", "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ @@ -100,9 +100,9 @@ ] }, "mail": { - "sha256": "1agpdxf8lnsdxpk1nmypxam5p8i8xiyzsyb34cv2lksd2ziirmp5", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.2/mail-v1.15.2.tar.gz", - "version": "1.15.2", + "sha256": "1a697wf2lq596dk04acd6qpmx9immh6v8npj0kf43m31kc3hm0rs", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v1.15.3/mail-v1.15.3.tar.gz", + "version": "1.15.3", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "026ggjf6dqbjv8hnj6jj1nnqz0256ck2yg13zhln7zc84lhfzlfd", - "url": "https://github.com/nextcloud/news/releases/download/21.1.0/news.tar.gz", - "version": "21.1.0", + "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", + "version": "21.2.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -130,9 +130,9 @@ ] }, "notify_push": { - "sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz", - "version": "0.6.0", + "sha256": "1fz6wi5nb4c2w33vp9ry2mk4lmv7aa3axyfxzldf5w4glfzaymzw", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.2/notify_push-v0.6.2.tar.gz", + "version": "0.6.2", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -159,6 +159,16 @@ "agpl" ] }, + "previewgenerator": { + "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", + "version": "5.2.1", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, "registration": { "sha256": "0m45limwsk8a86fqjxj2w1753hd2vc5icpv0wcbwrlr0mxxdc46f", "url": "https://github.com/nextcloud-releases/registration/releases/download/v1.5.0/registration-v1.5.0.tar.gz", @@ -170,9 +180,9 @@ ] }, "spreed": { - "sha256": "1wih7gr2dxl69fdvarkgnxcwq47vbhwdmdvs8h70pqwrgss950hs", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.9/spreed-v14.0.9.tar.gz", - "version": "14.0.9", + "sha256": "1r2n312kxx6ymlwrvqsj230x4zsg6im4xrss04zagiflvfljr5da", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.10/spreed-v14.0.10.tar.gz", + "version": "14.0.10", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json index 653807333b..00136197cd 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "18jlj2g2b57ibcvqiw3pkkky4rr20xi5plyxl1xjn2bp9l3hng4y", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.0/calendar-v4.3.0.tar.gz", - "version": "4.3.0", + "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz", + "version": "4.3.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -80,9 +80,9 @@ ] }, "keeweb": { - "sha256": "1g6bjbzk7rf9x7cblwsc7cmd3fx5zrkib5ra5xzsmqc9aqpy22zh", - "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.10/keeweb-0.6.10.tar.gz", - "version": "0.6.10", + "sha256": "19wzp588p3a87bi7ajn2r8jmsjjzzc1g8bkpwkidv66gi87gv9sr", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.12/keeweb-0.6.12.tar.gz", + "version": "0.6.12", "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", "homepage": "https://github.com/jhass/nextcloud-keeweb", "licenses": [ @@ -90,9 +90,9 @@ ] }, "mail": { - "sha256": "0sk19y9iwnbw6ci4hq9xxrn5qgnlgqlb5hpzc50i706s1z5n9cmc", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.4/mail-v2.2.4.tar.gz", - "version": "2.2.4", + "sha256": "0w0v7w9v8pg8qm42x8azfqzwl5pdpn6j1klnbcjh0hw3x1rzns48", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.5/mail-v2.2.5.tar.gz", + "version": "2.2.5", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -100,9 +100,9 @@ ] }, "news": { - "sha256": "1i7avq4iliz8afrwc9hw7hb13g3223004b2dim7j77l3zsvkfq3h", - "url": "https://github.com/nextcloud/news/releases/download/21.1.0-beta1/news.tar.gz", - "version": "21.1.0-beta1", + "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", + "version": "21.2.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -110,19 +110,19 @@ ] }, "notes": { - "sha256": "1jcgv3awr45jq3n3qv851qlpbdl2plixba0iq2s54dmhciypdckl", - "url": "https://github.com/nextcloud/notes/releases/download/v4.6.0/notes.tar.gz", - "version": "4.6.0", - "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "sha256": "0klqf8dixrrb8yp8cc60ggnvhmqb3yh9f6y1281jn8ia5jml622v", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.7.2/notes.tar.gz", + "version": "4.7.2", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ "agpl" ] }, "notify_push": { - "sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz", - "version": "0.6.0", + "sha256": "1fz6wi5nb4c2w33vp9ry2mk4lmv7aa3axyfxzldf5w4glfzaymzw", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.2/notify_push-v0.6.2.tar.gz", + "version": "0.6.2", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -140,15 +140,25 @@ ] }, "polls": { - "sha256": "12298sspxp0ap61z2fjlgnd30fn0gl92xa5m6rnx2jb5i39lh9wr", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-beta4/polls.tar.gz", - "version": "5.0.0-beta4", + "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v", + "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz", + "version": "5.0.0-rc1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ "agpl" ] }, + "previewgenerator": { + "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", + "version": "5.2.1", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, "registration": { "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", @@ -160,10 +170,10 @@ ] }, "spreed": { - "sha256": "0pav5xcnj55vs04fm1fc2kpaz46k0rdlvv7xn6idwgh860anzp4g", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.4/spreed-v15.0.4.tar.gz", - "version": "15.0.4", - "description": "Chat, video & audio-conferencing using WebRTC\r\n\r\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\r\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\r\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\r\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\r\n\r\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\r\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", + "sha256": "1y78prkjgr1fk1miadbdjriq68nqspmfxd9q6cpbjr3aaq4jb541", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.5/spreed-v15.0.5.tar.gz", + "version": "15.0.5", + "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ "agpl" diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json index 8d4cae0295..aa98d791b0 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "18jlj2g2b57ibcvqiw3pkkky4rr20xi5plyxl1xjn2bp9l3hng4y", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.0/calendar-v4.3.0.tar.gz", - "version": "4.3.0", + "sha256": "1f116521c8mn2ihng20z94f1z3bj0fq4k5968a4nd9m7n0hi47wx", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.3.1/calendar-v4.3.1.tar.gz", + "version": "4.3.1", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -79,10 +79,20 @@ "agpl" ] }, + "keeweb": { + "sha256": "19wzp588p3a87bi7ajn2r8jmsjjzzc1g8bkpwkidv66gi87gv9sr", + "url": "https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.12/keeweb-0.6.12.tar.gz", + "version": "0.6.12", + "description": "Open Keepass stores inside Nextcloud with Keeweb just by clicking on an *.kdbx file in your Nextcloud.", + "homepage": "https://github.com/jhass/nextcloud-keeweb", + "licenses": [ + "agpl" + ] + }, "mail": { - "sha256": "0lx8s7bb0w7d5kvn0np2p4rjjpajbhxf55qqp8ixfjkdcn6gkkxj", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.0.0/mail-v3.0.0.tar.gz", - "version": "3.0.0", + "sha256": "0dz3macak3r3gqn4rxpkli2bmb284w3kywlfcra7gnkiqfivrf9v", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.0.3-beta1/mail-v3.0.3-beta1.tar.gz", + "version": "3.0.3-beta.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -90,9 +100,9 @@ ] }, "news": { - "sha256": "026ggjf6dqbjv8hnj6jj1nnqz0256ck2yg13zhln7zc84lhfzlfd", - "url": "https://github.com/nextcloud/news/releases/download/21.1.0/news.tar.gz", - "version": "21.1.0", + "sha256": "029rzfnqf2h37pw30hmclmvizz8v7r2sgqbs4gkp0kj0s6fx388z", + "url": "https://github.com/nextcloud/news/releases/download/21.2.0-beta1/news.tar.gz", + "version": "21.2.0-beta1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -100,9 +110,9 @@ ] }, "notes": { - "sha256": "19875sl3wpwnq2wrblfyyxhrp7hpqwazrnmz037yd1vf43crw03d", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.7.0/notes.tar.gz", - "version": "4.7.0", + "sha256": "0klqf8dixrrb8yp8cc60ggnvhmqb3yh9f6y1281jn8ia5jml622v", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.7.2/notes.tar.gz", + "version": "4.7.2", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -110,9 +120,9 @@ ] }, "notify_push": { - "sha256": "1vfa68spnyfivcx0vp49mimf5xg7hsxnifd06imd1c0mw3nlfm4p", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.0/notify_push-v0.6.0.tar.gz", - "version": "0.6.0", + "sha256": "1fz6wi5nb4c2w33vp9ry2mk4lmv7aa3axyfxzldf5w4glfzaymzw", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.2/notify_push-v0.6.2.tar.gz", + "version": "0.6.2", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -130,15 +140,25 @@ ] }, "polls": { - "sha256": "12298sspxp0ap61z2fjlgnd30fn0gl92xa5m6rnx2jb5i39lh9wr", - "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-beta4/polls.tar.gz", - "version": "5.0.0-beta4", + "sha256": "1hxbdygk5vqgqpdqmpss4pklcjb020a768cgz4l7hcm0g12idz9v", + "url": "https://github.com/nextcloud/polls/releases/download/v5.0.0-rc1/polls.tar.gz", + "version": "5.0.0-rc1", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ "agpl" ] }, + "previewgenerator": { + "sha256": "0652pbbdibc37nqzb897b9h7xs57liiv60m6n70pmv9yxx0jwll2", + "url": "https://github.com/nextcloud-releases/previewgenerator/releases/download/v5.2.1/previewgenerator-v5.2.1.tar.gz", + "version": "5.2.1", + "description": "The Preview Generator app allows admins to pre-generate previews. The app listens to edit events and stores this information. Once a cron job is triggered it will generate start preview generation. This means that you can better utilize your system by pre-generating previews when your system is normally idle and thus putting less load on your machine when the requests are actually served.\n\nThe app does not replace on demand preview generation so if a preview is requested before it is pre-generated it will still be shown.\nThe first time you install this app, before using a cron job, you properly want to generate all previews via:\n**./occ preview:generate-all -vvv**\n\n**Important**: To enable pre-generation of previews you must add **php /var/www/nextcloud/occ preview:pre-generate** to a system cron job that runs at times of your choosing.", + "homepage": "https://github.com/nextcloud/previewgenerator", + "licenses": [ + "agpl" + ] + }, "registration": { "sha256": "07dqc670qmdb3c8jjnj7azxxspjhiv6m9nrj960y3rjabyzy25m9", "url": "https://github.com/nextcloud-releases/registration/releases/download/v2.1.0/registration-v2.1.0.tar.gz", @@ -150,9 +170,9 @@ ] }, "spreed": { - "sha256": "0i5n47j8hvngfkiad88j5m37frp3bp4w5r7qaram5dvxmm2rkngc", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.0/spreed-v16.0.0.tar.gz", - "version": "16.0.0", + "sha256": "15wfbqfif2bnbgva57jkjadx3b7ypx51idcxr3xyn4mraijdll3d", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.2/spreed-v16.0.2.tar.gz", + "version": "16.0.2", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nc-versions.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nc-versions.nix index dd9be41d7f..06349531f2 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nc-versions.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nc-versions.nix @@ -2,7 +2,7 @@ # Licensed under: MIT # this file is used to figure out which versions of nextcloud we have in nixpkgs -{ pkgs ? import {}, lib ? pkgs.lib }: +{ pkgs ? import ../../../.. {}, lib ? pkgs.lib }: let n = lib.mapAttrsToList (_: v: v.version) ( lib.filterAttrs (k: v: builtins.match "nextcloud[0-9]+" k != null && (builtins.tryEval v.version).success) diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json index ba55e92332..86e0ac7ef9 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -15,6 +15,7 @@ , "notify_push" , "onlyoffice" , "polls" +, "previewgenerator" , "registration" , "spreed" , "tasks" diff --git a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix index b8711fa7a2..9960cc5c3c 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-UVRrCzgQdr86cc3jG+FSI/y3dxkHxoydMncXMgPMcz4="; + sha256 = "sha256-DdOZIK1y7WhKigd5u4JGErP53FCQSe3QCZMXIa4ah3I="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-pvRs+X8DbHeThJPZ3St+MzLrQBLHRtdkKSHjBax3V10="; + vendorSha256 = "sha256-Kmc/xWNrx62Ua87K5tif4s3jpWLbzTqNpw8j/3bYXr4="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix index aac66d1e42..424944f4e4 100644 --- a/third_party/nixpkgs/pkgs/servers/pleroma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pleroma/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages , fetchFromGitHub, fetchFromGitLab, fetchHex , file, cmake -, libxcrypt +, libxcrypt-legacy , nixosTests, writeText , ... }: @@ -165,7 +165,7 @@ beamPackages.mixRelease rec { crypt = let version = prev.crypt.version; in prev.crypt.override { - buildInputs = [ libxcrypt ]; + buildInputs = [ libxcrypt-legacy ]; postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{hex-source-crypt-${version},crypt}.so"; }; }); diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index fde3454dd3..ef8335c56c 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.1"; + version = "23.1.3"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-3IRhr+XQLZXCeKhUHOlE8REwUkxLw1jcHYIataG3BaM="; + sha256 = "sha256-tqQl7Elslcdw0hNjayYShj19KYmVskJG0qtaijGTzm0="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index bdc94c57bc..8685a92818 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.26.4"; + version = "2.27.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-BWjkdzAm9/bvPTjsdg+Vr+gr0fqzEvARmaySth95fsI="; + sha256 = "sha256-Br28cDw9XxXR0UA57oOQ+KwptAcPndH+XK2gFhuVOB4="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 38f3dfb96f..48b9484154 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -14,17 +14,28 @@ let , this, self, newScope, buildEnv # source specification - , version, hash, psqlSchema, + , version, hash, psqlSchema # for tests - nixosTests, thisAttr + , nixosTests, thisAttr + + # JIT + , jitSupport ? false + , nukeReferences, patchelf, llvmPackages + , makeRustPlatform, buildPgxExtension, rustPlatform + + # detection of crypt fails when using llvm stdenv, so we add it manually + # for <13 (where it got removed: https://github.com/postgres/postgres/commit/c45643d618e35ec2fe91438df15abd4f3c0d85ca) + , libxcrypt }: let atLeast = lib.versionAtLeast version; + olderThan = lib.versionOlder version; lz4Enabled = atLeast "14"; zstdEnabled = atLeast "15"; - in stdenv.mkDerivation rec { + stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; + in stdenv'.mkDerivation rec { pname = "postgresql"; inherit version; @@ -33,7 +44,7 @@ let inherit hash; }; - hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ @@ -45,18 +56,21 @@ let libxml2 icu ] + ++ lib.optionals (olderThan "13") [ libxcrypt ] + ++ lib.optionals jitSupport [ llvmPackages.llvm ] ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals zstdEnabled [ zstd ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals gssSupport [ libkrb5 ] - ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; + ++ lib.optionals (!stdenv'.isDarwin) [ libossp_uuid ]; nativeBuildInputs = [ makeWrapper pkg-config - ]; + ] + ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; - enableParallelBuilding = !stdenv.isDarwin; + enableParallelBuilding = !stdenv'.isDarwin; separateDebugInfo = true; @@ -65,7 +79,7 @@ let env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. - preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; + preConfigure = "CC=${stdenv'.cc.targetPrefix}cc"; configureFlags = [ "--with-openssl" @@ -76,11 +90,12 @@ let "--with-system-tzdata=${tzdata}/share/zoneinfo" "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") - (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") + (if stdenv'.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals lz4Enabled [ "--with-lz4" ] ++ lib.optionals zstdEnabled [ "--with-zstd" ] ++ lib.optionals gssSupport [ "--with-gssapi" ] - ++ lib.optionals stdenv.hostPlatform.isRiscV [ "--disable-spinlocks" ]; + ++ lib.optionals stdenv'.hostPlatform.isRiscV [ "--disable-spinlocks" ] + ++ lib.optionals jitSupport [ "--with-llvm" ]; patches = [ ./patches/disable-resolve_symlinks.patch @@ -88,7 +103,7 @@ let ./patches/hardcode-pgxs-path.patch ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch) ]; @@ -99,6 +114,11 @@ let postPatch = '' # Hardcode the path to pgxs so pg_config returns the path in $out substituteInPlace "src/common/config_info.c" --replace HARDCODED_PGXS_PATH "$out/lib" + '' + lib.optionalString jitSupport '' + # Force lookup of jit stuff in $out instead of $lib + substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\" + substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\" + substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\" ''; postInstall = @@ -109,27 +129,54 @@ let moveToOutput "lib/libecpg*" "$out" # Prevent a retained dependency on gcc-wrapper. - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld if [ -z "''${dontDisableStatic:-}" ]; then # Remove static libraries in case dynamic are available. for i in $out/lib/*.a $lib/lib/*.a; do name="$(basename "$i")" - ext="${stdenv.hostPlatform.extensions.sharedLibrary}" + ext="${stdenv'.hostPlatform.extensions.sharedLibrary}" if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then rm "$i" fi done fi + '' + lib.optionalString jitSupport '' + # Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that + # depends on libpq.so will also have libLLVM.so in its closure too, bloating it + moveToOutput "lib/bitcode" "$out" + moveToOutput "lib/llvmjit*" "$out" + + # In the case of JIT support, prevent a retained dependency on clang-wrapper + substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${self.llvmPackages.stdenv.cc}/bin/clang clang + nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) + + # Stop out depending on the default output of llvm + substituteInPlace $out/lib/pgxs/src/Makefile.global \ + --replace ${self.llvmPackages.llvm.out}/bin "" \ + --replace '$(LLVM_BINPATH)/' "" + + # Stop out depending on the -dev output of llvm + substituteInPlace $out/lib/pgxs/src/Makefile.global \ + --replace ${self.llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ + --replace -I${self.llvmPackages.llvm.dev}/include "" + + ${lib.optionalString (!stdenv'.isDarwin) '' + # Stop lib depending on the -dev output of llvm + rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) + nuke-refs -e $out $out/lib/llvmjit.so + # Restore the correct rpath + patchelf $out/lib/llvmjit.so --set-rpath "$rpath" + ''} ''; - postFixup = lib.optionalString (!stdenv.isDarwin && stdenv.hostPlatform.libc == "glibc") + postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") '' # initdb needs access to "locale" command from glibc. wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv'.isDarwin; # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; @@ -138,7 +185,7 @@ let # ! ERROR: could not load library "/build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by /build/postgresql-11.5/tmp_install/nix/store/...-postgresql-11.5-lib/lib/libpqwalreceiver.so) # See also here: # https://git.alpinelinux.org/aports/tree/main/postgresql/disable-broken-tests.patch?id=6d7d32c12e073a57a9e5946e55f4c1fbb68bd442 - if stdenv.hostPlatform.isMusl then '' + if stdenv'.hostPlatform.isMusl then '' substituteInPlace src/test/regress/parallel_schedule \ --replace "subscription" "" \ --replace "object_address" "" @@ -146,13 +193,32 @@ let doInstallCheck = false; # needs a running daemon? - disallowedReferences = [ stdenv.cc ]; + disallowedReferences = [ stdenv'.cc ]; - passthru = { - inherit readline psqlSchema; + passthru = let + jitToggle = this.override { + jitSupport = !jitSupport; + this = jitToggle; + }; + in + { + inherit readline psqlSchema jitSupport; + + withJIT = if jitSupport then this else jitToggle; + withoutJIT = if jitSupport then jitToggle else this; pkgs = let - scope = { postgresql = this; }; + scope = { + postgresql = this; + stdenv = stdenv'; + buildPgxExtension = buildPgxExtension.override { + stdenv = stdenv'; + rustPlatform = makeRustPlatform { + stdenv = stdenv'; + inherit (rustPlatform.rust) rustc cargo; + }; + }; + }; newSelf = self // scope; newSuper = { callPackage = newScope (scope // this.pkgs); }; in import ./packages.nix newSelf newSuper; @@ -163,15 +229,33 @@ let } this.pkgs; - tests.postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; + tests = { + postgresql = nixosTests.postgresql-wal-receiver.${thisAttr}; + } // lib.optionalAttrs jitSupport { + postgresql-jit = nixosTests.postgresql-jit.${thisAttr}; + }; + } // lib.optionalAttrs jitSupport { + inherit (llvmPackages) llvm; }; meta = with lib; { homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; - maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ]; + maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; platforms = platforms.unix; + + # JIT support doesn't work with cross-compilation. It is attempted to build LLVM-bytecode + # (`%.bc` is the corresponding `make(1)`-rule) for each sub-directory in `backend/` for + # the JIT apparently, but with a $(CLANG) that can produce binaries for the build, not the + # host-platform. + # + # I managed to get a cross-build with JIT support working with + # `depsBuildBuild = [ llvmPackages.clang ] ++ buildInputs`, but considering that the + # resulting LLVM IR isn't platform-independent this doesn't give you much. + # In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize + # a query, postgres would coredump with `Illegal instruction`. + broken = jitSupport && (stdenv.hostPlatform != stdenv.buildPlatform); }; }; @@ -204,50 +288,60 @@ let passthru.psqlSchema = postgresql.psqlSchema; }; -in self: { + mkPackages = self: { + postgresql_11 = self.callPackage generic { + version = "11.19"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive + hash = "sha256-ExCeK3HxE5QFwnIB2jczphrOcu4cIo2cnwMg4GruFMI="; + this = self.postgresql_11; + thisAttr = "postgresql_11"; + inherit self; + }; - postgresql_11 = self.callPackage generic { - version = "11.19"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-ExCeK3HxE5QFwnIB2jczphrOcu4cIo2cnwMg4GruFMI="; - this = self.postgresql_11; - thisAttr = "postgresql_11"; - inherit self; + postgresql_12 = self.callPackage generic { + version = "12.14"; + psqlSchema = "12"; + hash = "sha256-eFYQI304LIQtNW40cTjljAb/6uJA5swLUqxevMMNBD4="; + this = self.postgresql_12; + thisAttr = "postgresql_12"; + inherit self; + }; + + postgresql_13 = self.callPackage generic { + version = "13.10"; + psqlSchema = "13"; + hash = "sha256-W7z1pW2FxE86iwWPtGhi/0nLyRg00H4pXQLm3jwhbfI="; + this = self.postgresql_13; + thisAttr = "postgresql_13"; + inherit self; + }; + + postgresql_14 = self.callPackage generic { + version = "14.7"; + psqlSchema = "14"; + hash = "sha256-zvYPAJj6gQHBVG9CVORbcir1QxM3lFs3ryBwB2MNszE="; + this = self.postgresql_14; + thisAttr = "postgresql_14"; + inherit self; + }; + + postgresql_15 = self.callPackage generic { + version = "15.2"; + psqlSchema = "15"; + hash = "sha256-maIXH8PWtbX1a3V6ejy4XVCaOOQnOAXe8jlB7SuEaMc="; + this = self.postgresql_15; + thisAttr = "postgresql_15"; + inherit self; + }; }; - postgresql_12 = self.callPackage generic { - version = "12.14"; - psqlSchema = "12"; - hash = "sha256-eFYQI304LIQtNW40cTjljAb/6uJA5swLUqxevMMNBD4="; - this = self.postgresql_12; - thisAttr = "postgresql_12"; - inherit self; - }; - - postgresql_13 = self.callPackage generic { - version = "13.10"; - psqlSchema = "13"; - hash = "sha256-W7z1pW2FxE86iwWPtGhi/0nLyRg00H4pXQLm3jwhbfI="; - this = self.postgresql_13; - thisAttr = "postgresql_13"; - inherit self; - }; - - postgresql_14 = self.callPackage generic { - version = "14.7"; - psqlSchema = "14"; - hash = "sha256-zvYPAJj6gQHBVG9CVORbcir1QxM3lFs3ryBwB2MNszE="; - this = self.postgresql_14; - thisAttr = "postgresql_14"; - inherit self; - }; - - postgresql_15 = self.callPackage generic { - version = "15.2"; - psqlSchema = "15"; - hash = "sha256-maIXH8PWtbX1a3V6ejy4XVCaOOQnOAXe8jlB7SuEaMc="; - this = self.postgresql_15; - thisAttr = "postgresql_15"; - inherit self; - }; -} +in self: + let packages = mkPackages self; in + packages + // self.lib.mapAttrs' + (attrName: postgres: self.lib.nameValuePair "${attrName}_jit" (postgres.override rec { + jitSupport = true; + thisAttr = "${attrName}_jit"; + this = self.${thisAttr}; + })) + packages diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 931a5deb40..be743401f2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -138,5 +138,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ marsam ]; platforms = [ "x86_64-linux" ]; license = licenses.postgresql; + broken = postgresql.jitSupport; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index 154cdf0c5a..18ac6bfc2a 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ perl pkg-config ]; + nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm; dontDisableStatic = true; # postgis config directory assumes /include /lib from the same root for json-c library diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json index 7f7abbdb4a..5ba480ea5c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.17.1", + "version": "0.17.2", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -17,13 +17,13 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@babel/plugin-proposal-decorators": "^7.20.13", - "@babel/plugin-transform-runtime": "^7.19.6", - "@babel/plugin-transform-typescript": "^7.20.13", + "@babel/plugin-proposal-decorators": "^7.21.0", + "@babel/plugin-transform-runtime": "^7.21.0", + "@babel/plugin-transform-typescript": "^7.21.0", "@babel/preset-env": "7.20.2", - "@babel/preset-typescript": "^7.18.6", - "@babel/runtime": "^7.20.13", - "autosize": "^5.0.2", + "@babel/preset-typescript": "^7.21.0", + "@babel/runtime": "^7.21.0", + "autosize": "^6.0.1", "babel-loader": "^9.1.2", "babel-plugin-inferno": "^6.6.0", "check-password-strength": "^2.0.7", @@ -34,18 +34,18 @@ "css-loader": "^6.7.3", "emoji-short-name": "^2.0.0", "express": "~4.18.2", - "html-to-text": "^9.0.3", - "i18next": "^22.4.9", - "inferno": "^8.0.5", - "inferno-create-element": "^8.0.5", + "html-to-text": "^9.0.4", + "i18next": "^22.4.10", + "inferno": "^8.0.6", + "inferno-create-element": "^8.0.6", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.0.5", + "inferno-hydrate": "^8.0.6", "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.0.5", - "inferno-server": "^8.0.5", + "inferno-router": "^8.0.6", + "inferno-server": "^8.0.6", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "lemmy-js-client": "0.17.0-rc.62", + "lemmy-js-client": "0.17.2-rc.1", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-footnote": "^3.0.3", @@ -58,8 +58,8 @@ "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", "rxjs": "^7.8.0", - "sanitize-html": "^2.8.1", - "sass": "^1.57.1", + "sanitize-html": "^2.10.0", + "sass": "^1.58.3", "sass-loader": "^13.2.0", "serialize-javascript": "^6.0.1", "tippy.js": "^6.3.7", @@ -71,35 +71,35 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.20.12", + "@babel/core": "^7.21.0", "@types/autosize": "^4.0.0", - "@types/express": "^4.17.16", + "@types/express": "^4.17.17", "@types/html-to-text": "^9.0.0", "@types/markdown-it": "^12.2.3", "@types/markdown-it-container": "^2.0.5", - "@types/node": "^18.11.18", + "@types/node": "^18.14.0", "@types/node-fetch": "^2.6.2", "@types/sanitize-html": "^2.8.0", "@types/serialize-javascript": "^5.0.1", "@types/toastify-js": "^1.11.1", - "@typescript-eslint/eslint-plugin": "^5.49.0", - "@typescript-eslint/parser": "^5.49.0", + "@typescript-eslint/eslint-plugin": "^5.53.0", + "@typescript-eslint/parser": "^5.53.0", "bootstrap": "^5.2.3", "bootswatch": "^5.2.3", - "eslint": "^8.33.0", + "eslint": "^8.34.0", "eslint-plugin-inferno": "^7.32.1", "eslint-plugin-prettier": "^4.2.1", "husky": "^8.0.3", "import-sort-style-module": "^6.0.0", - "lint-staged": "^13.1.0", - "prettier": "^2.8.3", + "lint-staged": "^13.1.2", + "prettier": "^2.8.4", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^3.2.2", - "prettier-plugin-packagejson": "^2.4.2", + "prettier-plugin-packagejson": "^2.4.3", "rimraf": "^4.1.2", "sortpack": "^2.3.3", "style-loader": "^3.3.1", - "terser": "^5.16.2", + "terser": "^5.16.4", "typescript": "^4.9.5", "webpack-dev-server": "4.11.1" }, diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json index 05960e6296..b2a1f1923c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.17.1", - "serverSha256": "sha256-2pSa3IvmEoZbDS3U0yvZfocpgmoHJKm6n2ggPCCXtxY=", - "serverCargoSha256": "sha256-uVqRuOSr5Smjpe/HUhIebrBaxJNdMOzHrtQkzTKsLC8=", - "uiSha256": "sha256-JehU0Bk0S1qjYRlQSQzQOYSLUScDAAbKp8O9zH40XRc=", - "uiYarnDepsSha256": "sha256-AeY6k1qkubTefUofq9ISzXq3huNWHoSpQFFRgCMdFhQ=" + "version": "0.17.2", + "serverSha256": "sha256-fkpMVm52XLyrk9RfzJpthT8fctIilawAIgfK+4TXHvU=", + "serverCargoSha256": "sha256-AC6EP612uaeGfqHbrHrz89h0tsNlMceEg6GxEsm1QMA=", + "uiSha256": "sha256-0Zhm6Jgc6rlN4c7ryRnR45+fZEdzQhuOXSwU8Wz0D5g=", + "uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw=" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh index 2df3f9e88d..a2657025a0 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh @@ -14,7 +14,7 @@ const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${server_repo jq -r '.tag_name') const latest_version = $(echo $latest_rev) const current_version = $(jq -r '.version' $directory/pin.json) -if ($latest_version === $current_version) { +if (latest_version === $current_version) { echo "lemmy is already up-to-date" return 0 } else { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index a30ceae722..aeeb57fa37 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -8,10 +8,10 @@ , plugins ? ps: [] }: let - py = python3.override { - packageOverrides = self: super: { + py = python3 // { + pkgs = python3.pkgs.overrideScope (self: super: { django = super.django_4; - }; + }); }; extraBuildInputs = plugins py.pkgs; diff --git a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix index f68c9f34ea..55729655a2 100644 --- a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-ZffVc/nLWaiUhg0DcLfDTiGVuK0MCSOpBd2gVG2rT0c="; + sha256 = "sha256-rC/MS4YNzeqrXExfNGsPLHWvqOxypoeELzwoy+57HXo="; }; - vendorHash = "sha256-FUTyTdGqdzuObpYW1ZSnhj24+MJiYG1NmSU4BZ6SlHM="; + vendorHash = "sha256-ZWgqp8UlpBHDYORSnWDuwB7DQQFUG4FAF/kUpR9LA6w="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/wsdd/default.nix b/third_party/nixpkgs/pkgs/servers/wsdd/default.nix index a0a8421a7c..8e1f61dc5d 100644 --- a/third_party/nixpkgs/pkgs/servers/wsdd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/wsdd/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, nixosTests, python3 }: stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9cwzkF2mg6yOIsurLMXTLoEIOsKbPIWMicpWBQ0XVhE="; + hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o="; }; - nativeBuildInputs = [ makeWrapper ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ python3 ]; @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -Dm0755 src/wsdd.py $out/bin/wsdd + install -Dm0555 src/wsdd.py $out/bin/wsdd + installManPage man/wsdd.8 wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH" ''; diff --git a/third_party/nixpkgs/pkgs/shells/carapace/default.nix b/third_party/nixpkgs/pkgs/shells/carapace/default.nix index 2db3697f1a..b740851590 100644 --- a/third_party/nixpkgs/pkgs/shells/carapace/default.nix +++ b/third_party/nixpkgs/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-G6tpPkB31nHdMzmHNp2w85rp0O08/ynrirWJTqVSmjE="; + sha256 = "sha256-5T2bw07bkhEmlJa8Qw+USreY3MtGRHIUVrHLJOMk824="; }; - vendorHash = "sha256-mz03GysUI64RiAChgIjyKORcW+WRbYIxbdICDBQGoBk="; + vendorHash = "sha256-s8U0ERAb/qLwen8ABfeZ21HLTgHWvHaYHazztSeP87c="; subPackages = [ "./cmd/carapace" ]; diff --git a/third_party/nixpkgs/pkgs/shells/dash/default.nix b/third_party/nixpkgs/pkgs/shells/dash/default.nix index e6113c0d76..ff4656f665 100644 --- a/third_party/nixpkgs/pkgs/shells/dash/default.nix +++ b/third_party/nixpkgs/pkgs/shells/dash/default.nix @@ -1,10 +1,8 @@ { lib , stdenv , buildPackages -, autoreconfHook , pkg-config , fetchurl -, fetchpatch , libedit , runCommand , dash @@ -12,34 +10,16 @@ stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.5"; + version = "0.5.12"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-23eBEIkfeTeYXym/I0EP4cXWaVAnYPWE5U4OeynhI70="; + sha256 = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo="; }; - hardeningDisable = [ "format" ]; - - patches = [ - (fetchpatch { - # Dash executes code when noexec ("-n") is specified - # https://www.openwall.com/lists/oss-security/2020/11/11/3 - url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; - }) - - # aarch64-darwin fix from upstream; remove on next release - (fetchpatch { - url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; - sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; - }) - ]; - strictDeps = true; - # configure.ac patched; remove on next release - nativeBuildInputs = [ autoreconfHook ] - ++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libedit ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix index 3a5a83ad1f..18fa69c604 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix @@ -71,7 +71,7 @@ if test -e /etc/NIXOS; then else emulate bash alias shopt=false - if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + if [ -z "\$__NIXOS_SET_ENVIRONMENT_DONE" ]; then . /etc/set-environment fi unalias shopt diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index ef6ce0c6f6..e61d400fbb 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-03-12"; + version = "2023-03-28"; pname = "oh-my-zsh"; - rev = "72732a224e886933df6b64a49ec6f5e94c884612"; + rev = "fcbdc330ff50617c8b84d39ce069cc75df41108f"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "L3cItc1DWNE3MRRlJC9mbOwqA1JuD6k8gqrJc7XpJkk="; + sha256 = "MadBDgV3a4jOB5vmUVT4WUDJavQEQVjSYTmGUOApQ/s="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index e9bd772a94..08028053be 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.217"; + version = "1.218"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-oiHY0ZylhPKrC3dZS760J6LSjzP6y7UiXGAmUp9idMI="; + sha256 = "sha256-8FCQEQiy+xDOUmdABPrr0J87RLj0kqdJDxv4JvyzZM0="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 65b6eb0301..d0a7bce8bc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -37,14 +37,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.11.4"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.11.6"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-vue0daG+s7DdIWXZIRS7pjbQKlnxT3xZxGLTmwWWNpQ="; + hash = "sha256-6VEDGakOx2LJcDbBKicxxfOt0t2tf2iaRXkx1Em0Ieg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 65c850fdca..3ea03db31a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-SdVAq/i5J21EoCHVrYL0y6zJxlElZRsGoKGJupZN94w="; + sha256 = "sha256-/+c0bvPdw1FKXw0pfp7v5ArA/PrHU2b7wrt80vAXfCo="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { rm -rf ./test ''; - vendorSha256 = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; + vendorHash = "sha256-e7XNTizZYp/tS7KRvB9KxY3Yurphnm6Ehz4dHZNReK8="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 668110650f..f4c6955d28 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.134.0"; + version = "0.135.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-J179fhhcUUcSIVQvNUwgAiERPNQbMdFQBlKbvSb2/ss="; + sha256 = "sha256-wpy9DWE3HqpYK85JymQFScYYq+re7Xk2cF6pbSOvi2w="; }; - vendorHash = "sha256-/LcqW9D1FeyCMUM81d9JIa9vjTow9IG9CZPeixbDsXE="; + vendorHash = "sha256-ke1Tl2TFHAzBAQjMYsdYKiXVpgwYzZndTb8eTwUYDcY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix index a0ff00aafc..4f13bca3a2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -5,6 +5,7 @@ , snapshotPath , autoPatchelfHook , python3 +, libxcrypt-legacy , ... }: @@ -167,6 +168,9 @@ let ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = [ + libxcrypt-legacy + ]; passthru = { dependencies = filterForSystem dependencies; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index 4df33fa2d8..b124e250af 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,84 +1,84 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.56.0"; + version = "3.60.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-linux-x64.tar.gz"; - sha256 = "0ahjypk9sj0aqan85g24s1rrkw16nmfwa0ga3dka7jnxkd1lv0qk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-linux-x64.tar.gz"; + sha256 = "0hvmwwbin8qmsqcj6wp4qd8i8qn47gjc3zbpax0xq0657xikq71s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; - sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-linux-amd64.tar.gz"; + sha256 = "02zk0141nwrxr7l08a0401k2wvhz4qasdbfx2iykr9k0whv12smi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-amd64.tar.gz"; sha256 = "0n01d1n5xnxz9z4djcl32lv2szz7jsr3hjdfl7ajnmss0zmc5jwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-linux-amd64.tar.gz"; - sha256 = "1jhbshkwhwc83b6212q6av72p82z5jcip0rlhjl2fs9x5glp1x1j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-linux-amd64.tar.gz"; + sha256 = "07nd8nqarlkgc6y031bmniz3qlrg6q7sgv819a6fzzbmbv56791m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-amd64.tar.gz"; - sha256 = "0jv6gwjpdjhla4dgi6cfcz6c4h38fsc8c5ak168k40d4ixin8g5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1dr507c4wlqj0qlnddvbg9v2xbwnrhkrd0qg26p25xxrm0qfcd9y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-linux-amd64.tar.gz"; - sha256 = "0d62h8y2qnj3qlq35id0nn0fxi5nzznmvffd8v6aqax2bxwdpasa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-linux-amd64.tar.gz"; + sha256 = "1lz34a178hsix18rpwv9kr8w0f2vyglbf27c23lm57r98860i5rx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-linux-amd64.tar.gz"; - sha256 = "0gj02hshlbspjdgvlr56223ydz69d3bazqwzs4bl44bp5wcsw4x0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-linux-amd64.tar.gz"; + sha256 = "0565nqzjbqfrf0yiy9igh51g4dm6mwjna0kj9dpmbj637w7fa53s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-linux-amd64.tar.gz"; - sha256 = "1xk53cz55pwx96is5lvxhgwx9zcddnddvypd7kgbn137j85qsdq3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-linux-amd64.tar.gz"; + sha256 = "12h6pi8aahf97b7cnyksw1gjj6calc45n71bpmv7ac6vbzl9scb2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-amd64.tar.gz"; sha256 = "193yv9ygxw7zr9j1q5h9p9pp992kf251kplgd1n1frb08pzxikvw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz"; - sha256 = "13fffl50is67mzgj9910a7zw2mhq9k53qbdwsj1g5j4jq8r2p0xs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.7.0-linux-amd64.tar.gz"; + sha256 = "0hzdwaw73rdbm8q7gqrsad4gkmzwrhq5zmqa2m9lniairj4cxxy1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-amd64.tar.gz"; - sha256 = "0rx4324vibzklg5gldphfdkc42fafshqkw9ifxr5qf0yxlfffj62"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.0.0-linux-amd64.tar.gz"; + sha256 = "0p3w91fm0lxa1pr5jxzdh2nybyy2z1nxx0vy2birnmw2wlr5p8g2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-amd64.tar.gz"; sha256 = "1ld9zss8qfj3a3v75a09b3py266ba5ghdrj1d7vj9rdgid8xlxlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-amd64.tar.gz"; - sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.16.0-linux-amd64.tar.gz"; + sha256 = "1mqyjap2ys15z6479rr065vqfg1q777gn45d1alyv994zkbz845j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-amd64.tar.gz"; - sha256 = "09k4ni7dl3jndf85ypg00xlxij0ik6j1ndvw1yi4w8shikvy18rx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.1-linux-amd64.tar.gz"; + sha256 = "0zknpam1li0slymr381825rssnpcd0m2wvakqnaihzxlh4m6arvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-linux-amd64.tar.gz"; - sha256 = "0kacd5rqr7pc0dwrrlxpv3adzlp3jhyckayzhbjqlq8qgcd7qysq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1yddrhcm3aw02lfm7jmhlw7946zk5w1k05sfd5zwvyyr6pqdk3jc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-linux-amd64.tar.gz"; - sha256 = "0flp57d6w0yz3m55ni4zy44802fnvx8xhvhsphbkgzc33c16z3h3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-linux-amd64.tar.gz"; + sha256 = "05mnm9436kih5dllv6sizcdv165rhnwg9dnl9yjci06rhj2njb73"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-linux-amd64.tar.gz"; - sha256 = "0iqfb5qffk070nwn16a5wg1ljx5mjq51bbhi7kddgwzcnz2881yi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-linux-amd64.tar.gz"; + sha256 = "028q359ms8whsg41siip6rw0kbg7xf5hwjxnwfzlmx2p42m78pf7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-amd64.tar.gz"; - sha256 = "1s76ghsi9p9fda3j2nqyn3q1gjvfssxn74r7zapjl41day6h84wc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-linux-amd64.tar.gz"; + sha256 = "0j9150spxmviy7hgxyhm1j07gjizv2q4r0v66aywfvn1bkqrwhxc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; @@ -89,12 +89,12 @@ sha256 = "0798n2rl43scazjhdmyfx7pi0dfil4gdwl46q5gaqf6jpk4wakdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-amd64.tar.gz"; - sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-linux-amd64.tar.gz"; + sha256 = "1gd5p5sckjmzbdb94kadaddzbl1j1lw254jhq63mgnh6v2wwij17"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-amd64.tar.gz"; - sha256 = "180jdyhqv0jkqhfwmn12c62cp3c7839d56vbj3ibi9rjmvipwlg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-linux-amd64.tar.gz"; + sha256 = "1ic4p5nb13drnfmrb8rzx01rk3w06a6dn84cg7k9alcs1wglfqv1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-amd64.tar.gz"; @@ -109,28 +109,28 @@ sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-linux-amd64.tar.gz"; - sha256 = "0lr9829wwv02946l8fm9mmrw8zlr54b1ghg30lha4i495vwvhdm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.12.1-linux-amd64.tar.gz"; + sha256 = "0hsf00j8hs4l9ln8vab9syl14b83xmvxql342gvi4rcz291gff3p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-linux-amd64.tar.gz"; - sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-amd64.tar.gz"; + sha256 = "0yrzdbcvg16a2v7hc6rq4cmavimkj4hjxd3kfkw8gd2cbi4kcmwf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-linux-amd64.tar.gz"; - sha256 = "0niv0a4yrkp1msf7ah31vdpgzna5nq8kk96f0s0mnbbb0arghs3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-linux-amd64.tar.gz"; + sha256 = "1ka4rlycbsays75av3vlilqs4s3wdv8c8sjy9b5wfbv4cs7g18il"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-linux-amd64.tar.gz"; - sha256 = "1bqb1bah5r66qgyybca9758c8lzpsbjk5ls2cgs3vyi0mmpvdigj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-linux-amd64.tar.gz"; + sha256 = "167ldznmkll8ryplqrw8xj5fjxfj3hjmpy3ifm83in9qwjbdrhj7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-linux-amd64.tar.gz"; - sha256 = "10zl82n0wisf8xmqfd7bf4rqbvblh2mlmsb1zfg6p5qvpgf4nmji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-linux-amd64.tar.gz"; + sha256 = "1dh691s2cfbv34bs98p48m8fva9yr0ivkwyxnz5w5nk02l2fnakk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-linux-amd64.tar.gz"; - sha256 = "0jbn298h032fsvpn2wd2y4jh0alr7alszi0npari000s97d7b756"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.13.0-linux-amd64.tar.gz"; + sha256 = "1qd6pzx0hvn46kh19y38j635nqmgc6bwa2llnyda1prfyc3fjjfs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "1n0brv4m8xjyd3lk1rgwbj7c5bpa1m6lr95ipzj3nk8338mb420n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-amd64.tar.gz"; - sha256 = "1k9q3b06fy61bvfgr76f22v7q0qaxrb8msm25k77h0x9di48mn1c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.10.0-linux-amd64.tar.gz"; + sha256 = "15rxgydf34vlabsmgz7i47l5wp27vl22vsmglxl0nnycrhl15j2a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-amd64.tar.gz"; @@ -163,80 +163,80 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-darwin-x64.tar.gz"; - sha256 = "0p1sz23v8srx79i5axm2hpaj1gjj4582l7bnfh1p08xj6xqvfwpq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-darwin-x64.tar.gz"; + sha256 = "0l3qg3np4hs21gkrbxcf8swkwg3pvrsfcid3rx65pw5isxpy0wyv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-darwin-amd64.tar.gz"; + sha256 = "05jffzbl2pqczyc9d5lykrqwyx62bnzmxjn9q53pqvdw5faamypw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-amd64.tar.gz"; sha256 = "1i07ysdy09ps0l40qz7acj69b6l30q3y4l4cabg3wbrzwxzsa0ki"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-darwin-amd64.tar.gz"; - sha256 = "0w0n881qi6ln1b18cv55y7g75nk6yn0xmi3mwjpkz9l4j5jq3r8v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-darwin-amd64.tar.gz"; + sha256 = "17vqz4i9vvp3lw2qa2ya34pgi6fp2ql35njq3bn6dv1lw65mk7wq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-amd64.tar.gz"; - sha256 = "0a6hvi15z2viyv97xdq2s1kgrhz45f21rh4zcx4y7kqbv0v4a9aa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "04hw0pr8p77nxlc6xp0f4irsl3wn60d393389s1m7b4yzknjsald"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-darwin-amd64.tar.gz"; - sha256 = "0w996ncrn92gwpym54zgsyqkq6msb67dw0iisi9rngrrdd965pfj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-darwin-amd64.tar.gz"; + sha256 = "1hlvacv7nwizbijzqfxv996jms2vjak46pnp2mixr05zlmf0p890"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-darwin-amd64.tar.gz"; - sha256 = "13qh9av3mfaw44sjrg4lay7kldbcfn6wrj06jpzb1483gjq8gxlx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-darwin-amd64.tar.gz"; + sha256 = "0vvci7qsms2dkq1wv9x9pdzkcxa3392a30w7z5zk00bnsbhwj0fn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-darwin-amd64.tar.gz"; - sha256 = "1q763v6m6dwhanwcdryxdz0yg90ayznaxd07d16vwl9fqpr3ibwv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-darwin-amd64.tar.gz"; + sha256 = "00k4km6iha2m8jsp2p4m9smmcb8cmxwhgmdnmlpy2jwpfzppqq0f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-amd64.tar.gz"; sha256 = "0xfkqn9x4dgaj4z94v31jdncqqdg46iw64y0g1sm2bm8g57a8zxv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "0f7v1x363gr46q3ls90zq79wzbg2qwgcbrj2203g9pzly6x399p9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.7.0-darwin-amd64.tar.gz"; + sha256 = "0fsq37qvd8pdp6spp9261h8p6pmh8y6i8qrid5p57x1cjmkj2npf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-amd64.tar.gz"; - sha256 = "0kn3hzaycks3w2b1sbc0yzw4xis3gh6pgzmarc8zmdnlnlhzw7my"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "0vzbz8afjsqizwwfy25akhg8x27bav23c83gs2bjcklc7lhwxlib"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-amd64.tar.gz"; sha256 = "0v5h4jd1yyinchq332svcvcr1rw22xz6qv8c2660p0i50hhakv1p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "1giv4qb9jpc6csm1a6ijzqmpgc7xi6ijk3q0d1j2n74v5q79zfsd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-amd64.tar.gz"; - sha256 = "1a70h0apgxk5d70rki612s71wd6p0lg1g4v2w564q1f94fpqp9vb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.1-darwin-amd64.tar.gz"; + sha256 = "0vpa47dbqv4bw2i2ayxzh9xlph6y0l1sjrb203f55l312z5y2g22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "04ka754bdcrlg36ml5ksk45xarpql9dclm3ldsg0hqv5a02j9xn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0jgjwf5hbmncl2xkw2mpr0cp8dh5gszlfmgsii6jcnx69pc02f5r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-darwin-amd64.tar.gz"; - sha256 = "0rh79kw8p75yraf5q0b4xihwfggh1fbnvqk0f2hkrz3l8rn87d2z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-darwin-amd64.tar.gz"; + sha256 = "0agdb3yz11vv7jdfj5yawxrm7ibbd1b544lk7ndzfkdmyw1myfwl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-darwin-amd64.tar.gz"; - sha256 = "0rc8k02pcd52q28zlrb6f5piq3b5kandw13ggm1hlxd4gd8b0ssz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-darwin-amd64.tar.gz"; + sha256 = "0ngdsp70v05pirmdlzxafxpmd1zbc7dlaqfi2ibw0943kd1gwz53"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "1gjl4yx3g8p487yv61jslkiy1ar7qijhmsm6s52ghxyh8w2wfbrj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-darwin-amd64.tar.gz"; + sha256 = "01wqabdmp82706a1hqd03mbhbxh9vq4aib9csqm9gpabyyfq6zvh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; @@ -247,12 +247,12 @@ sha256 = "016n1dknmlhizjh6z923kr68ma7z0xhbxg29kjfay83gn216r4am"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-amd64.tar.gz"; - sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-darwin-amd64.tar.gz"; + sha256 = "09xi66s68h5966hv4vczc4z72awyaqncbkdcg03q3jjawg3lz32y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-amd64.tar.gz"; - sha256 = "0ca581x90ypw73z0dmy7b21sc0npqivnhfnv5r8pf2abwhbkpny0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-darwin-amd64.tar.gz"; + sha256 = "0kp8svvlzj04k7kckz811drnspfkb9405z5m98g4i45vbjyyrpp6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-amd64.tar.gz"; @@ -267,28 +267,28 @@ sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-darwin-amd64.tar.gz"; - sha256 = "1g0d3a2ghfdr3sdfqai3z6wdjjb41s0xz8rsvrv9qqc8sj97l296"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.12.1-darwin-amd64.tar.gz"; + sha256 = "08m0xpra2c93j258nq8lcz4yfp8chl0kyq4csc625jmp0wx1fdfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-amd64.tar.gz"; + sha256 = "0q9hjfyn4r14fplxx597kjy8g3jpcps4bp7gsyy4ri8fipldjnf3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-darwin-amd64.tar.gz"; - sha256 = "03wclzppq8npb5cavi4sjv838v83vzqiqwxjyjaqabl1ihf5c1y9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-darwin-amd64.tar.gz"; + sha256 = "0p55ghgc27rrwki345m13k8jrxkknapgml8b8mbzbgcl7gy1z829"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-darwin-amd64.tar.gz"; - sha256 = "02hn3a47a1hbyx6lhbvqpxiy5xi8p9zz5c80wzbkcf17yk6q03hi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-darwin-amd64.tar.gz"; + sha256 = "108lbp651i38r1z2d3jcrdcpn673p4crdsjapn9snm0vpj8w7v4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-darwin-amd64.tar.gz"; - sha256 = "17x0knh48hff9sb9hwnkrrzbc624w4wg63pgq34x1m2akwly0d82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-darwin-amd64.tar.gz"; + sha256 = "09xphk2i4w9rpzqs6k8x388xbzfi15vbl9k7n59nnd6q30z3yb5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-darwin-amd64.tar.gz"; - sha256 = "07wpbqk2l8dqjx5lv40xh9633jaimvsj86isn7cixj10qh5njvcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.13.0-darwin-amd64.tar.gz"; + sha256 = "1cda6cm87sbb26gyirh9glr5jngbyirvs352dqr4wr62zwav8mad"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "1cr0zbfrid4xsyjmabppzg7f867vmhpjf29s4qrb3g9vg0k4fibk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-amd64.tar.gz"; - sha256 = "0j7ydd39gp86srlk3319hniy9wikjyp4zc0gnxxq641dddnpscdw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.10.0-darwin-amd64.tar.gz"; + sha256 = "0f5h47q7cg6w9a17x369vn4fx97a6akwwr4ilgfq6bf8050r0cil"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-amd64.tar.gz"; @@ -321,80 +321,80 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-linux-arm64.tar.gz"; - sha256 = "1245dcw69fwj5jp5fkzh731gh5hh1dbci7n3g2ynhr7nz57j6yjs"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-linux-arm64.tar.gz"; + sha256 = "08h5i6pp4bg11whlacmmkixp5fk03gylw5dg8vva56n2cvqkdgms"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; - sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-linux-arm64.tar.gz"; + sha256 = "132ah2lqssdwdfmk97nslc7bfhk5qkqklnasl9anrk61cp095lg7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-linux-arm64.tar.gz"; sha256 = "1h92d4n9n4ia7y8lnah9fpfkz6yzyxa6dh69kv2cjk17m57x6h0v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-linux-arm64.tar.gz"; - sha256 = "1g8ggbn5xrjgpbh8q2lxc7szl9lw6jfi9zz2bb898lanlzbfhn8x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-linux-arm64.tar.gz"; + sha256 = "193z4r64ic016m74iy6fzwfldjvjbpknvdc63jdns1ls4wdvg152"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-linux-arm64.tar.gz"; - sha256 = "0hgnwzslhcxf1xp3dza9adf1dlc1v3fsgb22n0dqq65hyixkdlar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-linux-arm64.tar.gz"; + sha256 = "0mb5cc0q83mxaap3jhqn3cx8cxmixb7hn3zapg18ak000zvp248q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-linux-arm64.tar.gz"; - sha256 = "0gfyxgw4pmbll8yyb86fdry0rf3ygq7r63q6r1lk5mlg8m4wq67f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-linux-arm64.tar.gz"; + sha256 = "0s6ifpr0y0wyik9zdf9ydmky2w0501bcafpswmrar6hvblgbgiib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-linux-arm64.tar.gz"; - sha256 = "08ys4jkl59wn4m4sg0adwi9i9nfjga8apaz5llbns5d8g39xfpff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-linux-arm64.tar.gz"; + sha256 = "1bzadspszwm7gvynmd7zaw6r23f7w3pr7ck4axs8nix6mvdkgc0s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-linux-arm64.tar.gz"; - sha256 = "0j3imycra6f5yjqsxflz8m5x12znq5x6f955jwgbxnzimi7s252s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-linux-arm64.tar.gz"; + sha256 = "0b3l53b34mz7b4nqr483p1rby9sm7fdjxql3wmj621k5czg48s2n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-linux-arm64.tar.gz"; sha256 = "1pppk7i4hr1r1wsig2hrda5rjn6z07fw95k6fmihsynk8q8v7nj1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz"; - sha256 = "1m1f2fn5y7ybhzds5hlp545pxk3p1mli7vadr95227bws88fnzcl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.7.0-linux-arm64.tar.gz"; + sha256 = "0qb9klxp8qk9iyizs1z0bd3ixmmda2wi192zjr1qkrhck4ai5568"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-arm64.tar.gz"; - sha256 = "1rvpvdf7mcxqc0srp2dkca1nmwnbjvzmpfg6lbg0yxpk6ajxmjll"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.0.0-linux-arm64.tar.gz"; + sha256 = "191xlp35vg704bwpmyk5i2782fqxjkkafd5bsf8zbp2zqhmhlg7m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-linux-arm64.tar.gz"; sha256 = "09m1444wy8y6qjbp9pzki3gvi9mrs88cpc7001m8xnb0iyhjj0sx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-arm64.tar.gz"; - sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0lammjd0nypsa648i176yq4li89y1f0grhmm9qr92y4mz2fl10an"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-linux-arm64.tar.gz"; - sha256 = "0n8vimvn4p7mcrgnd0v8l1q21pswhlxs1mph4928lnpk8h68hz51"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.1-linux-arm64.tar.gz"; + sha256 = "1dq6nbvh1py951s2ips23fh4dg50r67d9g91r94ahagzb75pj5ml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-linux-arm64.tar.gz"; - sha256 = "0hh75m08zmk5cmp0pmgbsccbvri4302pns831wvj0vcdr441p2rx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-linux-arm64.tar.gz"; + sha256 = "0vkvkrbsivaklqwg9g0qh5dsjw7c5l8igs0h7p1g301kvndlqsra"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-linux-arm64.tar.gz"; - sha256 = "12gb1q2cgbd0k9ngq3kncqyy4vx7hkqf8sz64sv308s8zg3z3764"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-linux-arm64.tar.gz"; + sha256 = "1dw3kf7h83lqgd6vpjqlwb9y11aa3wd7kagdc0gzhp7qxd0iwirl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-linux-arm64.tar.gz"; - sha256 = "07npiwm2z8dkf7b5f866alxpk4p9vhi3fg9kvpp3vb8zmgx8kvpf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-linux-arm64.tar.gz"; + sha256 = "07qkpnjw5zg0mw50l1pmhxx0j3aqzn5v5cn987564jr4lbc9d2ch"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-linux-arm64.tar.gz"; - sha256 = "0y454009cwryi6bcz9k6398bbngdslxkpcvdnl270jk1rkk0b2qz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-linux-arm64.tar.gz"; + sha256 = "0i815lp4dlzs6kspbmhv7pipci9pv5fzf44bmp4vv8zk372b2rls"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; @@ -405,12 +405,12 @@ sha256 = "1y931wca5hppiwxya68rj6ymhavw7kkpqd67awpls6f7j4y0wwjl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-arm64.tar.gz"; - sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-linux-arm64.tar.gz"; + sha256 = "0g4s4myx9qyzzpcnq2h1lm0kajwfww2m4nfvnxhlpnhc51yn2j60"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-linux-arm64.tar.gz"; - sha256 = "0xj174k6qk5fkivzj9481smgvvv3i1861kbjiplsfkka8j6wcw09"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-linux-arm64.tar.gz"; + sha256 = "04kg7b2zk06d7zmipy5y9adsk4yd9bsg3bqb13r4m1lfqh604ivn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-linux-arm64.tar.gz"; @@ -425,28 +425,28 @@ sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-linux-arm64.tar.gz"; - sha256 = "1mp3q0yb666hv61pv2szrw67wbd5kfjzfw4c2c014ld3m19mn11j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.12.1-linux-arm64.tar.gz"; + sha256 = "1knr6yypkkxsays2ga6idia1bcc9y8n7dm0l5f3j7a56mhm7wmw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-linux-arm64.tar.gz"; - sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-linux-arm64.tar.gz"; + sha256 = "0hj4a0llq088xcfp85k6nn8ssffj51lvhqp05sg8x3kbg6n0dapy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-linux-arm64.tar.gz"; - sha256 = "1312x0rwcy1cff4hfds387gwik94qdscm5jb6csmi18al369i3by"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-linux-arm64.tar.gz"; + sha256 = "13vlh0v6nq7l6rs4pwfzd4v9miqnkxh9hiq8whnaqkxqlayx6h32"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-linux-arm64.tar.gz"; - sha256 = "0byndp1nvlms43v0c40sk9k1hawyxs34q88j04ykmnxszb36qy5n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-linux-arm64.tar.gz"; + sha256 = "0yrymzhihv597mbfz88s4xbklsl9jp1g18viabzxc194l323wr2z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-linux-arm64.tar.gz"; - sha256 = "08rcj6gn4s4yc4f3r2yp4ykci02prx3nbmcfm4xm9ir766grjq3f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-linux-arm64.tar.gz"; + sha256 = "0wgn9snib1z8q9f7ssfxrjr5yldwjd3iwhng21800c1ljgva2429"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-linux-arm64.tar.gz"; - sha256 = "040vg2lz0q19jfns4ig6lv658rpjfbv36yhmhly5h9ld37yqwlw6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.13.0-linux-arm64.tar.gz"; + sha256 = "13n89xbrxak1m5nfgfaw7kjkdwlx09ln1nhlgfrznmspfwq0gh0w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "0wc2j439pi1s5j6ncmdj0670svis5ljfgn1q49lh37pgn88m7m75"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-arm64.tar.gz"; - sha256 = "1vrshbjdvn01jm38dq91v38q1m30nvx8siyk2ppx5b3zp5kgdlfl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.10.0-linux-arm64.tar.gz"; + sha256 = "1f5rn3kf6qp4y1vajx68xqx16hybfcxfddfwrf79344qpm57d1pw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-linux-arm64.tar.gz"; @@ -479,80 +479,80 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.56.0-darwin-arm64.tar.gz"; - sha256 = "18igp1n7dy09sd12q94y36462bxamgacjqin186xpm7m5s4gwp3j"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.60.0-darwin-arm64.tar.gz"; + sha256 = "1afsivafx7f0r85k6z5fg57hj6cv4msfzpjbv61kycsf3glls21i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.0.2-darwin-arm64.tar.gz"; + sha256 = "1y76k8d4jzd0py9cvw3syql22nxajv20c85pl9m26bjhx2vzqk3i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.3.0-darwin-arm64.tar.gz"; sha256 = "0da555h07fzmrg25sw33744cwh678rb231i0w7arpws2r3qdjjwv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.33.0-darwin-arm64.tar.gz"; - sha256 = "0qplcglax98l9yhz242kyx763xfhr7byz4r176m7zf5zknk65mzi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.34.0-darwin-arm64.tar.gz"; + sha256 = "1flvldcqqrw39hiyk9vnc98276ayvaij5djnxi4njm1q3rjgg5zp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.12.0-darwin-arm64.tar.gz"; - sha256 = "1nh9hsv9sc0l9vfamhv8ixbra9xnldai0h3dfgrmy0zl3v1njmh1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "0m8kw7wl7jmzx14gk53p5sr5vqrpf00s96ncywgh4l1qdhbwhwa5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.17.0-darwin-arm64.tar.gz"; - sha256 = "0jxrb3q5rgvvdw62ri796sbh9fv0zvh70wd9iyiynxmhsj9ganf4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.18.0-darwin-arm64.tar.gz"; + sha256 = "1p1xyhll66vil1hmszamjn6lspiygxdrzfkrmwknh1z9r14nvhcw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.30.1-darwin-arm64.tar.gz"; - sha256 = "0x2z4xf4nq2ynhdz9pmjk8b1znz8y7b2j2lmi8y4r0xj58pghkp4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.33.0-darwin-arm64.tar.gz"; + sha256 = "0mqfsqq2x3cz6k2lybpb49qqq6bdzpfvlxcdav739qxzhddq4g6h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.36.0-darwin-arm64.tar.gz"; - sha256 = "0hfmpc9q8nb19ayap12d86l6cpy607w1zjsjmicx0i6nvyksz2w9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.38.0-darwin-arm64.tar.gz"; + sha256 = "11rhr4p5z7shr74yyrsfagqcshn1r8kzv4vp7iqa7jx521h7s0yn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.36.0-darwin-arm64.tar.gz"; sha256 = "17pzqyiw8gxqi5rjyqk74cjywpna8x1y0hbfzbd5547myxqc0949"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz"; - sha256 = "01jcrbvhyapbzhm1z4gbpi38vah69inx70mr96mmsfmn7zs95l0p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.7.0-darwin-arm64.tar.gz"; + sha256 = "0lckvydnq8aw5slal7gy02pdk2magn9rpzb87x67f5wzsj9i1nb9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-arm64.tar.gz"; - sha256 = "1z12mpwsls2h8662wnvg4npnqmh643cwa57z24n6y1i0wlzimq58"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "0cpb1dfhzmk6hqa23r2sq7hg58z3pzy8zkyvpcsqhsggcd2grmj0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.8.0-darwin-arm64.tar.gz"; sha256 = "0301sm5d28yjw15k214rskq1w19a5b5l218y2qfzvv89z5qgh84r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-arm64.tar.gz"; - sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "0g83fbakjsqjg0wwcap8hcdkq2facgfy3k77i3lkxldaar82c380"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.18.0-darwin-arm64.tar.gz"; - sha256 = "0jghq2bl0p7wwdipdqqvrpfdj1n1cl9q53ssjhmaj2f9vmikhdsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.19.1-darwin-arm64.tar.gz"; + sha256 = "1h5pahqhgj8kvagv8wgv1sf4cxk8vs8sinw5q0mlnwa5z0z5hgwj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "0c66gq9q1bv18frarscbdpx7hfgv8ma1i3xp367yb5gi1hl850fp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "1nyh8kzvbknpf95l5m3lngmfvq7ngbh892lbbn5zbfkm9qv6way4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.1.0-darwin-arm64.tar.gz"; - sha256 = "16a4fdzggrrmaw22lp8l7lfk98p9s1ijnf27sp7pffpq7b1hk53l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v7.1.0-darwin-arm64.tar.gz"; + sha256 = "1ccgr4041rsqrxzgsfm85fh4c8ricvprp3l4gqraslmwgsrxx2z5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.51.0-darwin-arm64.tar.gz"; - sha256 = "0fyqi82h4hpzgdkmp7k0pjm3ffik2i7gk93lazqghk2h6xfxv95c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.52.0-darwin-arm64.tar.gz"; + sha256 = "1cmdx19p87ah3rgf1x0hfzpzzr1bwwr5c190cn1xkvs69v4ra4rc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "140rvajb742r84sb3wjvrr1nvvl6a3lraj5k6lf1hlgvi4rv0q0y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.6.0-darwin-arm64.tar.gz"; + sha256 = "14xbrcvfxqx2w6w03xb0ll2nhmyafgab72c4di602zv1d5jvif3l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; @@ -563,12 +563,12 @@ sha256 = "06qv3bmmcrv9rxv5xain2rk2grfqij6czy2nqay07bjpy2awzh40"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-arm64.tar.gz"; - sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.3-darwin-arm64.tar.gz"; + sha256 = "0yi1y22s1mhdrv6kwg94c5yr57jpp456illnaa1kwb3x7rkha9ff"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.1-darwin-arm64.tar.gz"; - sha256 = "0pyl0rdwgd4vm4rcass0va4r036nwwj9imwi026gha4y9b3138cp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.24.2-darwin-arm64.tar.gz"; + sha256 = "1izqf1g2ccsm1wakq7h8nwk7v3gp3q561mp0qkpda90bdkn7abc6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.12.0-darwin-arm64.tar.gz"; @@ -583,28 +583,28 @@ sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.11.0-darwin-arm64.tar.gz"; - sha256 = "0wilkgmgihk0bp8w69dsjji4ijrwrxjd596whx7lxb8h5bdi8y58"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.12.1-darwin-arm64.tar.gz"; + sha256 = "0iys3f21qfdx1gilba9xds5wv5d5xcw6qsd9c2662i42ccgggcjn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.6.0-darwin-arm64.tar.gz"; - sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.8.0-darwin-arm64.tar.gz"; + sha256 = "1fhll8bgamlv4kljngydmnhbc90bz3figg10qy3qa9kgqkrxm041"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.11.3-darwin-arm64.tar.gz"; - sha256 = "0ihygsdlp71760wndj626mka631937dnd61823il0w9pipfs1k12"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.12.0-darwin-arm64.tar.gz"; + sha256 = "1ig4s67nywazngrc8gwrqacsk8msdw684i1ng6sx7zm05j8bj7rj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.18.0-darwin-arm64.tar.gz"; - sha256 = "1yg9b0bs6arz85j9wsaynrl1qzhrq6743i0mlrjzs876waff5fi6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.20.0-darwin-arm64.tar.gz"; + sha256 = "05rl4f8q0d3rlrxr9fr1sfj6ypc5xmvgzdmsvxd891z26yamx7ig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.26.0-darwin-arm64.tar.gz"; - sha256 = "1ch8w3g29mw8cxmbklpaq468ibn7sn8qv7m5zwhlbfawpmcd0qv6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.28.0-darwin-arm64.tar.gz"; + sha256 = "1290ps5syhk8m7dbzl8mran61z5m2bqmak5s28jflcsarqjp062b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.12.0-darwin-arm64.tar.gz"; - sha256 = "17dfk0019jzk0kwxp8vypk3bkhs6mcgszpp2g29cs9f5fnnskhpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.13.0-darwin-arm64.tar.gz"; + sha256 = "1ik84sgxgni8a86v5a7xp7xhnml3ii7wglphhcz53hfj03f85d67"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "0sxdpvx2hwd1sgaz34ddpa676n0g081ymrldr881cb5lfh01zbji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-arm64.tar.gz"; - sha256 = "0hh9m53pc07mfpi2zl1hzqg58fh0i6vbm0s9vppxvn2nnl5bd0wy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.10.0-darwin-arm64.tar.gz"; + sha256 = "1fwijm81ghprg8kzkfknd4psa5538rdjx5c2hrx9n98s9q0mvk14"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.5.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 50b83a6664..e1ee37c328 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.55.0"; + version = "0.55.2"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o="; + hash = "sha256-/KWkU9IpUWhVOyiNkYg98PSltS97XNWXaz9haN11Dac="; }; - vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; + vendorHash = "sha256-1krHpwjs4kGhPMBF5j3iqUBo8TGKs1h+nDCmDmviPu4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix index 5f61a9660f..81157c1378 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/liquidsoap/full.nix @@ -7,14 +7,14 @@ let pname = "liquidsoap"; - version = "2.1.3"; + version = "2.1.4"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2ti/ZF1tPI+3dpwG6IZLBcg0C19ffnJA3Dog5ngrEgQ="; + sha256 = "sha256-GQuG7f9U+/HqPcuj6hnBoH5mWEhxSwWgBnkCuLqHTAc="; }; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/Cargo.lock b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/Cargo.lock index 8926f13797..330903a0fd 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/Cargo.lock @@ -22,6 +22,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "async-once-cell" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b49bd4c5b769125ea6323601c39815848972880efd33ffb2d01f9f909adc699" + [[package]] name = "autocfg" version = "0.1.8" @@ -141,22 +147,22 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "windows-sys 0.45.0", ] [[package]] @@ -186,10 +192,31 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.8.0" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -231,46 +258,87 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "futures-channel" -version = "0.3.26" +name = "futures" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", + "futures-sink", ] [[package]] name = "futures-core" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" + +[[package]] +name = "futures-executor" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] [[package]] name = "futures-io" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-macro" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "futures-sink" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-util" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ + "futures-channel", "futures-core", "futures-io", + "futures-macro", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -291,9 +359,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes 1.4.0", "fnv", @@ -324,10 +392,16 @@ dependencies = [ ] [[package]] -name = "http" -version = "0.2.8" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes 1.4.0", "fnv", @@ -359,9 +433,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.24" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes 1.4.0", "futures-channel", @@ -423,6 +497,17 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -440,9 +525,9 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" @@ -471,9 +556,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -506,33 +597,11 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "merge" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" -dependencies = [ - "merge_derive", - "num-traits", -] - -[[package]] -name = "merge_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -542,36 +611,53 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "mpd-discord-rpc" -version = "1.5.4" +version = "1.6.0" dependencies = [ "dirs", "discord-rpc-client", - "merge", + "mpd-utils", "mpd_client", "regex", "reqwest", "serde", "tokio", "toml", + "tracing", + "tracing-subscriber", + "universal-config", +] + +[[package]] +name = "mpd-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8fe9ce469f08cb23f2811201f61d7327b76b0fe15cf8ee0a2ea358fababcd7" +dependencies = [ + "async-once-cell", + "futures", + "mpd_client", + "thiserror", + "tokio", + "tracing", ] [[package]] name = "mpd_client" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ddb4e7f7f0323823dcadfb17cb8b4d25d7ebcfee20779a814091d5b6dec95" +checksum = "09acf3ba374ec87b03c0ca60f648dc3f7d045d4b8a4254553217f9098fef9039" dependencies = [ "bytes 1.4.0", "mpd_protocol", @@ -631,12 +717,13 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "autocfg 1.1.0", + "overload", + "winapi 0.3.9", ] [[package]] @@ -645,21 +732,21 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.45" +version = "0.10.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +checksum = "d8b277f87dacc05a6b709965d1cbafac4649d6ce9f3ce9ceb88508b5666dfec9" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -678,7 +765,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -689,9 +776,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "a95792af3c4e0153c3914df2261bedd30a98476f94dc892b67dfe1d89d433a04" dependencies = [ "autocfg 1.1.0", "cc", @@ -700,6 +787,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owning_ref" version = "0.4.1" @@ -728,7 +821,7 @@ dependencies = [ "libc", "rand 0.6.5", "rustc_version", - "smallvec", + "smallvec 0.6.14", "winapi 0.3.9", ] @@ -756,44 +849,20 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -948,9 +1017,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" dependencies = [ "aho-corasick", "memchr", @@ -959,24 +1028,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "base64", "bytes 1.4.0", @@ -1019,10 +1079,24 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.12" +name = "rustix" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "schannel" @@ -1030,7 +1104,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -1079,35 +1153,44 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.4", ] [[package]] name = "serde_json" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434af0dc1cbd59268aa98b4c22c131c0584d2232f6fb166efb993e2832e896a" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1121,10 +1204,19 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.7" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg 1.1.0", ] @@ -1139,10 +1231,16 @@ dependencies = [ ] [[package]] -name = "socket2" -version = "0.4.7" +name = "smallvec" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -1156,9 +1254,20 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" dependencies = [ "proc-macro2", "quote", @@ -1167,36 +1276,45 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", + "rustix", + "windows-sys 0.42.0", ] [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.4", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", ] [[package]] @@ -1216,9 +1334,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg 1.1.0", "bytes 1.4.0", @@ -1229,7 +1347,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1240,14 +1358,14 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -1255,9 +1373,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes 1.4.0", "futures-core", @@ -1269,11 +1387,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -1302,7 +1445,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1312,6 +1455,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec 1.10.0", + "thread_local", + "tracing-core", + "tracing-log", ] [[package]] @@ -1322,15 +1491,15 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -1341,6 +1510,19 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "universal-config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dae262d0546bed6c0955faad12c07ec989768c2550643609410178fddb39909" +dependencies = [ + "dirs", + "serde", + "thiserror", + "toml", + "tracing", +] + [[package]] name = "url" version = "2.3.1" @@ -1362,6 +1544,12 @@ dependencies = [ "rand 0.4.6", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -1411,7 +1599,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -1445,7 +1633,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1516,46 +1704,79 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "winnow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +dependencies = [ + "memchr", +] [[package]] name = "winreg" diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix index 31d02e0dd3..4ddc22d0b9 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.5.4b"; + version = "1.6.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SMAllqxfae8bNLBkxsY4OmjoIzxFZ0dwIRYconlNZ18="; + sha256 = "sha256-FYI0TlYyoT9h4fVjR1kp2Rn5qVppQhy6o09mPptTEMo="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index 34bd7c5617..36bd2065de 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.32.5"; + version = "0.32.6"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "8f5AkWgCFteMeQPYKn+P+V6Ypb6x0f/bK6UpOovDn7Q="; + sha256 = "AuKsZHyRhGMgLL5ge7lVV6T3/SNwaRJDM8VNpbK7t2s="; }; nativeBuildInputs = [ asciidoctor makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix b/third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix index eee9c70fcc..451ed58d81 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/mydumper/default.nix @@ -1,43 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, glib -, zlib -, pcre -, libmysqlclient -, libressl +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config, sphinx +, glib , pcre +, libmysqlclient, libressl +, zlib, zstd }: -let inherit (lib) getDev; in - stdenv.mkDerivation rec { pname = "mydumper"; - version = "0.13.1-1"; + version = "0.14.1-1"; src = fetchFromGitHub { - owner = "maxbube"; + owner = "mydumper"; repo = "mydumper"; rev = "refs/tags/v${version}"; - hash = "sha256-Oknivkyr3wOfjnDccEeFVt7D2l1CkeWgXahsQCtAc0I="; + hash = "sha256-I8COArsIO8+09SNa3DrgoGpvhLj08I8UvT2H9k9mJNQ="; }; - nativeBuildInputs = [ - cmake - pkg-config - ]; + outputs = [ "out" "doc" "man" ]; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; buildInputs = [ - glib - zlib - pcre - libmysqlclient - libressl + glib pcre + libmysqlclient libressl + zlib zstd ]; cmakeFlags = [ - "-DMYSQL_INCLUDE_DIR=${getDev libmysqlclient}/include/mysql" + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" + "-DWITH_ZSTD=ON" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/rustic-rs/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rustic-rs/default.nix index 559fcf2a0f..5487a26417 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rustic-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rustic-rs/default.nix @@ -2,27 +2,30 @@ rustPlatform.buildRustPackage rec { pname = "rustic-rs"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "v${version}"; - hash = "sha256-irN5enJ0nyyzrLvnLXm7YhyEJ3nz9PQukzAfUrKmOzY="; + hash = "sha256-r4hOjX/LKv2wX720FMEztUo9rf2hDBLfcHtENSZNA3U="; }; - cargoHash = "sha256-wJuWeoS45ikP12S2o6aB2Iogw5HomXzCIjkFbp3rSR4="; + cargoHash = "sha256-sNxD8rDkfUw5aVhRYpYftpPMiWhiTYDdShlVZvx2BHk="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + ## v0.5.0 panics when trying to generate zsh completions due to a bug. + ## See https://github.com/rustic-rs/rustic/issues/533 + ## and https://github.com/rustic-rs/rustic/pull/536 postInstall = '' - for shell in {ba,fi,z}sh; do + for shell in {ba,fi}sh; do $out/bin/rustic completions $shell > rustic.$shell done - installShellCompletion rustic.{ba,fi,z}sh + installShellCompletion rustic.{ba,fi}sh ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix index cc6754b4a8..646d85d727 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + nativeBuildInputs = [ + pkg-config + dbus-glib # required for dbus-binding-tool + ]; buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index eea423b897..a59c2695c2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0ax1zbw4pmggx1b784bfabdqyn39k7109cnl22p69y2phnpq2y9s"; + sha256 = "sha256-rZ87ZBBNYAmgWMcPZwiPeZMJv4UZsUsVSvrSJqRScs8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index c0c7706310..49cb954b29 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.1.0"; + version = "11.2.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4489"; - sha256 = "00qagNgNZ+9sedBme0WmJfedF4WST8EFeqUJ5Wx3yEQ="; + rev = "4539"; + sha256 = "LIcB8EBMGTiFw5hrvWZPxr8Zol6WUH/1I7kVohbo4eA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix index db546583f3..d96004ae54 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ppBJx3Yax2w8/D9DQayS+jfqFP1sa9pdVGeAHExg+9Y="; + sha256 = "sha256-uZa0R5Po9d/36z4t3BwqPInfBlRN/ZzwhPYtnaz+pvc="; }; - cargoHash = "sha256-l/Ytlzyoo27geZZ7wFYHStqD6TvMuI4SC0+DYjTK57w="; + cargoHash = "sha256-QtoPWtLgbRpJuvtfUJ4CiSjb0F+4ojVqK3IZePsF8Rk="; meta = with lib; { description = "An SVG rendering library"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index db44108112..9c4099783e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.1"; + version = "8.14.2"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U="; + hash = "sha256-QUWZ11t2JEJBdpNuIY2uRiSL/hffRbV0SV5HowxWaME="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix index 0835540d92..432c59bd02 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.5.0"; + version = "1.3.5.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-RPuhcLJ5Ad41SFPjJBdghcNBPIGzZBeVWTjySWOp0KA="; + hash = "sha256-QxRtslteGb45xlLclyg5i5+w2+QGTgieAJeqjjCvaIA="; }; outputs = [ "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index c363752467..a4c5c64512 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchFromGitHub , pkg-config @@ -35,18 +36,18 @@ let enDictVer = "20121020"; enDict = fetchurl { url = "https://download.fcitx-im.org/data/en_dict-${enDictVer}.tar.gz"; - sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; + hash = "sha256-xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs="; }; in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.22"; + version = "5.0.23"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-9/5I/ZOJvqAx4UpXOeDrU9SKPV68HdRrWI9IzBZEctk="; + hash = "sha256-zS25XeNtBN7QIi+Re/p1uLoH/Q4xKAsFrEmgk2LYRu8="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix index 2213067f9b..b43685513f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/boxxy/default.nix @@ -2,20 +2,32 @@ , rustPlatform , fetchFromGitHub , stdenv +, pkg-config +, oniguruma }: rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.5.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-e6AkxC3TP2StApPSWaadLz/AFmaKBKCrS5HuocvmfQs="; + hash = "sha256-c1AZz5WwSie0lenH0LoPOvR4VWd7pYd59WWmjFn6HiQ="; }; - cargoHash = "sha256-E3IX3JSc8Rq8Qnx6Lk+PQgGfHptidxPaOqejYJgudlw="; + cargoHash = "sha256-840W5wyOV+nTr9HzftOUlUwZ1JRe7+FWTG4Q2L+yCXM="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + oniguruma + ]; + + RUSTONIG_SYSTEM_LIBONIG = true; meta = with lib; { description = "Puts bad Linux applications in a box with only their files"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index d57475fb59..cc28ddb12a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-2YL+ncT1UcanslFnMIMonvGugD7HxO6taYZtKK6kmEc="; + sha256 = "sha256-kdY/3D/GiAlOfj3pT9DECOsD9wqb7GZN7yzZrhec8hI="; }; - vendorHash = "sha256-eAWgLR3wqcTmlA3hG9IGgTm/Q+EKcypXYXRdtRAb94o="; + vendorHash = "sha256-HLKk64PcJUjKfY4pIwI2OXnjqFF1EkYlWOi0aWOVSbk="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/third_party/nixpkgs/pkgs/tools/misc/chatgpt-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chatgpt-cli/default.nix new file mode 100644 index 0000000000..0818e860b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/chatgpt-cli/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, +}: +buildGoModule rec { + pname = "chatgpt"; + version = "0.6.0-beta"; + + src = fetchFromGitHub { + owner = "j178"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qIa0eU3aFyDC5cm/J/BmZfcJe1DARqAtmpUMqlaqsF4="; + }; + + vendorHash = "sha256-JlBAPHtMm5mq91aOtsNMDu48net9i3W/AxCiKalYkm4="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Interactive CLI for ChatGPT"; + homepage = "https://github.com/j178/chatgpt"; + license = licenses.mit; + mainProgram = "chatgpt"; + maintainers = with maintainers; [ Ruixi-rebirth ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/clolcat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clolcat/default.nix new file mode 100644 index 0000000000..25c7ade5cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/clolcat/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, lib +}: + +stdenv.mkDerivation rec { + pname = "clolcat"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "IchMageBaume"; + repo = "clolcat"; + rev = version; + sha256 = "sha256-fLa239dwEXe4Jyy5ntgfU9V0h5wrBsvq6/s2HCis7Sc="; + }; + + preInstall = "mkdir -p $out/bin"; + + makeFlags = [ "DESTDIR=$(out)/bin" ]; + + meta = with lib; { + description = "Much faster lolcat"; + homepage = "https://github.com/IchMageBaume/clolcat"; + platforms = platforms.all; + maintainers = [ maintainers.felipeqq2 ]; + license = licenses.wtfpl; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix index c229667db4..c34bc26b0e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix @@ -1,12 +1,15 @@ -{ lib, fetchzip, stdenv }: +{ lib +, fetchzip +, stdenv +}: stdenv.mkDerivation rec { pname = "cyberchef"; - version = "9.55.0"; + version = "10.2.0"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-nJes11d/KqQH6pCGIEwlEeP0BjsUr9bo5rBoEoB0IZk="; + sha256 = "sha256-Qom8NRy46EoZtXcdA716yO48GVemloEBlXxEFMB3g10="; stripRoot = false; }; @@ -19,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis."; homepage = "https://gchq.github.io/CyberChef"; + changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ sebastianblunt ]; license = licenses.asl20; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index b6125b9faf..f44b3c7a1b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -81,6 +81,30 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8"; sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM="; }) + + # Upstreamed patches for flicker-free boot + # Remove these patches once a new release is cut + (fetchpatch { + # term/efi/console: Do not set colorstate until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9381dbe045b39bd9395c9ab4276d95b4041ec9fb"; + sha256 = "sha256-ZFq/PdCYo6aRySZRAfZARO8BmXwGgqeXz+9uNgNJEO8="; + }) + (fetchpatch { + # term/efi/console: Do not set cursor until the first text output + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7c316e18301e101e4dcd8abe88c0bed0b1b78857"; + sha256 = "sha256-WJiK7MqmdStzq77vIDsO60Fu7i9LE/jDYzF4E9FXb7c="; + }) + (fetchpatch { + # normal/menu: Don't show "Booting `%s'" msg when auto-booting with TIMEOUT_STYLE_HIDDEN + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bb4f2b7d665c84bde402d1a528b652a61753380"; + sha256 = "sha256-lwJPPyq6yj7X1C2RuHfxnwKKstFkWGxcMXuSQqd9Z4I="; + }) + (fetchpatch { + # kern/main: Suppress the "Welcome to GRUB!" message in EFI builds + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4cbbeca0ef35097301a1086f85fd0d119e64aa"; + sha256 = "sha256-cQX4x9V5Y7SU9WACn5FzDjukL2/StAUMMoHY/DRHq+g="; + }) + (fetchpatch { name = "CVE-2021-3981.patch"; url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0adec29674561034771c13e446069b41ef41e4d4"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix new file mode 100644 index 0000000000..bcb936694f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/leanify/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, libiconv +}: + +stdenv.mkDerivation rec { + pname = "leanify"; + version = "unstable-2022-12-04"; + + src = fetchFromGitHub { + owner = "JayXon"; + repo = "Leanify"; + rev = "7847668ac5bf0df1d940b674bc8b907bd1b37044"; + hash = "sha256-KxVV7AW9sEfH4YTPDfeJk7fMMGh0eSkECXM/Mv9XqBA="; + }; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-flto" "" \ + --replace "lib/LZMA/Alloc.o" "lib/LZMA/CpuArch.o lib/LZMA/Alloc.o" + ''; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp leanify $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Lightweight lossless file minifier/optimizer"; + longDescription = '' + Leanify is a lightweight lossless file minifier/optimizer. + It removes unnecessary data (debug information, comments, metadata, etc.) and recompress the file to reduce file size. + It will not reduce image quality at all. + ''; + homepage = "https://github.com/JayXon/Leanify"; + changelog = "https://github.com/JayXon/Leanify/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = [ maintainers.mynacol ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 0a41ef0f8b..ea1b04de25 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -43,13 +43,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2023.1"; + version = "2023.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-3XkrFnaToZccn24xaAE9kGrANRAP9scZo7Mi60S5b1U="; + sha256 = "sha256-zrB4h1Wgv/VzjURUNVL7+IPPcd9IG6o8pyiNp6QCu4U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index d4bdeffc4f..2a85535b29 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-1ocLvpesL0Cu6f1PYaOBzKj5set1Sqm/n5MPgawOOfk="; + sha256 = "sha256-Gima27E77iJEgOVY49Y2s9kQkd+rnzS359ru5NAyGik="; }; - vendorHash = "sha256-CMJjeVTydxyLNW/937sojrjbENR00/HMEbY/gOYMNFs="; + vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix new file mode 100644 index 0000000000..b8b3fbb1af --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/shell_gpt/default.nix @@ -0,0 +1,40 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "shell_gpt"; + version = "0.7.3"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-lS8zLtsh8Uz782KJwHqifEQnWQswbCXRVIfXWAmWtvI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + python3.pkgs.pythonRelaxDepsHook + python3 + pip + ]; + + propagatedBuildInputs = with python3.pkgs; [ + markdown-it-py + rich + distro + typer + requests + ]; + + pythonRelaxDeps = [ "requests" "rich" "distro" "typer" ]; + + doCheck = false; + + meta = with lib; { + mainProgram = "sgpt"; + homepage = "https://github.com/TheR1D/shell_gpt"; + description = "Access ChatGPT from your terminal"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix index 81964d8921..e290598fae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.10"; + version = "1.0.11"; src = fetchCrate { inherit pname version; - sha256 = "sha256-zDWfeyZTQ4yaBK3vuX6+Rb6/+DFOESMDTQ7Bg/XN06I="; + sha256 = "sha256-Cbhg0KLDi2GOEP9KwwExcoX5wE2kMM41biXLrlWLKvY="; }; - cargoSha256 = "sha256-epIqjmQStSHdpEH7YVnsHVz3tEIz3cdJY9O+lzg7b2Q="; + cargoSha256 = "sha256-RbTwJx8ueMAOl9cx6YxGEsjARxcZhJXHhyWWYPTdpI4="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 3c72233743..6968fff13e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-CWZ+zsWaI5JULmcJRZggewqArfYpB1G7jyjRPD4WNug="; + sha256 = "sha256-RbtIDgTVS/vtYQpbTQ7Yl7oBtC8c6D9Pns9SdEjUsmI="; }; vendorHash = "sha256-XrEdaNLG46BwMEF/vhAk9+A6vH4mpbtH7vWXd01Y7ME="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/svu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svu/default.nix new file mode 100644 index 0000000000..62568696c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/svu/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, svu }: + +buildGoModule rec { + pname = "svu"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "caarlos0"; + repo = pname; + rev = "v${version}"; + sha256 = "37AT+ygN7u3KfFqr26M9c7aTt15z8m4PBrSd+G5mJcE="; + }; + + vendorHash = "sha256-+e1oL08KvBSNaRepGR2SBBrEDJaGxl5V9rOBysGEfQs="; + + ldflags = [ "-s" "-w" "-X=main.version=${version}" "-X=main.builtBy=nixpkgs" ]; + + # test assumes source directory to be a git repository + postPatch = '' + rm internal/git/git_test.go + ''; + + passthru.tests.version = testers.testVersion { package = svu; }; + + meta = with lib; { + description = "Semantic Version Util"; + homepage = "https://github.com/caarlos0/svu"; + maintainers = with maintainers; [ caarlos0 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 23477e46c1..2fcb42f9ab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-DqUfThAdfwXaZ/2KCw5+68l0vxRd4Ie3lwgz/A/6l5U="; + sha256 = "sha256-PQFR0mkt6OhtFlIrJXriNv+aoI9d7Y6y2tBEZrKkRU8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix new file mode 100644 index 0000000000..04102746b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, stdenv +, rustPlatform +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "tmux-sessionizer"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "jrmoulton"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FSh3ww5KpktNSvqB3kcIaTxNHypwsVTHze0mgBtuJQE="; + }; + + cargoSha256 = "sha256-3DyLYegAzNbPpW6MUIDLm1QUqmGg8zH0Ps1dbdaSezs="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "The fastest way to manage projects as tmux sessions"; + homepage = "https://github.com/jrmoulton/tmux-sessionizer"; + license = licenses.mit; + maintainers = with maintainers; [ vinnymeller ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/via/default.nix b/third_party/nixpkgs/pkgs/tools/misc/via/default.nix index 4d1783b53a..5fd808cd1d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/via/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/via/default.nix @@ -2,12 +2,12 @@ let pname = "via"; - version = "2.1.0"; + version = "3.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "sha256-eVmaVD3W+ZEw3HkuZWKsd9XYhASP5+dxzVW64fOhqwk="; + sha256 = "sha256-+uTvmrqHK7L5VA/lUHCZZeRYPUrcVA+vjG7venxuHhs="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix index 45d7e95103..eda5790c7c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakatime"; - version = "1.68.3"; + version = "1.70.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - hash = "sha256-LifMxov7j2yRDtwh74RjjwfcHfFc/zWrzX96vb2hI9o="; + hash = "sha256-JURz3xPZIqrPreh+kT+o62cOhw55anUH4kqaT3t0tM0="; }; vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw="; @@ -22,15 +22,19 @@ buildGoModule rec { preCheck = let skippedTests = [ + # Tests requiring network "TestFileExperts" "TestSendHeartbeats" "TestSendHeartbeats_ExtraHeartbeats" "TestSendHeartbeats_IsUnsavedEntity" "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" + + # Flaky tests + "TestLoadParams_ApiKey_FromVault_Err_Darwin" ]; in '' - # Disable tests requiring network + # Disable tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix index aeb0f76109..56469e275e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b20"; + version = "2.0.0b21"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-9tYc8MlKZ1pzuGMipy827RoUJkU+C6UQz/Cex48UhLQ="; + hash = "sha256-x1ncWaNZ0MQ4hYCGnfwR4pU0Hp1IgiruxU8HMFL9dnk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix index e3ca1df480..84ad4e5675 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20230401"; + version = "20230404"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PVkdK1wcY3PaeixEG4StV1AmYPit6pQNErcALmV2LXc="; + sha256 = "sha256-nh59sfOWLk4evuIxa35bWu0J6xSUIzrPv4oQHWSZInA="; }; - vendorHash = "sha256-7h+rMfFFpcsfZa6tw/o0uRIDw4g3g+dwd9y2Ysg2NJc="; + vendorHash = "sha256-PYdR0vfgOgRheHDvoIC9jCFmfzCSOhxqcPFm+MqirsQ="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 0f5a2aebc9..788a2df8cf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor version}/eggdrop-${version}.tar.gz"; - hash = "sha256-DCh+N+h7XBidScnl2I9cwzhsmMB0MdPmAzgDwYkCltE="; + hash = "sha256-4mkY6opk2YV1ecW2DGYaM38gdz7dgwhrNWUlvrWBc2o="; }; buildInputs = [ tcl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index 2a1c3a962a..7aad400195 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.52.1"; + version = "1.53.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk="; + hash = "sha256-YRVWR1woMDoq8TWFrL2nqQvAbtqBnUd3QlfbFTJm8dc="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index adb8a0719a..8f22faf271 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-02-28T00-12-59Z"; + version = "2023-03-23T20-03-04Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-tQ6cKP/AYNk1vzODE2qIRaf9PLT+/9iSG3c0Vg9GhgQ="; + sha256 = "sha256-wiYgLtFemdB7Cc/hJDvBbjvxH4I9QQkOIdyyPzWO8w0="; }; - vendorHash = "sha256-ovOkFG8tRdQ0F+baXksDQuY4oL52wtokxasztrz2PcI="; + vendorHash = "sha256-VtBrxsfi2CUGzXSiHKLvr3Iw1myWyf3uPEQEZahjDhw="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index 2702c740dd..b51ea9e36e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -9,8 +9,8 @@ , python3 , qt5compat , qtbase -, qtcharts , qtnetworkauth +, qtsvg , qttools , qtwebsockets , rustPlatform @@ -21,13 +21,13 @@ let pname = "mozillavpn"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-moXCtAFJyNkotYxBZSRP24tNHy5Rb6YW7mSKHDn9oXk="; + hash = "sha256-4VoyBkJ5gm7/6j4XzgTvx9gHbCmukoYhb/cdEPvBtV0="; }; netfilter-go-modules = (buildGoModule { @@ -40,19 +40,19 @@ let inherit src; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-/gRP7Th2HnoEQU8psf0797Tq6md4+P5zR13z3U9xlrI="; + hash = "sha256-fOfi5f5lG5TZ6AbKSipCmgk7ZJXeEUoVSfEnoNchr8o="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-IBT7qTNbGVutR90wUhm7+9tLehDfrYDHTDkBz8hD6G0="; + hash = "sha256-Dsw5IUri9cCpyjYEbaj7JKXxFihAxtKXhVBlwcR+JUI="; }; vpngleanDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}-vpnglean"; preBuild = "cd vpnglean"; - hash = "sha256-vQDXsoKyawdVFIQZfH8LD+ehGk692ZcAwtou4OoqLNI="; + hash = "sha256-xqVizA9puASSZi7ppE4Q+SSOb6CsdB+VqlxvXjM6gCo="; }; in @@ -64,8 +64,8 @@ stdenv.mkDerivation { polkit qt5compat qtbase - qtcharts qtnetworkauth + qtsvg qtwebsockets ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix index 8c4bfa69b1..5cf8ea3fe6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3474.95"; + version = "1.3.3477.58"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-7V+hw/DfyRooef9gwZ5HjcfvabtA2HltJhwwSrQH0X4="; + sha256 = "sha256-XsYdmJINzeZgvofsKTG/4dXNv4r46FLkEmNGQki1tmU="; }; modRoot = "cli"; @@ -22,6 +22,6 @@ buildGoModule rec { description = "Pritunl OpenVPN client CLI"; homepage = "https://github.com/pritunl/pritunl-client-electron/tree/master/cli"; license = licenses.unfree; - maintainers = with maintainers; [ bigzilla ]; + maintainers = with maintainers; [ minizilla ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix index b425855480..0fc3897b87 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "ripe-atlas-tools"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = "ripe-atlas-tools"; rev = "refs/tags/v${version}"; - sha256 = "sha256-tNojduSNjJc8yOkDbuFLKoASqIV4P3mGuNbiIcf6Nac="; + hash = "sha256-aETSDXCVteTruRKV/8Aw3R/bprB6txOsXrFvoZOxIus="; }; postPatch = '' @@ -29,15 +29,16 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ + ipy + pyopenssl + python-dateutil + pyyaml + requests ripe-atlas-cousteau ripe-atlas-sagan - ujson - ipy - python-dateutil - requests + typing-extensions tzlocal - pyyaml - pyopenssl + ujson ]; preBuild = '' @@ -89,6 +90,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "RIPE ATLAS project tools"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-tools"; + changelog = "https://github.com/RIPE-NCC/ripe-atlas-tools/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ raitobezarius ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix new file mode 100644 index 0000000000..96a9b63e91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "sleep-on-lan"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "SR-G"; + repo = pname; + rev = "${version}-RELEASE"; + sha256 = "sha256-WooFGIdXIIoJPMqmPpnT+bc+P+IARMSxa3CvXY9++mw="; + }; + + sourceRoot = "source/src"; + vendorSha256 = "sha256-JqDDG53khtDdMLVOscwqi0oGviF+3DMkv5tkHvp1gJc="; + + ldflags = [ + "-s" + "-w" + "-X main.BuildVersion=${version}" + "-X main.BuildVersionLabel=nixpkgs" + ]; + + meta = with lib; { + homepage = "https://github.com/SR-G/sleep-on-lan"; + description = "Multi-platform process allowing to sleep on LAN a linux or windows computer, through wake-on-lan (reversed) magic packets or through HTTP REST requests."; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ devusb ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index 9b3b0eebd9..49cc4d2bed 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -3,6 +3,7 @@ expect, haskellPackages, installShellFiles, + lib }: let inherit (haskell.lib.compose) justStaticExecutables overrideCabal; overrides = { @@ -17,7 +18,14 @@ ''; mainProgram = "nom"; }; + nom-pkg = haskellPackages.callPackage ./generated-package.nix { }; + nom-pkg-with-scope = nom-pkg.overrideScope (hfinal: hprev: { + hermes-json = hfinal.hermes-json_0_2_0_1; + }); in - justStaticExecutables - (overrideCabal overrides - (haskellPackages.callPackage ./generated-package.nix {})) +lib.pipe + nom-pkg-with-scope + [ + (overrideCabal overrides) + justStaticExecutables + ] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix index 93ed524c7b..034b09620c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/harmonia/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.2.0"; + version = "0.6.0"; src = fetchFromGitHub { - owner = "helsinki-systems"; + owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-deqF6xDz3oCA1W8X8U1FD1gPYfxinZzpSuRKyaPDN/Y="; + hash = "sha256-BD61xBNlHvw3gsgfU2FgNsGpqkHbGZ+qvVfBYgQ1TJY="; }; - cargoHash = "sha256-eur3tg2w2WTA+JkOwTLwQzDZX7QN2xV4K0FIn7JN/rM="; + cargoHash = "sha256-xok7LutDrrN+lg+Nj8bG/XjMytybo+DOrd7o64PXBIE="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index ef43b2b9de..9cb9eec954 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, buildPackages +}: buildGoModule rec { pname = "nfpm"; @@ -15,6 +21,19 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = + let emulator = stdenv.hostPlatform.emulator buildPackages; + in '' + ${emulator} $out/bin/nfpm man > nfpm.1 + installManPage ./nfpm.1 + installShellCompletion --cmd nfpm \ + --bash <(${emulator} $out/bin/nfpm completion bash) \ + --fish <(${emulator} $out/bin/nfpm completion fish) \ + --zsh <(${emulator} $out/bin/nfpm completion zsh) + ''; + meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/zkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/zkg/default.nix new file mode 100644 index 0000000000..8abd58f7da --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/zkg/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchFromGitHub +, pkgs +}: + +python3.pkgs.buildPythonApplication rec { + pname = "zkg"; + version = "2.13.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "zeek"; + repo = "package-manager"; + rev = "refs/tags/v${version}"; + hash = "sha256-kQFm8VlbvJ791Ll8b0iu6xqaxhYTf41jTmvGxLgIzuE="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + btest + gitpython + semantic-version + sphinx + sphinx-rtd-theme + pkgs.bash + ]; + + # No tests available + doCheck = false; + + pythonImportsCheck = [ + "zeekpkg" + ]; + + meta = with lib; { + description = "Package manager for Zeek"; + homepage = "https://github.com/zeek/package-manager"; + changelog = "https://github.com/zeek/package-manager/blob/${version}/CHANGES"; + license = licenses.ncsa; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix b/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix index 785caa8f53..0f0901f372 100644 --- a/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/argocd-vault-plugin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-vault-plugin"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-BuPNmGWKvjWkMCyyAFZeSCcnBUeaoduw7fZe07WD3Jo="; + hash = "sha256-TIZpeCYj8i/RbWqYn6js70QtQsnAF0itHCs+2mjwuGg="; }; - vendorHash = "sha256-jxuYT63FxylQinJ9paPk/Ut0aFX5gdLOS4ugzrtRIF0="; + vendorHash = "sha256-awa3hbM9/9YR7amx/VVOEWgzK/l8OjOemDFpYojfOwg="; # integration tests require filesystem and network access for credentials doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix index ed0d3be6f7..c5f764120b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dalfox/default.nix @@ -5,20 +5,24 @@ buildGoModule rec { pname = "dalfox"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-+RCjudjbvc793sE2GCV/l23JD7ZqjNWhi7ZjUaCvTzw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-AG5CNqkxPQJQ+HN3JGUIgSYxgFigmUqVGn1yAHmo7Mo="; }; - vendorSha256 = "sha256-pLhTwbcMIqm7nrzypMs6yVrqtdCAoPrabTXsUtJ6Zls="; + vendorSha256 = "sha256-OLT85GOcTnWmU+ZRem2+vY29nzvzXhnmIN2W+U6phPk="; + + # Tests require network access + doCheck = false; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; homepage = "https://github.com/hahwul/dalfox"; + changelog = "https://github.com/hahwul/dalfox/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix index b4a108e8eb..00573070a3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.5"; + version = "0.8.1"; src = fetchFromGitHub { owner = "devploit"; repo = pname; - rev = version; - hash = "sha256-aVPmS4qIa9v7jnK1YG9EUV81frhu3/0x3zY7akPkpeg="; + rev = "refs/tags/${version}"; + hash = "sha256-Gpr2L7iSdMBqwMzdYDtdzyZYu+Uwjn1wZvw4LTr8xWI="; }; - vendorSha256 = "sha256-jF+CSmLHMdlFpttYf3pK84wdfFAHSVPAK8S5zunUzB0="; + vendorHash = "sha256-he/+M8NffvMLTdFQy5E2EnqLXkS/tK6eUGXTBKZSZCw="; meta = with lib; { description = "Tool to bypass 40X response codes"; homepage = "https://github.com/devploit/dontgo403"; + changelog = "https://github.com/devploit/dontgo403/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 42bb124c49..be2c7553b7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-26"; + version = "2023-03-30"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oUoQNjg14rAs8BAxTOLtYHw9iTwEAsLymObog+GrQw8="; + hash = "sha256-uaVuWU56EC+UdVR5GbKeUMVuxhsg5tDsXBXxaLtdG+w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix b/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix index 438c22f004..715f9fe885 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix @@ -18,6 +18,7 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "aiofiles" "msgspec" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index a9269eaac8..6790d75eb1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.59.1"; + version = "0.60.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6NQRmgbV/if0S5jYus5R5oFjLz5wwHpJppi/Tyz2FjY="; + hash = "sha256-CKaUNv4ymLksZ9zpI8jD4lC0keNNNSpUADSTo3evoIo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-eCvoTGETtB76ILnYKJ5ybtLbZUBMxX2w2CDczY05L0E="; + vendorHash = "sha256-2zZlURnArgHK/zfIxHoWn5W6mfd5T7CbAlSqDnal1Mw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/isolate/default.nix b/third_party/nixpkgs/pkgs/tools/security/isolate/default.nix new file mode 100644 index 0000000000..ae975dc78a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/isolate/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, asciidoc +, libcap +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "isolate"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "ioi"; + repo = "isolate"; + rev = "v${version}"; + hash = "sha256-fuv9HOw0XkRBRjwAp4b6LpoB5p7a+yo66AcT3B0yQUw="; + }; + + nativeBuildInputs = [ + asciidoc + installShellFiles + ]; + + buildInputs = [ + libcap.dev + ]; + + buildFlags = [ + "isolate" + "isolate.1" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 ./isolate $out/bin/isolate + installManPage isolate.1 + + runHook postInstall + ''; + + meta = { + description = "Sandbox for securely executing untrusted programs"; + homepage = "https://github.com/ioi/isolate"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ virchau13 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix index e32fdbf776..3eb6604a5a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "refs/tags/v${version}"; - hash = "sha256-QmUGSpuicJnrReAI/XSR8g1t6Tl0vZBUjemrQSO8CiY="; + hash = "sha256-st1SYWSwoFs0tzb1O5jDzCEYVmD6aVWkJTQZFxp+XfY="; }; - vendorHash = "sha256-YB2gZYoAyoIK44DTfHvYOyhNggkp4HaC2dvtCy2hc38="; + vendorHash = "sha256-b2v9PCxiYA965u3Xzfs/gEo1cFFvwsZbsLN5DuABs/U="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index acc82636f3..8f8991801f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config -, qtbase, qttranslations, qtsvg, wrapQtAppsHook }: +{ lib +, stdenv +, cmake +, fetchFromGitHub +, pkg-config +, qttranslations +, wrapQtAppsHook +, libnitrokey +, cppcodec +}: stdenv.mkDerivation rec { pname = "nitrokey-app"; @@ -9,24 +17,25 @@ stdenv.mkDerivation rec { owner = "Nitrokey"; repo = "nitrokey-app"; rev = "v${version}"; - sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv"; - fetchSubmodules = true; + hash = "sha256-c6EC5uuMna07xVHDRFq0UDwuSeopZTmZGZ9ZD5zaq8Y="; }; - buildInputs = [ - bash-completion - hidapi - libusb1 - qtbase - qttranslations - qtsvg - ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook + qttranslations + ]; + + cmakeFlags = [ + "-DADD_GIT_INFO=OFF" + "-DBASH_COMPLETION_PATH=share/bash-completion/completions" + ]; + + buildInputs = [ + libnitrokey + cppcodec ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; meta = with lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; @@ -37,6 +46,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Nitrokey/nitrokey-app"; license = licenses.gpl3; - maintainers = with maintainers; [ kaiha ]; + maintainers = with maintainers; [ kaiha panicgh ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/udev-rules.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/udev-rules.nix deleted file mode 100644 index 11dcd63d77..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, nitrokey-app }: - - -stdenv.mkDerivation { - name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}"; - - inherit (nitrokey-app) src; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/etc/udev/rules.d - cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d - ''; - - meta = { - description = "udev rules for Nitrokeys"; - inherit (nitrokey-app.meta) homepage license maintainers; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix index 68006a40da..2fcbd302e8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsc-safenet/default.nix @@ -1,38 +1,45 @@ { stdenv , lib -, fetchurl +, runCommand +, fetchzip , autoPatchelfHook , dpkg -, gtk2 -, openssl +, gtk3 +, openssl_1_1 , pcsclite +, unzip }: stdenv.mkDerivation rec { pname = "pcsc-safenet"; - version = "10.0.37-0"; + version = "10.8.28"; - # https://aur.archlinux.org/packages/sac-core/ - src = fetchurl { - url = "https://storage.spidlas.cz/public/soft/safenet/SafenetAuthenticationClient-core-${version}_amd64.deb"; - sha256 = "1r9739bhal7ramj1rpawaqvik45xbs1c756l1da96din638gzy5l"; - }; + debName = "Installation/Standard/Ubuntu-2004/safenetauthenticationclient_${version}_amd64.deb"; + + # extract debian package from larger zip file + src = + let + versionWithUnderscores = builtins.replaceStrings ["."] ["_"] version; + in fetchzip { + url = "https://www.digicert.com/StaticFiles/SAC_${versionWithUnderscores}_GA_Build.zip"; + hash = "sha256-7XWj3T9/KnmgQ05urOJV6dqgkAS/A2G7efnqjQO2ing="; + }; dontBuild = true; dontConfigure = true; unpackPhase = '' - dpkg-deb -x $src . + dpkg-deb -x "$src/$debName" . ''; buildInputs = [ - gtk2 - openssl + gtk3 + openssl_1_1 pcsclite ]; runtimeDependencies = [ - openssl + openssl_1_1 ]; nativeBuildInputs = [ @@ -41,35 +48,36 @@ stdenv.mkDerivation rec { ]; installPhase = '' - # Set up for pcsc drivers + mv usr/* . + mkdir -p pcsc/drivers - mv usr/share/eToken/drivers/* pcsc/drivers/ - rm -r usr/share/eToken/drivers + mv -- lib/pkcs11/* pcsc/drivers/ + rmdir lib/pkcs11 - # Move binaries out - mv usr/bin bin + mkdir "$out" + cp -r ./* "$out/" - # Move UI to bin - mv usr/share/SAC/SACUIProcess bin/ - rm -r usr/share/SAC + # for each library like libfoo.so.1.2.3, create symlinks to it from libfoo.so, libfoo.so.1, libfoo.so.1.2 + ( + cd "$out/lib/" || exit + for f in *.so.*.*.*; do # find library names with three-layer suffixes + ln -sf "$f" "''${f%.*}" || exit # strip only one suffix layer + ln -sf "$f" "''${f%.*.*}" || exit # strip two suffix layers + ln -sf "$f" "''${f%.*.*.*}" || exit # strip all three suffix layers + done + ) || exit - mkdir $out - cp -r {bin,etc,lib,pcsc,usr,var} $out/ + # when library links are missing in pcsc/drivers, create them + ( + cd "$out/pcsc/drivers" || exit + for f in *; do + if [[ ! -e $f && -e ../../lib/$f ]]; then + ln -sf ../../lib/"$f" "$f" || exit + fi + done + ) || exit - cd "$out/lib/" - ln -sf libeToken.so.10.0.37 libeTPkcs11.so - ln -sf libeToken.so.10.0.37 libeToken.so.10.0 - ln -sf libeToken.so.10.0.37 libeToken.so.10 - ln -sf libeToken.so.10.0.37 libeToken.so - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10.0 - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so.10 - ln -sf libcardosTokenEngine.so.10.0.37 libcardosTokenEngine.so - - cd $out/pcsc/drivers/aks-ifdh.bundle/Contents/Linux/ - ln -sf libAksIfdh.so.10.0 libAksIfdh.so - ln -sf libAksIfdh.so.10.0 libAksIfdh.so.10 - - ln -sf ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + ln -sf ${lib.getLib openssl_1_1}/lib/libcrypto.so $out/lib/libcrypto.so.1.1.0 ''; dontAutoPatchelf = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix index e18b849c34..9c3eec9e9f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pynitrokey/default.nix @@ -1,36 +1,36 @@ -{ python3Packages, lib, nrfutil }: +{ python3Packages, lib, nrfutil, libnitrokey }: with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.31"; + version = "0.4.34"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nqw5wUzQxKCBzYBRhqB6v7WWrF1Ojf8z6Kf1YUA9+wU="; + hash = "sha256-lMXoDkNiAmGb6e4u/vZMcmXUclwW402YUGihLjWIr+U="; }; propagatedBuildInputs = [ + certifi + cffi click cryptography ecdsa + frozendict fido2 intelhex + nkdfu nrfutil - pyserial + python-dateutil pyusb requests - pygments - python-dateutil spsdk + tqdm urllib3 - cffi - cbor - nkdfu - fido2 tlv8 + typing-extensions ]; nativeBuildInputs = [ @@ -39,7 +39,15 @@ buildPythonApplication rec { pythonRelaxDeps = [ "cryptography" + "python-dateutil" "spsdk" + "typing_extensions" + ]; + + # libnitrokey is not propagated to users of pynitrokey + # It is only usable from the wrapped bin/nitropy + makeWrapperArgs = [ + "--set LIBNK_PATH ${lib.makeLibraryPath [ libnitrokey ]}" ]; # no tests diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 7b6344d710..21952a3cda 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.7.0"; + version = "1.7.1"; src = fetchzip { url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz"; - sha256 = "sha256-8qNC6eB6RLrHAf2IFMLl6IHA0Akbn68eQF7P+Vo0nxU="; + sha256 = "sha256-xE3T3iVXFaaTF90ehQiG6+dLXcsqrHeprSMUnlSsxkE="; }; - cargoHash = "sha256-2O3o4VAKDrkhbPeFWNFGLr8oIM1oaFlFkbTYv8tGMgM="; + cargoHash = "sha256-eaG56FGz4smlqDPi/CJ0KB7NMEgp684X19PVWxGQutw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 7bfa0e0a19..f4be423a26 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.29.1"; + version = "3.30.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZCHrqvqIlANqkZ/zVYbwOsRimWVUAZ8zvBnfTaBE8qk="; + hash = "sha256-4h9obnh4+QNda0SoMPMFEyG0KnW4753RpXTPWi6yB34="; }; - vendorHash = "sha256-Z1QJM2feKFQ8MEVwzYt+MkpDZHiaVWlzq2lbResWQWk="; + vendorHash = "sha256-VBWzqfqte7aZ03HFW2L6wsEU84NBMTVrzKvdRUFGOro="; # Test cases run git clone and require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/Cargo.lock b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/Cargo.lock index 8bf1ee4272..6c893cad2c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/Cargo.lock @@ -2,56 +2,12 @@ # 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 = "aead" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "aho-corasick" version = "0.7.20" @@ -85,6 +41,28 @@ dependencies = [ "libc", ] +[[package]] +name = "argon2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +dependencies = [ + "base64ct", + "blake2", + "password-hash", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -100,35 +78,145 @@ dependencies = [ ] [[package]] -name = "async-stream" -version = "0.3.3" +name = "async-executor" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.3", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "libc", + "signal-hook", + "windows-sys 0.42.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", + "async-process", + "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-stream" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "async-trait" -version = "0.1.59" +name = "async-task" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] @@ -147,15 +235,10 @@ dependencies = [ ] [[package]] -name = "atty" -version = "0.2.14" +name = "atomic-waker" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "autocfg" @@ -163,27 +246,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "binascii" version = "0.1.4" @@ -197,14 +277,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.3" +name = "bitflags" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", +] + [[package]] name = "brotli" version = "3.3.4" @@ -218,9 +327,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -228,9 +337,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -240,22 +349,22 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cached" -version = "0.40.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b4147cd94d5fbdc2ab71b11d50a2f45493625576b3bb70257f59eedea69f3d" +checksum = "5e5877db5d1af7fae60d06b5db9430b68056a69b3582a0be8e3691e87654aeb6" dependencies = [ "async-trait", "async_once", "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown", + "hashbrown 0.13.2", "instant", "lazy_static", "once_cell", @@ -265,14 +374,15 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751f7f4e7a091545e7f6c65bacc404eaee7e87bfb1f9ece234a1caa173dc16f2" +checksum = "e10ca87c81aaa3a949dbbe2b5e6c2c45dbc94ba4897e45ea31ff9ec5087be3dc" dependencies = [ "cached_proc_macro_types", "darling", + "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -283,9 +393,9 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -295,9 +405,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "num-integer", @@ -328,16 +438,6 @@ dependencies = [ "phf_codegen", ] -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -349,19 +449,32 @@ dependencies = [ ] [[package]] -name = "cookie" -version = "0.16.1" +name = "concurrent-queue" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ - "aes-gcm", - "base64", - "hkdf", - "hmac", "percent-encoding", - "rand", - "sha2", - "subtle", "time", "version_check", ] @@ -372,7 +485,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e4b6aa369f41f5faa04bb80c9b1f4216ea81646ed6124d76ba5c49a7aafd9cd" dependencies = [ - "cookie", + "cookie 0.16.2", "idna 0.2.3", "log", "publicsuffix", @@ -388,7 +501,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca9b3c618262fc0c85ecbc814c144e04be9c6eec08b315e7cd1cfbe0bb6ca84" dependencies = [ - "cookie", + "cookie 0.16.2", "idna 0.3.0", "log", "publicsuffix", @@ -416,9 +529,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -445,9 +558,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -459,24 +572,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] [[package]] -name = "ctr" -version = "0.9.2" +name = "ctor" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "cipher", + "quote", + "syn 1.0.109", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038" dependencies = [ "cc", "cxxbridge-flags", @@ -486,9 +599,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca" dependencies = [ "cc", "codespan-reporting", @@ -496,31 +609,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.10", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -528,27 +641,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -558,7 +671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core", @@ -578,9 +691,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "devise" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" +checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8" dependencies = [ "devise_codegen", "devise_core", @@ -588,9 +701,9 @@ dependencies = [ [[package]] name = "devise_codegen" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" +checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" dependencies = [ "devise_core", "quote", @@ -598,24 +711,24 @@ dependencies = [ [[package]] name = "devise_core" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" +checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" dependencies = [ - "bitflags", + "bitflags 2.0.2", "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "diesel" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c186a7418a2aac330bb76cde82f16c36b03a66fb91db32d20214311f9f6545" +checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "chrono", "diesel_derives", @@ -630,14 +743,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b758c91dbc3fe1fdcb0dba5bd13276c6a66422f2ef5795b58488248a310aa" +checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -674,23 +787,23 @@ dependencies = [ [[package]] name = "dotenvy" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "email-encoding" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34dd14c63662e0206599796cd5e1ad0268ab2b9d19b868d6050d688eba2bbf98" +checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" dependencies = [ - "base64", + "base64 0.21.0", "memchr", ] @@ -705,9 +818,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -721,7 +834,39 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", ] [[package]] @@ -734,19 +879,25 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.8.0" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "fern" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" dependencies = [ "log", "syslog", @@ -808,9 +959,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" dependencies = [ "futures-channel", "futures-core", @@ -823,9 +974,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" dependencies = [ "futures-core", "futures-sink", @@ -833,15 +984,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" dependencies = [ "futures-core", "futures-task", @@ -850,32 +1001,47 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" [[package]] name = "futures-timer" @@ -885,9 +1051,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" dependencies = [ "futures-channel", "futures-core", @@ -903,15 +1069,15 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" dependencies = [ "cc", "libc", "log", "rustversion", - "windows", + "windows 0.44.0", ] [[package]] @@ -935,27 +1101,23 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gimli" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" - [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] [[package]] name = "governor" @@ -977,9 +1139,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -1002,9 +1164,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -1022,28 +1184,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "heck" -version = "0.4.0" +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" dependencies = [ "libc", ] [[package]] -name = "hkdf" -version = "0.12.3" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hmac" @@ -1076,9 +1241,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1110,9 +1275,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -1147,16 +1312,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -1198,12 +1363,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1213,15 +1378,6 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "instant" version = "0.1.12" @@ -1231,6 +1387,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "ipconfig" version = "0.3.1" @@ -1245,15 +1412,27 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix 0.36.11", + "windows-sys 0.45.0", +] [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jetscii" @@ -1263,9 +1442,9 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "job_scheduler_ng" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830ebb8320dcba49a2d081c36677d500bbbf9ab7e0500ddddadf88252bca3891" +checksum = "10bbdf445513bbe53f4666218b7057d265c76fa0b30475e121a6bf05dbaacaae" dependencies = [ "chrono", "cron", @@ -1274,20 +1453,20 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64", + "base64 0.21.0", "pem", "ring", "serde", @@ -1295,6 +1474,15 @@ dependencies = [ "simple_asn1", ] +[[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" @@ -1303,12 +1491,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lettre" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eabca5e0b4d0e98e7f2243fb5b7520b6af2b65d8f87bcc86f2c75185a6ff243" +checksum = "d8033576bf9f051fce6cb92b6264114b4340896c352a9ff38b67bd4cde924635" dependencies = [ + "async-std", "async-trait", - "base64", + "base64 0.21.0", "email-encoding", "email_address", "fastrand", @@ -1316,7 +1505,7 @@ dependencies = [ "futures-util", "hostname", "httpdate", - "idna 0.2.3", + "idna 0.3.0", "mime", "native-tls", "nom", @@ -1331,15 +1520,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.138" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libmimalloc-sys" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d1c67deb83e6b75fa4fe3309e09cfeade12e7721d95322af500d3814ea60c9" +checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" dependencies = [ "cc", "libc", @@ -1358,9 +1547,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -1371,6 +1560,18 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "linux-raw-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" + [[package]] name = "lock_api" version = "0.4.9" @@ -1388,6 +1589,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", + "value-bag", ] [[package]] @@ -1440,9 +1642,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" @@ -1473,18 +1675,18 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2374e2999959a7b583e1811a1ddbf1d3a4b9496eceb9746f1192a59d871eca" +checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" dependencies = [ "libmimalloc-sys", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -1503,20 +1705,21 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "multer" version = "2.0.4" -source = "git+https://github.com/BlackDex/multer-rs?rev=477d16b7fa0f361b5c2a5ba18a5b28bec6d26a8a#477d16b7fa0f361b5c2a5ba18a5b28bec6d26a8a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" dependencies = [ "bytes", "encoding_rs", @@ -1526,7 +1729,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.4", + "spin 0.9.6", "tokio", "tokio-util", "version_check", @@ -1568,9 +1771,9 @@ checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -1611,7 +1814,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1635,11 +1838,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -1652,34 +1855,19 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.44" +version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" +checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1696,7 +1884,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1707,18 +1895,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.24.0+1.1.1s" +version = "111.25.2+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.79" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" dependencies = [ "autocfg", "cc", @@ -1734,6 +1922,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1746,15 +1940,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1767,16 +1961,27 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.10" +name = "password-hash" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pear" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" +checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8" dependencies = [ "inlinable_string", "pear_codegen", @@ -1785,23 +1990,23 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" +checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -1812,9 +2017,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" +checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" dependencies = [ "thiserror", "ucd-trie", @@ -1822,9 +2027,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" +checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" dependencies = [ "pest", "pest_generator", @@ -1832,26 +2037,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" +checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pest_meta" -version = "2.5.1" +version = "2.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" +checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" dependencies = [ "once_cell", "pest", - "sha1", + "sha2", ] [[package]] @@ -1917,15 +2122,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] -name = "polyval" -version = "0.6.0" +name = "polling" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] @@ -1952,7 +2161,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1967,30 +2176,24 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] [[package]] name = "proc-macro2-diagnostics" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", "version_check", "yansi", ] @@ -2035,18 +2238,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20f14e071918cbeefc5edc986a7aa92c425dae244e003a35e1cdddb5ca39b5cb" +checksum = "a24039f627d8285853cc90dcddf8c1ebfaa91f834566948872b225b9a28ed1b6" [[package]] name = "r2d2" @@ -2091,11 +2294,11 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.6.0" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2104,34 +2307,34 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -2149,29 +2352,20 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "async-compression", - "base64", + "base64 0.21.0", "bytes", - "cookie", + "cookie 0.16.2", "cookie_store 0.16.1", "encoding_rs", "futures-core", @@ -2189,7 +2383,6 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "proc-macro-hack", "serde", "serde_json", "serde_urlencoded", @@ -2202,6 +2395,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "winreg", ] @@ -2254,20 +2448,20 @@ dependencies = [ [[package]] name = "rocket" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" +checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" dependencies = [ "async-stream", "async-trait", "atomic", - "atty", "binascii", "bytes", "either", "figment", "futures", "indexmap", + "is-terminal", "log", "memchr", "multer", @@ -2293,9 +2487,9 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" +checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" dependencies = [ "devise", "glob", @@ -2303,17 +2497,17 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn", + "syn 2.0.10", "unicode-xid", ] [[package]] name = "rocket_http" -version = "0.5.0-rc.2" +version = "0.5.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" +checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" dependencies = [ - "cookie", + "cookie 0.17.0", "either", "futures", "http", @@ -2338,16 +2532,59 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.21" +name = "rpassword" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rustix" +version = "0.36.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "io-lifetimes", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.0", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.0", + "windows-sys 0.45.0", +] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -2357,24 +2594,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -2387,19 +2624,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "scheduled-thread-pool" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ "parking_lot", ] @@ -2418,9 +2654,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -2434,11 +2670,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2447,9 +2683,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -2457,15 +2693,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -2482,20 +2718,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -2557,10 +2793,20 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.0" +name = "signal-hook" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -2585,9 +2831,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -2600,9 +2846,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -2616,9 +2862,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" [[package]] name = "stable-pattern" @@ -2652,9 +2898,20 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ "proc-macro2", "quote", @@ -2676,53 +2933,53 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix 0.36.11", + "windows-sys 0.42.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.10", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -2737,9 +2994,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "libc", @@ -2757,9 +3014,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -2775,15 +3032,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.23.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -2796,7 +3053,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2807,14 +3064,14 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -2845,9 +3102,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -2868,9 +3125,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -2882,9 +3139,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -2928,7 +3185,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3017,9 +3274,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" @@ -3027,7 +3284,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -3073,15 +3330,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -3104,16 +3361,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "universal-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -3140,9 +3387,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" dependencies = [ "getrandom", ] @@ -3153,16 +3400,26 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.0.0-alpha.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +dependencies = [ + "ctor", + "version_check", +] + [[package]] name = "vaultwarden" version = "1.0.0" dependencies = [ - "backtrace", + "argon2", "bytes", "cached", "chrono", "chrono-tz", - "cookie", + "cookie 0.16.2", "cookie_store 0.19.0", "dashmap", "data-encoding", @@ -3196,6 +3453,7 @@ dependencies = [ "ring", "rmpv", "rocket", + "rpassword", "semver", "serde", "serde_json", @@ -3208,6 +3466,7 @@ dependencies = [ "url", "uuid", "webauthn-rs", + "which", "yubico", ] @@ -3224,13 +3483,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "walkdir" -version = "2.3.2" +name = "waker-fn" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -3258,9 +3522,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3268,24 +3532,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -3295,9 +3559,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3305,28 +3569,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -3338,7 +3615,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90b266eccb4b32595876f5c73ea443b0516da0b1df72ca07bc08ed9ba7f96ec1" dependencies = [ - "base64", + "base64 0.13.1", "nom", "openssl", "rand", @@ -3361,6 +3638,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "widestring" version = "0.5.1" @@ -3400,28 +3688,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", + "windows-targets", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets", ] [[package]] @@ -3431,115 +3711,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winreg" @@ -3562,7 +3806,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "173f75d2c4010429a2d74ae3a114a69930c59e2b1a4c97b1c75d259a4960d5fb" dependencies = [ - "base64", + "base64 0.13.1", "form_urlencoded", "futures", "hmac", diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index a98d6beb9a..a31f5e45c4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -9,20 +9,17 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-QvU1Y3syr6PZbTRebbZF4sEzI4lIj1enJe2F/gGfvQM="; + hash = "sha256-ML5eblQUk4xMYbBeLxk9tNxi7N4ltrCjMG0oM9zL6JI="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "multer-2.0.4" = "sha256-962onbcPUjkoIGSQTnF8m1fkamwThpPj4uBJ8EqbouQ="; - }; }; nativeBuildInputs = [ pkg-config ]; @@ -46,7 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; - license = licenses.gpl3Only; + license = licenses.agpl3Only; maintainers = with maintainers; [ msteen ivan ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/update.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/update.nix index 44af26ada0..c2c03413cc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/update.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/update.nix @@ -20,10 +20,8 @@ writeShellScript "update-vaultwarden" '' URL="https://raw.githubusercontent.com/dani-garcia/vaultwarden/''${VAULTWARDEN_VERSION}/docker/Dockerfile.j2" WEBVAULT_VERSION=$(curl --silent "$URL" | grep "set vault_version" | sed -E "s/.*\"v([^\"]+)\".*/\\1/") - old_hash_bw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.src.outputHash) - old_hash_vw=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) - new_hash_bw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/bitwarden/clients.git --rev "web-v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) - new_hash_vw=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) - sed -e "s#$old_hash_bw#$new_hash_bw#" -e "s#$old_hash_vw#$new_hash_vw#" -i pkgs/tools/security/vaultwarden/webvault.nix + old_hash=$(nix --extra-experimental-features nix-command eval -f default.nix --raw vaultwarden.webvault.bw_web_builds.outputHash) + new_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $(nix-prefetch-git https://github.com/dani-garcia/bw_web_builds.git --rev "v$WEBVAULT_VERSION" | jq --raw-output ".sha256")) + sed -e "s#$old_hash#$new_hash#" -i pkgs/tools/security/vaultwarden/webvault.nix nix-update "vaultwarden.webvault" --version "$WEBVAULT_VERSION" '' diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix index 28b60517ad..43de28a914 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix @@ -10,30 +10,30 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; - version = "2022.12.0"; + version = "2023.3.0b"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-4yUE0ySUCKmmbca+T8qjqSO0AHZEUAHZ4nheRjpDnZo="; + hash = "sha256-3kCgT+NsYU7sRJvw56vcPXS7j+eHxgek195zZnamjJw="; }; -in buildNpmPackage' { +in buildNpmPackage' rec { pname = "vaultwarden-webvault"; inherit version; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; - rev = "web-v${version}"; - hash = "sha256-CsbnnP12P7JuGDOm5Ia73SzET/jCx3qRbz9vdUf7lCA="; + rev = "web-v${lib.removeSuffix "b" version}"; + hash = "sha256-pSaFksfdxVx7vaozR5h+wpPB42qVgs+aXhV7HGFq71E="; }; - npmDepsHash = "sha256-wWOtVGNOzY2s82nfQDuWgA4ukpJxJr8Z7Y+rFPq2QdU="; + npmDepsHash = "sha256-ZHbKq7EseYNTWjKi+W66WinmReZbpn3kJB3g0N2z4ww="; postPatch = '' ln -s ${bw_web_builds}/{patches,resources} .. - PATH="${git}/bin:$PATH" VAULT_VERSION=${bw_web_builds.rev} \ + PATH="${git}/bin:$PATH" VAULT_VERSION="${lib.removePrefix "web-" src.rev}" \ bash ${bw_web_builds}/scripts/apply_patches.sh ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix index 367123fad2..35c69b8efd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.1.6"; + version = "3.1.7"; format = "setuptools"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc="; + hash = "sha256-muAugc0BgVSER2LSRv7ATbCqpXID8/WH+hfhmtoS36o="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index 88c1bc15b8..159e32e7fd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.75"; + version = "1.0.78"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-soEVET3aVK77UJjhXq/cwK9QWAJWQu5TEjyHEKfqKeY="; + sha256 = "sha256-dYRg2WhPpNL20IrpWK2KuzVSBd/8Mq+CHvtp/RRAQqA="; }; - cargoHash = "sha256-xux+8hix2FzZqxOmos1g0SAcVVajJUCO9qGl0LNtOlk="; + cargoHash = "sha256-5x8DXojoPN4qFxGWrtD2ieSkkwmnKdw85JsnpvmFxRM="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix index 09a4a3e4ef..7e3f1fb29c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocm-smi"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix b/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix index 3f751dc4d7..098f4c5e20 100644 --- a/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-ZKIqjeRsNTQYaa5itBSnqQ1w54Yq/iY2EQfDN713KGM="; + sha256 = "sha256-VnCR09yu2b3zDWpSYQvJ18XNKuZaVtQ6JFnE7kNVips="; }; - cargoSha256 = "sha256-Xafdt4AGympN6CLctOWfbCNfhwp4XN6XmSYESgjhRPk="; + cargoSha256 = "sha256-HHy8dm0aiREfqcKK51aW/j1AoJVq+4zOpQe2rvT1YNc="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix b/third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix index 2609ca84b7..69375e0839 100644 --- a/third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/nerdfix/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nerdfix"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "loichyan"; repo = "nerdfix"; rev = "v${version}"; - hash = "sha256-p6SXdMniUoAUcX4xQYBJ0Yfs0N29wITO0d7GpxavQP0="; + hash = "sha256-HNd2wx1nUzPPs+wQBU4FOgDBq4mcyigEPtGpT44VPzo="; }; - cargoHash = "sha256-GMpl4Gw9sbS2WEbf435fipYTghmJ8VsayiWxH1PhxA0="; + cargoHash = "sha256-rTDMg9TKHNqLjQztT/AhDYWNZjrRUk+/LM34ofYr/Ws="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock b/third_party/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock index fe52185931..c595674ad6 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock @@ -58,8 +58,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "biblatex" -version = "0.6.3" -source = "git+https://github.com/typst/biblatex#932ad283dd45dd88d4fa14dc5b9bda7a270ba027" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc17a7f4d461f93f5dbbae4c961746cb4aafb5c6c1a61089a86836614932a3c" dependencies = [ "chrono", "numerals", @@ -159,8 +160,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "comemo" -version = "0.1.0" -source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22bf2c21093020535dd771993fedae8dd55393a4258cca501a9b55a962d350a5" dependencies = [ "comemo-macros", "siphasher", @@ -168,8 +170,9 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.1.0" -source = "git+https://github.com/typst/comemo#9b520e8f5284d1c39d0bb13eb426f923972775f8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9faa23f4534253fa656b176ff524d5cd7306a6fed3048929f9cc01ab38ab5a5a" dependencies = [ "proc-macro2", "quote", @@ -430,8 +433,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hayagriva" -version = "0.1.1" -source = "git+https://github.com/typst/hayagriva#754efb7e1034bcd4d4f1366e432197edbbfb9ed5" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f939b9606af811242f770582c89a2f8bb5de4e531c0a1df9d2d4906bcbc32a" dependencies = [ "biblatex", "chrono", @@ -844,7 +848,8 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" [[package]] name = "pixglyph" version = "0.1.0" -source = "git+https://github.com/typst/pixglyph#e3ff0272d6723cdada91a00b0c99cda0e5adb56d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eefadd393715fe315c8cdcd587f893b818a6dfe4f6f9faeb44b764c7c38fd8b" dependencies = [ "ttf-parser 0.18.1", ] @@ -1500,7 +1505,8 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-math-class" version = "0.1.0" -source = "git+https://github.com/typst/unicode-math-class#a7ac7dd75cd79ab2e0bdb629036cb913371608d2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/typst/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/typst/default.nix index 0e4cdfcb9a..ed5473892e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/typst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/typst/default.nix @@ -7,25 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "23-03-21-2"; + version = "23-03-28"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-bJPGs/Bd9nKYDrCCaFT+20+1wTN4YdkV8bGrtOCR4tM="; + hash = "sha256-0fTGbXdpzPadABWqdReQNZf2N7OMZ8cs9U5fmhfN6m4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "biblatex-0.6.3" = "sha256-TfH2tk7B61HHqpdGY48TdPKelp4+78x+8LRFobAg8QA="; - "comemo-0.1.0" = "sha256-zg056kUc8sVLQ8vvT4uOuRJnyrCORsGYUvsjBJEkFPg="; - "hayagriva-0.1.1" = "sha256-HGQ+jNAnejxUBQNaqXPw57zfAC3qNXSWUVzDALZTXg0="; "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; "lipsum-0.8.2" = "sha256-deIbpn4YM7/NeuJ5Co48ivJmxwrcsbLl6c3cP3JZxAQ="; - "pixglyph-0.1.0" = "sha256-8veNF3rzV21ayzk9gh2x0mQA8nHGM662ohvh084a0vk="; - "unicode-math-class-0.1.0" = "sha256-NkwDzj1SfUe570UcfotmVP6bIEYwiegZd0j8TPEWoOk="; }; }; @@ -36,20 +31,13 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "typst-cli" ]; cargoTestFlags = [ "-p" "typst-cli" ]; - # the build script tries to get the revision using git - # which overwrites the environment variable set below - postPatch = '' - rm cli/build.rs - ''; - - # git revision used for `--version` - # https://github.com/typst/typst/blob/b934a2fd83d63fc115c01f959e888c7bc1aa87e4/cli/build.rs#L7 - TYPST_HASH = "b934a2fd"; + # https://github.com/typst/typst/blob/056d15a/cli/src/main.rs#L164 + TYPST_VERSION = version; meta = with lib; { description = "A new markup-based typesetting system that is powerful and easy to learn"; homepage = "https://typst.app"; license = licenses.asl20; - maintainers = with maintainers; [ figsoda kanashimia ]; + maintainers = with maintainers; [ drupol figsoda kanashimia ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 47b59353af..164605b3d8 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -22,8 +22,8 @@ ocamlPackages.buildDunePackage rec { ''; minimalOCamlVersion = "4.12"; + duneVersion = "3"; - strictDeps = true; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index c4bf8208bb..d6108f66e2 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -1073,6 +1073,7 @@ mapAliases ({ nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 + nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # Added 2019-12-22 nixFlakes = nixVersions.stable; # Added 2021-05-21 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 949be75114..dd40bcca3e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -402,6 +402,8 @@ with pkgs; cewl = callPackage ../tools/security/cewl { }; + chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { }; + checkov = callPackage ../development/tools/analysis/checkov { python3 = python311; }; @@ -711,12 +713,10 @@ with pkgs; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; dotnet-sdk_8 = dotnetCorePackages.sdk_8_0; - dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; dotnet-runtime_8 = dotnetCorePackages.runtime_8_0; - dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; dotnet-aspnetcore_8 = dotnetCorePackages.aspnetcore_8_0; @@ -6378,6 +6378,8 @@ with pkgs; cloc = callPackage ../tools/misc/cloc { }; + clolcat = callPackage ../tools/misc/clolcat { }; + cloog = callPackage ../development/libraries/cloog { isl = isl_0_14; }; @@ -9448,6 +9450,8 @@ with pkgs; l3afpad = callPackage ../applications/editors/l3afpad { }; + leanify = callPackage ../tools/misc/leanify { }; + leatherman = callPackage ../development/libraries/leatherman { }; ledit = callPackage ../tools/misc/ledit { @@ -10924,6 +10928,10 @@ with pkgs; patchage = callPackage ../applications/audio/patchage { }; + patchance = python3Packages.callPackage ../applications/audio/patchance { + inherit (qt5) qttools; + }; + patatt = callPackage ../development/tools/patatt { }; pcapfix = callPackage ../tools/networking/pcapfix { }; @@ -11176,6 +11184,8 @@ with pkgs; podman-tui = callPackage ../applications/virtualization/podman-tui { }; + podman-desktop = callPackage ../applications/virtualization/podman-desktop {}; + pods = callPackage ../applications/virtualization/pods { }; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; @@ -11366,6 +11376,10 @@ with pkgs; pystring = callPackage ../development/libraries/pystring { }; + raysession = python3Packages.callPackage ../applications/audio/raysession { + inherit (qt5) qttools; + }; + rbw = callPackage ../tools/security/rbw { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12424,6 +12438,8 @@ with pkgs; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; + svu = callPackage ../tools/misc/svu { }; + ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -12807,6 +12823,10 @@ with pkgs; tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { }; + tmux-sessionizer = callPackage ../tools/misc/tmux-sessionizer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); @@ -15581,8 +15601,9 @@ with pkgs; muonlang = callPackage ../development/compilers/muonlang { }; - inherit (callPackages ../development/compilers/nim { }) - nim-unwrapped nimble-unwrapped nim; + inherit (callPackages ../development/compilers/nim + { inherit (darwin) Security; } + ) nim-unwrapped nimble-unwrapped nim; nimPackages = recurseIntoAttrs nim.pkgs; nrpl = callPackage ../development/tools/nrpl { }; @@ -17274,6 +17295,8 @@ with pkgs; svls = callPackage ../development/tools/language-servers/svls { }; + typst-lsp = callPackage ../development/tools/language-servers/typst-lsp { }; + vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { }; verible = callPackage ../development/tools/language-servers/verible { }; @@ -18733,6 +18756,8 @@ with pkgs; rsass = callPackage ../development/tools/misc/rsass { }; + rsonpath = callPackage ../development/tools/misc/rsonpath { }; + rufo = callPackage ../development/tools/rufo { }; samurai = callPackage ../development/tools/build-managers/samurai { }; @@ -19462,6 +19487,10 @@ with pkgs; ccrtp = callPackage ../development/libraries/ccrtp { }; + cctag = callPackage ../development/libraries/cctag { + tbb = tbb_2021_8; + }; + cctz = callPackage ../development/libraries/cctz { inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -19608,6 +19637,8 @@ with pkgs; cppcms = callPackage ../development/libraries/cppcms { }; + cppcodec = callPackage ../development/libraries/cppcodec { }; + cppunit = callPackage ../development/libraries/cppunit { }; cpputest = callPackage ../development/libraries/cpputest { }; @@ -21611,6 +21642,8 @@ with pkgs; libnice = callPackage ../development/libraries/libnice { }; + libnitrokey = callPackage ../development/libraries/libnitrokey { }; + libnsl = callPackage ../development/libraries/libnsl { }; liboping = callPackage ../development/libraries/liboping { }; @@ -25416,6 +25449,8 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; + rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; + OVMF = callPackage ../applications/virtualization/OVMF { }; OVMFFull = callPackage ../applications/virtualization/OVMF { secureBoot = true; @@ -25452,13 +25487,26 @@ with pkgs; postgresql_13 postgresql_14 postgresql_15 + + postgresql_11_jit + postgresql_12_jit + postgresql_13_jit + postgresql_14_jit + postgresql_15_jit ; postgresql = postgresql_14.override { this = postgresql; }; + postgresql_jit = postgresql_14_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; postgresql15Packages = recurseIntoAttrs postgresql_15.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; + postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs; postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -28694,8 +28742,8 @@ with pkgs; }; audaciousQt5 = audacious; - audacity = darwin.apple_sdk_11_0.callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudioKit; + audacity = callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit CoreAudioKit; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -30622,6 +30670,8 @@ with pkgs; jay = callPackage ../applications/window-managers/jay { }; + keyleds = callPackage ../applications/misc/keyleds { }; + keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { }; leftwm = callPackage ../applications/window-managers/leftwm { }; @@ -30695,6 +30745,8 @@ with pkgs; slack-term = callPackage ../applications/networking/instant-messengers/slack-term { }; + sleep-on-lan = callPackage ../tools/networking/sleep-on-lan { }; + slweb = callPackage ../applications/misc/slweb { }; sonixd = callPackage ../applications/audio/sonixd { }; @@ -30854,6 +30906,8 @@ with pkgs; ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; + identity = callPackage ../applications/graphics/identity { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -32123,10 +32177,7 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus { }; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { - # fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859 - fmt = fmt_8; - }; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; @@ -32585,7 +32636,9 @@ with pkgs; enableDbusUi = false; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; + parsec-bin = callPackage ../applications/misc/parsec/bin.nix { + ffmpeg = ffmpeg_4; + }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -33262,6 +33315,8 @@ with pkgs; shadowfox = callPackage ../tools/networking/shadowfox { }; + shell_gpt = callPackage ../tools/misc/shell_gpt { }; + shfmt = callPackage ../tools/text/shfmt { }; shipments = callPackage ../applications/misc/shipments { }; @@ -33614,6 +33669,7 @@ with pkgs; syncterm = callPackage ../applications/terminal-emulators/syncterm { }; inherit (callPackages ../applications/networking/syncthing { + inherit (darwin) autoSignDarwinBinariesHook; buildGoModule = buildGo119Module; # go 1.20 build failure }) syncthing @@ -33887,6 +33943,8 @@ with pkgs; tonelib-metal = callPackage ../applications/audio/tonelib-metal { }; + tonelib-noisereducer = callPackage ../applications/audio/tonelib-noisereducer { }; + tony = libsForQt5.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -36074,6 +36132,8 @@ with pkgs; raylib-games = callPackage ../games/raylib-games { }; + raycast = callPackage ../os-specific/darwin/raycast { }; + redeclipse = callPackage ../games/redeclipse { }; rftg = callPackage ../games/rftg { }; @@ -36402,6 +36462,8 @@ with pkgs; xcowsay = callPackage ../games/xcowsay { }; + xgalagapp = callPackage ../games/xgalaga++ { }; + xjump = callPackage ../games/xjump { }; xmoto = callPackage ../games/xmoto { }; @@ -39131,6 +39193,8 @@ with pkgs; xbps = callPackage ../tools/package-management/xbps { }; + zkg = callPackage ../tools/package-management/zkg { }; + xcftools = callPackage ../tools/graphics/xcftools { }; xhyve = callPackage ../applications/virtualization/xhyve { @@ -39309,7 +39373,6 @@ with pkgs; pynitrokey = callPackage ../tools/security/pynitrokey { }; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -39676,4 +39739,6 @@ with pkgs; duden = callPackage ../applications/misc/duden { }; zf = callPackage ../tools/misc/zf { }; + + isolate = callPackage ../tools/security/isolate { }; } diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 0b9148d2bb..ca25f9beef 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -76,15 +76,16 @@ let mathcomp-field = self.mathcomp.field; mathcomp-character = self.mathcomp.character; mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {}; + mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {}; mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {}; + mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {}; + mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-classical = self.mathcomp-analysis.classical; mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; - mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; + mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {}; mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; - mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {}; - mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; metacoq = callPackage ../development/coq-modules/metacoq { }; metacoq-template-coq = self.metacoq.template-coq; metacoq-pcuic = self.metacoq.pcuic; @@ -112,10 +113,12 @@ let trakt = callPackage ../development/coq-modules/trakt {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST (lib.optionalAttrs + VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override { version = "3.11"; }; - }); + }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { + ITree = self.ITree.override { version = "4.0.0"; }; + })); zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {}; filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index cbb4581126..3754c8a004 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -649,6 +649,7 @@ in { # Derive one of the default .config files linuxConfig = { src, + kernelPatches ? [], version ? (builtins.parseDrvName src.name).version, makeTarget ? "defconfig", name ? "kernel.config", @@ -656,6 +657,7 @@ in { inherit name src; depsBuildBuild = [ buildPackages.stdenv.cc ] ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + patches = map (p: p.patch) kernelPatches; # Patches may include new configs. postPatch = '' patchShebangs scripts/ ''; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index a8afc883fc..492e5baf70 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -5217,11 +5217,11 @@ let }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; + OPENSSL_PREFIX = pkgs.openssl; buildInputs = [ CryptOpenSSLGuess ]; meta = { description = "OpenSSL/LibreSSL pseudo-random number generator access"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.isDarwin && stdenv.isAarch64; # errors with: 74366 Abort trap: 6 }; }; @@ -5235,6 +5235,7 @@ let propagatedBuildInputs = [ CryptOpenSSLRandom ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; + OPENSSL_PREFIX = pkgs.openssl; buildInputs = [ CryptOpenSSLGuess ]; meta = { description = "RSA encoding and decoding, using the openSSL libraries"; @@ -5251,6 +5252,7 @@ let }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; + OPENSSL_PREFIX = pkgs.openssl; buildInputs = [ CryptOpenSSLGuess ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 7b04f6296d..2ac61fd5bb 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -985,6 +985,8 @@ self: super: with self; { azure-mgmt-extendedlocation = callPackage ../development/python-modules/azure-mgmt-extendedlocation { }; + azure-mgmt-frontdoor = callPackage ../development/python-modules/azure-mgmt-frontdoor { }; + azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { }; azure-mgmt-hdinsight = callPackage ../development/python-modules/azure-mgmt-hdinsight { }; @@ -1477,6 +1479,8 @@ self: super: with self; { btchip-python = callPackage ../development/python-modules/btchip-python { }; + btest = callPackage ../development/python-modules/btest { }; + bthome-ble = callPackage ../development/python-modules/bthome-ble { }; bt-proximity = callPackage ../development/python-modules/bt-proximity { }; @@ -2578,6 +2582,8 @@ self: super: with self; { django-celery-results = callPackage ../development/python-modules/django-celery-results { }; + django-ckeditor = callPackage ../development/python-modules/django-ckeditor { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; @@ -2667,6 +2673,8 @@ self: super: with self; { django-paintstore = callPackage ../development/python-modules/django-paintstore { }; + django-pattern-library = callPackage ../development/python-modules/django-pattern-library { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { }; @@ -2873,6 +2881,8 @@ self: super: with self; { dpkt = callPackage ../development/python-modules/dpkt { }; + draftjs-exporter = callPackage ../development/python-modules/draftjs-exporter { }; + dragonfly = callPackage ../development/python-modules/dragonfly { }; drawille = callPackage ../development/python-modules/drawille { }; @@ -3306,6 +3316,8 @@ self: super: with self; { faraday-plugins = callPackage ../development/python-modules/faraday-plugins { }; + farama-notifications = callPackage ../development/python-modules/farama-notifications { }; + fastai = callPackage ../development/python-modules/fastai { }; fastapi = callPackage ../development/python-modules/fastapi { }; @@ -4268,6 +4280,8 @@ self: super: with self; { gym-notices = callPackage ../development/python-modules/gym-notices { }; + gymnasium = callPackage ../development/python-modules/gymnasium { }; + gyp = callPackage ../development/python-modules/gyp { }; h11 = callPackage ../development/python-modules/h11 { }; @@ -4608,6 +4622,8 @@ self: super: with self; { icecream = callPackage ../development/python-modules/icecream { }; + iceportal = callPackage ../development/python-modules/iceportal { }; + icmplib = callPackage ../development/python-modules/icmplib { }; icnsutil = callPackage ../development/python-modules/icnsutil { }; @@ -4918,6 +4934,8 @@ self: super: with self; { jax = callPackage ../development/python-modules/jax { }; + jax-jumpy = callPackage ../development/python-modules/jax-jumpy { }; + jaxlib-bin = callPackage ../development/python-modules/jaxlib/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; }; @@ -5291,6 +5309,8 @@ self: super: with self; { kubernetes = callPackage ../development/python-modules/kubernetes { }; + l18n = callPackage ../development/python-modules/l18n { }; + labelbox = callPackage ../development/python-modules/labelbox { }; labgrid = callPackage ../development/python-modules/labgrid { }; @@ -7143,6 +7163,8 @@ self: super: with self; { periodictable = callPackage ../development/python-modules/periodictable { }; + permissionedforms = callPackage ../development/python-modules/permissionedforms { }; + persim = callPackage ../development/python-modules/persim { }; persistent = callPackage ../development/python-modules/persistent { }; @@ -11477,6 +11499,8 @@ self: super: with self; { telegraph = callPackage ../development/python-modules/telegraph { }; + telepath = callPackage ../development/python-modules/telepath { }; + telethon = callPackage ../development/python-modules/telethon { inherit (pkgs) openssl; }; @@ -12403,6 +12427,12 @@ self: super: with self; { wadllib = callPackage ../development/python-modules/wadllib { }; + wagtail = callPackage ../development/python-modules/wagtail { }; + + wagtail-factories = callPackage ../development/python-modules/wagtail-factories { }; + + wagtail-localize = callPackage ../development/python-modules/wagtail-localize { }; + waitress = callPackage ../development/python-modules/waitress { }; waitress-django = callPackage ../development/python-modules/waitress-django { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 8bd38359f9..030739893b 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -43,6 +43,19 @@ let ) jobList; # names of all subsets of `pkgs.haskell.packages` + # + # compilerNames looks like the following: + # + # ``` + # { + # ghc810 = "ghc810"; + # ghc8102Binary = "ghc8102Binary"; + # ghc8102BinaryMinimal = "ghc8102BinaryMinimal"; + # ghc8107 = "ghc8107"; + # ghc924 = "ghc924"; + # ... + # } + # ``` compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages; # list of all compilers to test specific packages on @@ -55,9 +68,26 @@ let ghc926 ghc927 ghc944 + ghc961 ]; # packagePlatforms applied to `haskell.packages.*` + # + # This returns an attr set that looks like the following, where each Haskell + # package in the compiler attr set has its list of supported platforms as its + # value. + # + # ``` + # { + # ghc810 = { + # conduit = [ ... ]; + # lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ] + # ... + # }; + # ghc902 = { ... }; + # ... + # } + # ``` compilerPlatforms = lib.mapAttrs (_: v: packagePlatforms v) pkgs.haskell.packages; @@ -65,16 +95,86 @@ let # This function lets you specify specific packages # which are to be tested on a list of specific GHC # versions and returns a job set for all specified - # combinations. See `jobs` below for an example. + # combinations. + # + # You can call versionedCompilerJobs like the following: + # + # ``` + # versionedCompilerJobs { + # ghc-tags = ["ghc902" "ghc924"]; + # } + # ``` + # + # This would produce an output like the following: + # + # ``` + # { + # haskell.packages = { + # ghc884 = {}; + # ghc810 = {}; + # ghc902 = { + # ghc-tags = { + # aarch64-darwin = ; + # aarch64-linux = ; + # ... + # }; + # }; + # ghc924 = { + # ghc-tags = { ... }; + # }; + # ... + # }; + # } + # ``` versionedCompilerJobs = config: mapTestOn { haskell.packages = - (lib.mapAttrs ( - ghc: jobs: - lib.filterAttrs ( - jobName: platforms: - lib.elem ghc (config."${jobName}" or []) - ) jobs - ) compilerPlatforms); + let + # Mapping function that takes an attrset of jobs, and + # removes all jobs that are not specified in config. + # + # For example, imagine a call to onlyConfigJobs like: + # + # ``` + # onlyConfigJobs + # "ghc902" + # { + # conduit = [ ... ]; + # lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ]; + # } + # ``` + # + # onlyConfigJobs pulls out only those jobs that are specified in config. + # + # For instance, if config is `{ lens = [ "ghc902" ]; }`, then the above + # example call to onlyConfigJobs will return: + # + # ``` + # { lens = [ "i686-cygwin" "x86_64-cygwin" ... "x86_64-windows" "i686-windows" ]; } + # ``` + # + # If config is `{ lens = [ "ghc8107" ]; }`, then the above example call + # to onlyConfigJobs returns `{}`. + # + # onlyConfigJobs will also remove all platforms from a job that are not + # supported by the GHC it is compiled with. + onlyConfigJobs = ghc: jobs: + let + configFilteredJobset = + lib.filterAttrs + (jobName: platforms: lib.elem ghc (config."${jobName}" or [])) + jobs; + + # Remove platforms from each job that are not supported by GHC. + # This is important so that we don't build jobs for platforms + # where GHC can't be compiled. + jobsetWithGHCPlatforms = + lib.mapAttrs + (_: platforms: lib.intersectLists jobs.ghc platforms) + configFilteredJobset; + in + jobsetWithGHCPlatforms; + in + lib.mapAttrs onlyConfigJobs compilerPlatforms; }; # hydra jobs for `pkgs` of which we import a subset of @@ -382,16 +482,38 @@ let cabal-install = released; Cabal_3_6_3_0 = released; Cabal_3_8_1_0 = released; - cabal2nix = released; - cabal2nix-unstable = released; - funcmp = released; - haskell-language-server = builtins.filter (x: x != compilerNames.ghc884) released; - hoogle = released; - hlint = released; - hpack = released; + Cabal-syntax_3_8_1_0 = released; + Cabal_3_10_1_0 = released; + Cabal-syntax_3_10_1_0 = released; + cabal2nix = lib.subtractLists [ + compilerNames.ghc961 + ] released; + cabal2nix-unstable = lib.subtractLists [ + compilerNames.ghc961 + ] released; + funcmp = lib.subtractLists [ + compilerNames.ghc961 + ] released; + haskell-language-server = lib.subtractLists [ + # Support ceased as of 1.9.0.0 + compilerNames.ghc884 + # https://github.com/haskell/haskell-language-server/issues/3502 + compilerNames.ghc961 + ] released; + hoogle = lib.subtractLists [ + compilerNames.ghc961 + ] released; + hlint = lib.subtractLists [ + compilerNames.ghc961 + ] released; + hpack = lib.subtractLists [ + compilerNames.ghc961 + ] released; hsdns = released; jailbreak-cabal = released; - language-nix = released; + language-nix = lib.subtractLists [ + compilerNames.ghc961 + ] released; nix-paths = released; titlecase = released; ghc-api-compat = [ @@ -422,6 +544,7 @@ let compilerNames.ghc925 compilerNames.ghc926 compilerNames.ghc927 + compilerNames.ghc944 ]; }) { @@ -434,34 +557,43 @@ let ''; maintainers = lib.teams.haskell.members; }; - constituents = accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]; + constituents = + let + # Filter out all Darwin derivations. We don't want flakey Darwin + # derivations and flakey Hydra Darwin builders to block the + # mergeable job from successfully building. + filterInLinux = + lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); + in + filterInLinux + (accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]); }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages";