diff options
392 files changed, 5176 insertions, 3463 deletions
diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index ecff01894840b..b86fffa460423 100644 --- a/doc/builders/fetchers.chapter.md +++ b/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/doc/builders/images/binarycache.section.md b/doc/builders/images/binarycache.section.md index fe2772f33b4bb..62e47dad7c66f 100644 --- a/doc/builders/images/binarycache.section.md +++ b/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/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index 2467739a1a5e2..3ac4f224b5def 100644 --- a/doc/builders/images/dockertools.section.md +++ b/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/doc/builders/images/makediskimage.section.md b/doc/builders/images/makediskimage.section.md index c4566e7531081..e50479c4e83e4 100644 --- a/doc/builders/images/makediskimage.section.md +++ b/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: <https://github.com/NixOS/nixpkgs/blob/master/nixos/lib/make-disk-image.nix>. 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/doc/builders/special/makesetuphook.section.md b/doc/builders/special/makesetuphook.section.md index 90d75c5491cff..fee508dc29c2a 100644 --- a/doc/builders/special/makesetuphook.section.md +++ b/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/doc/builders/special/mkshell.section.md b/doc/builders/special/mkshell.section.md index 73cc57f485bd2..96d43535955fa 100644 --- a/doc/builders/special/mkshell.section.md +++ b/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/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index a0f0f97f9d53f..a644262fd9c92 100644 --- a/doc/builders/testers.chapter.md +++ b/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/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 96e2ecf970cb2..30fe4fa47d0d1 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/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/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index d9ed56fb83fc3..ff3d70ef0c626 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/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/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 0ef0c830ef8cf..4c1650781f053 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/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/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index d8c35bd20c506..d329943dc3c24 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/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/doc/languages-frameworks/cuelang.section.md b/doc/languages-frameworks/cuelang.section.md index ef408c7bb19be..86304208aa20c 100644 --- a/doc/languages-frameworks/cuelang.section.md +++ b/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 <https://cuelang.org/docs/concepts/logic/> to learn more about the semantics. - Read <https://cuelang.org/docs/references/spec/> 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/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index ec123e7c7bacd..4b4f52312940d 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/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} <!-- TODO(@sternenseemann): we should document /somewhere/ that base == null etc. --> @@ -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`. <!-- TODO(@sternenseemann): shellAware --> -##### 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/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 76cf6e03c257c..6d5e465ec3374 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/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`: <https://github.com/search?q=mkYarnPackage+language%3ANix&type=code> - Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+filename%3Aflake.nix&type=code> -### Gitlab +### Gitlab {#javascript-finding-examples-gitlab} - Searching Nix files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+extension%3Anix> - Searching just `flake.nix` files for `mkYarnPackage`: <https://gitlab.com/search?scope=blobs&search=mkYarnPackage+filename%3Aflake.nix> @@ -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/doc/languages-frameworks/pkg-config.section.md b/doc/languages-frameworks/pkg-config.section.md index fb6fee997d6f2..75cbdaeb6fe88 100644 --- a/doc/languages-frameworks/pkg-config.section.md +++ b/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/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index a65cea533bc05..88d57618d05d6 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1117,7 +1117,7 @@ with import <nixpkgs> {}; 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/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index d1265097d206a..f1953500fa329 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/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/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 3490b25761216..39e38c6a123d1 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/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/doc/manual.xml b/doc/manual.xml index ccbaf40586d1a..8aca360176846 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,19 +1,20 @@ <book xmlns="http://docbook.org/ns/docbook" - xmlns:xi="http://www.w3.org/2001/XInclude"> + xmlns:xi="http://www.w3.org/2001/XInclude" + xml:id="nixpkgs-manual"> <info> <title>Nixpkgs Manual</title> <subtitle>Version <xi:include href=".version" parse="text" /> </subtitle> </info> <xi:include href="preface.chapter.xml" /> - <part> + <part xml:id="part-using"> <title>Using Nixpkgs</title> <xi:include href="using/configuration.chapter.xml" /> <xi:include href="using/overlays.chapter.xml" /> <xi:include href="using/overrides.chapter.xml" /> <xi:include href="functions.xml" /> </part> - <part> + <part xml:id="part-stdenv"> <title>Standard environment</title> <xi:include href="stdenv/stdenv.chapter.xml" /> <xi:include href="stdenv/meta.chapter.xml" /> @@ -21,7 +22,7 @@ <xi:include href="stdenv/cross-compilation.chapter.xml" /> <xi:include href="stdenv/platform-notes.chapter.xml" /> </part> - <part> + <part xml:id="part-builders"> <title>Builders</title> <xi:include href="builders/fetchers.chapter.xml" /> <xi:include href="builders/trivial-builders.chapter.xml" /> @@ -32,7 +33,7 @@ <xi:include href="languages-frameworks/index.xml" /> <xi:include href="builders/packages/index.xml" /> </part> - <part> + <part xml:id="part-contributing"> <title>Contributing to Nixpkgs</title> <xi:include href="contributing/quick-start.chapter.xml" /> <xi:include href="contributing/coding-conventions.chapter.xml" /> diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 1fca829aa597c..0b4777efdb8c9 100644 --- a/doc/stdenv/meta.chapter.md +++ b/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 <xref linkend="sec-package-tests"/>. -#### 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/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 6f3f2b4460428..081d1e778fe8d 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/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 \<infile\>, writing the result to \<outfile\>. The substitutions in \<subs\> are of the following form: -#### `--replace` \<s1\> \<s2\> +#### `--replace` \<s1\> \<s2\> {#fun-substitute-replace} Replace every occurrence of the string \<s1\> by \<s2\>. -#### `--subst-var` \<varName\> +#### `--subst-var` \<varName\> {#fun-substitute-subst-var} Replace every occurrence of `@varName@` by the contents of the environment variable \<varName\>. This is useful for generating files from templates, using `@...@` in the template as placeholders. -#### `--subst-var-by` \<varName\> \<s\> +#### `--subst-var-by` \<varName\> \<s\> {#fun-substitute-subst-var-by} Replace every occurrence of `@varName@` by the string \<s\>. @@ -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/<hash>-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/maintainers/team-list.nix b/maintainers/team-list.nix index 173ad98263f9e..55d6fa72ec9cb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -221,6 +221,7 @@ with lib.maintainers; { docs = { members = [ + asymmetric ryantm ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 76e4393731145..85fce98b88c0c 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/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}`. @@ -336,8 +336,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/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix index fa9dd4d6d8f99..e2e88a8eade49 100644 --- a/nixos/modules/hardware/nitrokey.nix +++ b/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/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c4b93db22bef3..7b5e669d47f4f 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/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/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 434931ccae5a7..79a3ab6baaab2 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/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/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23ffb81b6a4ee..abd88d285a998 100644 --- a/nixos/modules/module-list.nix +++ b/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/nixos/modules/programs/proxychains.nix b/nixos/modules/programs/proxychains.nix index a52783aa66982..9bdd5d405668e 100644 --- a/nixos/modules/programs/proxychains.nix +++ b/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/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 98269f6250dbf..fc63f0f187e87 100644 --- a/nixos/modules/programs/steam.nix +++ b/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/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index aee275dab1ec1..b6b51b21c796f 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -60,7 +60,7 @@ in { '') (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' Database configuration must be done manually. An exemplary setup is demonstrated in - <nixpkgs/nixos/tests/matrix-synapse.nix> + <nixpkgs/nixos/tests/matrix/synapse.nix> '') (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' @@ -711,7 +711,7 @@ in { If you - try to deploy a fresh synapse, you need to configure the database yourself. An example - for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix> + for this can be found in <nixpkgs/nixos/tests/matrix/synapse.nix> - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` to your configuration. diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 4d423c9059866..0cb0e126d4c50 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -171,7 +171,11 @@ in "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" "/ip4/0.0.0.0/udp/4001/quic" + "/ip4/0.0.0.0/udp/4001/quic-v1" + "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport" "/ip6/::/udp/4001/quic" + "/ip6/::/udp/4001/quic-v1" + "/ip6/::/udp/4001/quic-v1/webtransport" ]; description = lib.mdDoc "Where Kubo listens for incoming p2p connections"; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index f963e341546c7..05e8632e3125c 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -87,7 +87,6 @@ let }; '' } - allow-query { any; }; ${extraConfig} }; '') diff --git a/nixos/modules/services/web-servers/authelia.nix b/nixos/modules/services/security/authelia.nix index 143c441c7e153..143c441c7e153 100644 --- a/nixos/modules/services/web-servers/authelia.nix +++ b/nixos/modules/services/security/authelia.nix diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 56a53198b3fbf..db5122e79f006 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -184,6 +184,22 @@ in .tar.gz files. ''; }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Environment file (see {manpage}`systemd.exec(5)` + "EnvironmentFile=" section for the syntax) which sets config options + for mattermost (see [the mattermost documentation](https://docs.mattermost.com/configure/configuration-settings.html#environment-variables)). + + Settings defined in the environment file will overwrite settings + set via nix or via the {option}`services.mattermost.extraConfig` + option. + + Useful for setting config options without their value ending up in the + (world-readable) nix store, e.g. for a database password. + ''; + }; localDatabaseCreate = mkOption { type = types.bool; @@ -321,6 +337,7 @@ in Restart = "always"; RestartSec = "10"; LimitNOFILE = "49152"; + EnvironmentFile = cfg.environmentFile; }; unitConfig.JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; }; diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 2491c788d6c51..df8ed96f8d908 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/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/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 9c88d12ca6f29..1f48713a68ddd 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/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/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index fc27566d49ee6..cc24522970f3a 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -1,23 +1,63 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.xserver.windowManager.qtile; + pyEnv = pkgs.python3.withPackages (p: [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p)); in { options.services.xserver.windowManager.qtile = { enable = mkEnableOption (lib.mdDoc "qtile"); - package = mkPackageOptionMD pkgs "qtile" { }; + package = mkPackageOptionMD pkgs "qtile-unwrapped" { }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = literalExpression "./your_config.py"; + description = lib.mdDoc '' + Path to the qtile configuration file. + If null, $XDG_CONFIG_HOME/qtile/config.py will be used. + ''; + }; + + backend = mkOption { + type = types.enum [ "x11" "wayland" ]; + default = "x11"; + description = lib.mdDoc '' + Backend to use in qtile: + <option>x11</option> or <option>wayland</option>. + ''; + }; + + extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); + default = _: []; + defaultText = literalExpression '' + python3Packages: with python3Packages; []; + ''; + description = lib.mdDoc '' + Extra Python packages available to Qtile. + An example would be to include `python3Packages.qtile-extras` + for additional unoffical widgets. + ''; + example = literalExpression '' + python3Packages: with python3Packages; [ + qtile-extras + ]; + ''; + }; }; config = mkIf cfg.enable { services.xserver.windowManager.session = [{ name = "qtile"; start = '' - ${cfg.package}/bin/qtile start & + ${pyEnv}/bin/qtile start -b ${cfg.backend} \ + ${optionalString (cfg.configFile != null) + "--config \"${cfg.configFile}\""} & waitPID=$! ''; }]; diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix index 7c239ebdd5af4..679c65fea087a 100644 --- a/nixos/tests/authelia.nix +++ b/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/nixos/tests/mattermost.nix b/nixos/tests/mattermost.nix index 49b418d9fff74..e11201f05357d 100644 --- a/nixos/tests/mattermost.nix +++ b/nixos/tests/mattermost.nix @@ -50,6 +50,13 @@ in mutableConfig = false; extraConfig.SupportSettings.HelpLink = "https://search.nixos.org"; }; + environmentFile = makeMattermost { + mutableConfig = false; + extraConfig.SupportSettings.AboutLink = "https://example.org"; + environmentFile = pkgs.writeText "mattermost-env" '' + MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org + ''; + }; }; testScript = let @@ -69,6 +76,7 @@ in rm -f $mattermostConfig echo "$newConfig" > "$mattermostConfig" ''; + in '' start_all() @@ -120,5 +128,13 @@ in # Our edits should be ignored on restart immutable.succeed("${expectConfig ''.AboutLink == "https://nixos.org" and .HelpLink == "https://search.nixos.org"''}") + + + ## Environment File node tests ## + environmentFile.wait_for_unit("mattermost.service") + environmentFile.wait_for_open_port(8065) + + # Settings in the environment file should override settings set otherwise + environmentFile.succeed("${expectConfig ''.AboutLink == "https://nixos.org"''}") ''; }) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index d0b11e00538fd..95d00c1d8ec14 100644 --- a/nixos/tests/vaultwarden.nix +++ b/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/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 3e55369daa06a..bcb9d9bcfd60d 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -12,6 +12,7 @@ let then pkgs.zfsUnstable.latestCompatibleLinuxPackages else pkgs.linuxPackages , enableUnstable ? false + , enableSystemdStage1 ? false , extraTest ? "" }: makeTest { @@ -36,6 +37,7 @@ let boot.kernelPackages = kernelPackage; boot.supportedFilesystems = [ "zfs" ]; boot.zfs.enableUnstable = enableUnstable; + boot.initrd.systemd.enable = enableSystemdStage1; environment.systemPackages = [ pkgs.parted ]; @@ -176,6 +178,11 @@ in { enableUnstable = true; }; + unstableWithSystemdStage1 = makeZfsTest "unstable" { + enableUnstable = true; + enableSystemdStage1 = true; + }; + installer = (import ./installer.nix { }).zfsroot; expand-partitions = makeTest { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6d8f279dadbd1..24d610f62d020 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/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/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index da54f07dfb001..40ecd0dd21a67 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/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/pkgs/applications/audio/patchance/default.nix b/pkgs/applications/audio/patchance/default.nix new file mode 100644 index 0000000000000..accba200e37fd --- /dev/null +++ b/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/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix new file mode 100644 index 0000000000000..bc1a85abafa22 --- /dev/null +++ b/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/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 7cad39b63ea77..1d43d11c60cfd 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/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/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix new file mode 100644 index 0000000000000..20dbe8c19dffc --- /dev/null +++ b/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/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 1bc33588c42d5..709e20f476b24 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/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/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index a8ce5ca242075..fbd8c08575d5d 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/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/pkgs/applications/blockchains/teos/update.sh b/pkgs/applications/blockchains/teos/update.sh new file mode 100755 index 0000000000000..b7e344cda8447 --- /dev/null +++ b/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/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c04e215b99084..8450fea7acba5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/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/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 86b6fa4bfe235..d062614d1d381 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/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-27"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ac100fa691b10dd990ca0cdc31ebd054a5959b58"; - sha256 = "1j59vy5dypc5a1ymgd640lyqkq2gsicqapgmlssxz0g91r71n40z"; + rev = "15022828c25a97a05b510b131a37d5b1330ee073"; + sha256 = "07dwzcsmgws4scsmk91fvmwyb7b6ldafmbxmkk04cwi4zlky90a9"; }; 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-26"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "73a7242daa785fc66a887ab1864dc1c9432d7cbe"; - sha256 = "09zv4wjnb1gfwq718gavpb5s2cwf7a057h3g8d8gs5x3vrxs6sda"; + rev = "e6ac093930495509732042d23ba9b07591e61aa0"; + sha256 = "0lfzz2qsxj27hg1cdxb9yvh6ajns63dljc7a99m3vbhha7j71dmb"; }; 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/"; }; @@ -775,12 +775,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/"; }; @@ -1075,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "3d2020703c10385970032acda4f2efe0679458d1"; - sha256 = "09iakiv13q3gmyn21az5zz1jf34iw3n5hs2nr7zih956irkj2w03"; + rev = "e47e0bad487ed23b0121b675b77af40fa41ad7b6"; + sha256 = "0i6nwkqzjg24f4jik88wmybrz0kcakdwvrsdln1i0llaymr59vlx"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1123,12 +1123,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 +1639,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 +1963,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-03-23"; + version = "2023-03-24"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "ddb8a72022139be35d02c747d5d009172c9d64ca"; - sha256 = "0z9ngh66g02ssxgh0403h9w1j9zmpamvap0lmy7gacy20w471g1i"; + rev = "5942e1bef90c8dd6030e1faacaa445cf2d10e70c"; + sha256 = "1mq5a06567j6xd1gcnbgbkiingb1kvpgw1jcfv5f4b3vvsibkzsz"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2047,12 +2047,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/"; }; @@ -2119,24 +2119,24 @@ final: prev: 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 +2155,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 +2299,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "cf924ac83fa218d30faf9fb47ac0b628b2706276"; - sha256 = "0lc876mwazx33vy4aq98k6gcrblc3kndg530gmc1lj89hlldsgvb"; + rev = "c6fc33da0a955ec91fee0fea4d06707542f00a5f"; + sha256 = "0z63p4l1rn5fzzwfc2j5v0cp8ms39zbmmnwwl2da6gqj9a85idki"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2673,12 +2673,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-26"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; - sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; + rev = "94c46495345c36988c307f3ec055afda248d4a37"; + sha256 = "0yxisgjr157s8wv3kg316pvd264fjjzpn0g6rmjvhgl9152iwfwn"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2963,12 +2963,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/"; }; @@ -3012,24 +3012,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 +3084,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-03-16"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "727df22e2ae72a0482e5eb923e3d1c861a157a94"; - sha256 = "06s4svb8r4d9xi10sk9wf0zqa1qmrafj749kfayw705fig2an9v0"; + rev = "92e12ab64b2440f45f346eeeeb30c425e8a65f11"; + sha256 = "0gki5qiclacpf0ald463d1810l77hy75jlkcfyd3xxpczfq9acqm"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3120,12 +3120,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 +3228,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 +3324,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/"; }; @@ -3432,12 +3432,12 @@ 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/"; }; @@ -3456,12 +3456,12 @@ final: prev: 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 +3576,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 +3647,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 +3695,12 @@ final: prev: heirline-nvim = buildVimPluginFrom2Nix { pname = "heirline.nvim"; - version = "2023-03-22"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "ab080c47581cdecb8a5b4ec79c5c19fecb5bcd2b"; - sha256 = "06r8naxqpc4ih8xdz03jckir06mgl12zr2h8f77dnclfwpl4jvq5"; + rev = "b55ad4af04d9c45dd8328fea65abb0b17274d6f0"; + sha256 = "1446cpaj6619lldlx83jlsjnqpg6czbybn3wi91vxnj922vskqs3"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4139,12 +4139,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 +4235,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 +4259,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 +4307,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-03-20"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "ee9e14955c9aa280e08b5600f7eb53e7c2578cd7"; - sha256 = "1lh6nfwb1q4690qqn6vfjimw3qmq9fz7fa3vi3kk55q4sdy0rw0h"; + rev = "6c86c7aac485870299b4481f317a5e306c2399de"; + sha256 = "0ma5nm64r4nla1g236rpz8a5rhj1i26b8f7ipa1fnbxndabja60r"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4643,12 +4643,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "56ce3384695a982efaa8f6c1995255671757182c"; - sha256 = "0jlm7fwc7rl5ayqf00ix6ynzxsmnrd3g68mhkxy4qyaf746wnpy8"; + rev = "04c036594f1093576f0a80837e1c1eeedb67f49b"; + sha256 = "0d0nm0ifs18229jvc743dx1qvhqgbr7kawzaa3mr5v0dfz58502r"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4750,12 +4750,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 +4775,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 +4847,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 +4871,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-03-23"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9f4e06029b1d8cd3bb4438f6b3de6d5c42d2d8d1"; - sha256 = "115b00q3m7jsmh2nvn5hk4zd95mxwl2bddvcdxg4vjxhgn8z3yx5"; + rev = "8829f9539f501ac99d6a556309a672478ca78e98"; + sha256 = "0iv490vcpylbw22axzk1jgs8lq5fmx9ysnwx21yqjqbjxxmi91wc"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4943,12 +4943,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-03-21"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9f8b92998a9964e03535c2c7e0708958e23e261a"; - sha256 = "1c1wywn7hpagcwdp2vnrrlf60vvqs9rl0p5g3m94jcrs6yihbqib"; + rev = "229b12cb2375ceb8412fb7529de92d9e4ca28b62"; + sha256 = "17wg7lp0s4yv61wask9gnqzz0kbhb2s5p3k7kn6q8zb10cya2bqm"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5303,12 +5303,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "f28a0c750a40ceec22eb97dd8111ef2203ff7cc1"; - sha256 = "02hkr0l2d61c9gbp24xdi9az1snim1qkkkbf4wz7qfzhr0p6b3z8"; + rev = "55923798eb46c2d38bf111dc2bc285c13e286765"; + sha256 = "081v6kpa5hs2ixkvfclz16bj0zf27q4hq53azp656rb04wi7wfbj"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5327,12 +5327,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 +5351,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 +5423,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-03-13"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "532548b9f444bd1ae6f2efd3edd842282cc79659"; - sha256 = "1c7i1bkzwh3swq702cl31pm2h8cwj6lh5bm8bwdaz64pz5pz9f61"; + rev = "c5f73ba1f09207716b81cae4151deec3df71491e"; + sha256 = "0jgam57smsvb013np703bsas1vmkpq8kpj1sxjapsj2qajiz712k"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5483,12 +5483,12 @@ 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/"; }; @@ -5591,12 +5591,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 +5639,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 +5675,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-03-23"; + version = "2023-03-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bfd61997f62b52aa9fe5ec59590956d1bb7fe605"; - sha256 = "13h1vk99rdzsibfzpw96pc2k3zlrih5q6ggw813b7sbfdca82lkw"; + rev = "1986267f7c56c99f860394bb7242ae33b41b5904"; + sha256 = "0kxkqx6pwrb001hs2gyxck8b7yqivvj0ida3ghn7v770i5n1xb5z"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5711,36 +5711,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/"; }; @@ -5843,12 +5843,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/"; }; @@ -5939,12 +5939,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "29ff4654b106ca08cdb649120d8f296fb00723f4"; - sha256 = "02kbvp689m8fbhhf759zngg2wyy2awws55hp905nzq4vzk8sxp82"; + rev = "852fd38a29bb213c559ad61da4188ac523ecc72a"; + sha256 = "1gv81h103aq90vb3ijis53wyl4d7w7r2x59n9gnn1kdk6xxc1dgz"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6023,12 +6023,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,12 +6047,12 @@ 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/"; }; @@ -6143,24 +6143,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-26"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "26a272937f1f3ff5c38d67662c5d7cc76148a4a5"; - sha256 = "07w1bygcs3myfarp2zpm21clyc0abmrglpwqkdj0z4azd4wa1cqz"; + rev = "7cbf594b65d79a802d9cbe30eed1dbfce6e6a17f"; + sha256 = "1dxnhkmzr7xqz1gpr3v7p8855ml9qk6j50v19y9ica7pcj5i1mzh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6275,12 +6275,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 +6347,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 +6491,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-27"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "056f69ed494198ff6ea0070cfc66997cfe0a6c8b"; - sha256 = "0nkfb13jrhczw2y3wd5qr183l50wy8jk0chkiw66x4388gqnz9lm"; + rev = "b7acf822a62ddc743e8129061c0d2adb32a6b810"; + sha256 = "13pyag877n1cnrck49350q0x66766mcb9wd9ymvs72xqhj526g7b"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -6539,36 +6539,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-03-21"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "aa9971768a08caa4f10f94ab84e48d2ceb30b1c0"; - sha256 = "1yq7a1baf85vhzycnys13jl3chhlixfa5gcqm97pzh3rz5y6g8ys"; + rev = "a38f9a55a4b55b0aa18af7abfde2c17a30959bdf"; + sha256 = "09qrsx5al87xab9mc0b3v0rvf1q1wqa4v5s4gy78f3slxpxbybv0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "87cf2abeb6077ac19a1249d0b06f223aa398a0a0"; - sha256 = "1zq55kfjaf3gsm3l4xv210fzzidg2bk6r6bk551y7jgvf6j6fapm"; + rev = "63e4a3a40a494e76ef7613f127b31919eebd47d1"; + sha256 = "1alx79n5ari1nnvgnxwq4h3yiwiaj1s914h18yqsr13q5jl1mzrz"; }; 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/"; }; @@ -6599,12 +6599,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 +6647,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"; }; @@ -6766,12 +6766,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 +6827,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 +6899,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/"; }; @@ -7718,24 +7718,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 +7971,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 +8357,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "24389d847f931e3822c5babdd308d20e2e8c638f"; - sha256 = "1dgd1ipmi17wjpslv7ilqjjjfg9sw2s4ig15simh92h3ipr3bpv3"; + rev = "15caac96190f5ad8b016c0228a510026b88a576d"; + sha256 = "0wybn1777y9728bff6y9nmz8akfk35iwmaw88ilfzkzll3clifid"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -8526,12 +8526,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 +8682,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 +8778,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 +8815,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 +8863,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 +8899,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 +9007,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-03-21"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "437864dcde91e29b186bed09c72944019dddf10d"; - sha256 = "1hxxan9g035xm6rh6rz9wxrxqfy8qfwp95mi179fxi71xbj2j77m"; + rev = "b35f5cd02f0d9e4923dd1ca19d0543d8c0dc1517"; + sha256 = "0k6l5fxbigglm6zh9kp4xanl2hpg8ql1g343vci3zf4hik0180sl"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9187,12 +9187,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-02-25"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "880a562ff9176773897930b5a26a496f68e5a985"; - sha256 = "0id4l89cbwkfkhxj90n8mc6vmqkgig5w21l3brvvfzc8hsrs15a6"; + rev = "8fe5966961fc047f7f93b4158a418e54d1c205ff"; + sha256 = "1gxk8zl55ijdqb4p90dnwid2wpmsjnzx770x0hpcx3024n519ya3"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9895,12 +9895,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 +10495,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 +10627,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 +10699,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 +10771,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-03-05"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "23cc4bca2f586c8c2f7d2cb78bbbfec4b7361763"; - sha256 = "0hi17i24wrcj0lbs8c7p8m92bzhxp4f531c0612z5iqjxadsi66v"; + rev = "735e807eb01ce30d42dde0c03ae3614d9e2d8206"; + sha256 = "0xfkn375n7r7kdvb5pvp6cjdbqflmv38c2l2mdfcpcjs4dw9hva2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -11493,12 +11493,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 +11614,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/"; }; @@ -12996,12 +12996,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 { @@ -13307,12 +13307,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 +13860,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-03-23"; + version = "2023-03-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5a6e46e2b8a96e79d5cab98e50a9b9109715d940"; - sha256 = "0ah361mg1qlpkx6vwaj7x8a2ja717njinq2ax4fhcr8z34h4q0ra"; + rev = "e57b589a8ef3c67e3edfc0492bfee8b196eafefd"; + sha256 = "02461iv1g2ifa8ywbmfs18h7ns31lv8l7dgzsc4pij5klch2mvk6"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13968,12 +13968,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 +14112,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 +14245,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 +14269,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 +14317,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-03-22"; + version = "2023-03-27"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "04617d1f5b1cfbdd2a99d9765ef04fc6ae415622"; - sha256 = "1jgf7sm0755a1vcbfm1wxmkv6alrbpyfzrrfbi3100hh4c9khxg6"; + rev = "3ae79a1bd03d3ab90f965f0276051d09791d34cf"; + sha256 = "14958479sr01jsqh76rrzlbmj5dk05z94qc3z3v6a4rrf9l013pv"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 52fb227ae5a73..abbd84464916c 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; 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"; }; @@ -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"; }; @@ -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=9c6a4d9"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-pony"; + rev = "9c6a4d98dea80772dbd7967fe556652a220469e5"; + 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"; @@ -1867,12 +1889,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=66cf9d3"; + version = "0.0.0+rev=1828a1e"; src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6"; - hash = "sha256-/dNdUAmfG/HNMzeWi3PSSM9pwA60/zOjLi4NFXfn6YU="; + rev = "1828a1e6611703371039fdefba955018ac570105"; + hash = "sha256-8gOvJQnoBdPw8er8sDL5wfhKaoibCvfC7XlZbMbg9QU="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bf975ce68ebaa..40ff07c7d4fc4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/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,57 @@ 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-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; }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { @@ -1598,18 +1552,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 +1751,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,6 +1930,56 @@ let }; }; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; + + ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-keymap"; + publisher = "ms-toolsai"; + version = "1.1.0"; + sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter-renderers"; + publisher = "ms-toolsai"; + version = "1.0.15"; + sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-cell-tags"; + publisher = "ms-toolsai"; + version = "0.1.8"; + sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-jupyter-slideshow"; + publisher = "ms-toolsai"; + version = "0.1.5"; + sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-vscode.anycode = buildVscodeMarketplaceExtension { mktplcRef = { name = "anycode"; @@ -2038,7 +2028,7 @@ let }; }; - ms-vscode.PowerShell = buildVscodeMarketplaceExtension { + ms-vscode.powershell = buildVscodeMarketplaceExtension { mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; @@ -2054,8 +2044,6 @@ let }; }; - ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; - ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { name = "Theme-TomorrowKit"; @@ -2072,70 +2060,10 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter { }; - - ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-keymap"; - publisher = "ms-toolsai"; - version = "1.1.0"; - sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jupyter-renderers"; - publisher = "ms-toolsai"; - version = "1.0.15"; - sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-cell-tags = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-cell-tags"; - publisher = "ms-toolsai"; - version = "0.1.8"; - sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-toolsai.vscode-jupyter-slideshow = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-jupyter-slideshow"; - publisher = "ms-toolsai"; - version = "0.1.5"; - sha256 = "1p6r5vkzvwvxif3wxqi9599vplabzig27fzzz0bx9z0awfglzyi7"; - }; - meta = { - license = lib.licenses.mit; - }; - }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "debugger-for-chrome"; - publisher = "msjsdiag"; - version = "4.12.11"; - sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; @@ -2211,6 +2139,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 +2167,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 +2265,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 +2287,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 +2299,7 @@ let }; }; - rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { + rioj7.commandonallfiles = buildVscodeMarketplaceExtension { mktplcRef = { name = "commandOnAllFiles"; publisher = "rioj7"; @@ -2407,24 +2335,24 @@ let }; }; - rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { - name = "vscode-paste-and-indent"; - publisher = "Rubymaniac"; - version = "0.0.8"; - sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + name = "gi"; + publisher = "rubbersheep"; + version = "0.2.11"; + sha256 = "0j9k6wm959sziky7fh55awspzidxrrxsdbpz1d79s5lr5r19rs6j"; }; meta = { license = lib.licenses.mit; }; }; - rubbersheep.gi = buildVscodeMarketplaceExtension { + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { mktplcRef = { - name = "gi"; - publisher = "rubbersheep"; - version = "0.2.11"; - sha256 = "0j9k6wm959sziky7fh55awspzidxrrxsdbpz1d79s5lr5r19rs6j"; + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; }; meta = { license = lib.licenses.mit; @@ -2546,18 +2474,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 +2604,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 +3030,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; + wakatime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wholroyd.jinja = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3230,10 +3162,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 +3180,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/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 204cfa387dd39..d5feb67f4b15d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -30,6 +30,7 @@ , perlPackages , sqlite , vigra +, wrapGAppsHook , wxGTK , zlib }: @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config wrapGAppsHook ]; # disable installation of the python scripting interface cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 59fd3f915656a..992ae201c81d4 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/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/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index d4bd7c63a7225..753ff769a6477 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.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/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 2173c12461c31..f4989b2c3f036 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/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/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 4f3859e2e22b1..e6b384904b704 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/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/pkgs/applications/misc/keyleds/default.nix b/pkgs/applications/misc/keyleds/default.nix new file mode 100644 index 0000000000000..c48b30b34dc90 --- /dev/null +++ b/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/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 125ff56b6a5c8..b51a4eeb4a79c 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/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.0"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-tD7uNSgcGMPyiA/HfOOZs3NRbWTrds0AdEXTaHYfUjk="; + hash = "sha256-5oX1LhqWvNiMF9ZI7BvpHe4bhB3vQp6dsjLYMQ9Jy+o="; name = "${pname}-${version}.AppImage"; }; @@ -54,7 +55,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/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh deleted file mode 100755 index eb81dc68e4ebf..0000000000000 --- a/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/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 702a7769200dd..246e579975bbd 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/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/pkgs/applications/misc/tasktimer/default.nix b/pkgs/applications/misc/tasktimer/default.nix index ca5d6227375ed..34ba140331d12 100644 --- a/pkgs/applications/misc/tasktimer/default.nix +++ b/pkgs/applications/misc/tasktimer/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Task Timer (tt) is a dead simple TUI task timer"; homepage = "https://github.com/caarlos0/tasktimer"; license = licenses.mit; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe caarlos0 ]; mainProgram = "tt"; }; } diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 6149c52e7753d..290de03f39ffe 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/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/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 0a513fc70581b..56eca7606522a 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/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/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 13dabe296b3dd..6f56dd8ff4e0b 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/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/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 298d218560eca..ca5a4684a48c7 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/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/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 543a4d3d28389..9ef5ebe21e72d 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/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/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d995760924c97..6eabadafbdf62 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "112.0b5"; + version = "112.0b6"; 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.0b6/linux-x86_64/ach/firefox-112.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "05859db46d62c1c66035a21012f384d7392a42a443f21fae27b1c22519e1a787"; + sha256 = "3c07e964f23adfb557c30aabd83afda74cd1431e6f56c636a27a31d5732f2895"; } - { 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.0b6/linux-x86_64/af/firefox-112.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "49f9073e4426000dcdc008a8f9f52edbdcd7f89d0f6af4463e06ad3c70d493af"; + sha256 = "2c944716a6c695f6a7e02b2592f63b879f1d9ecc1d98148920941e03cc24d3d8"; } - { 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.0b6/linux-x86_64/an/firefox-112.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6b07b832993b5142dbd619d8d2e39d7394346be6f1b5580dc6f62fd50226cfd2"; + sha256 = "ce14c24ee1477912b5671364472ab07016e14277258487bfe7766d50bd757f8f"; } - { 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.0b6/linux-x86_64/ar/firefox-112.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a248911af735ce319b559dd97f87734b54377ad70b22aa51f989433ee809f3df"; + sha256 = "dd265c505f5263a2cc9a7fcab83d29587ba986d1d0e9e17b1b3d25c617af8e61"; } - { 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.0b6/linux-x86_64/ast/firefox-112.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "835f1935904afdd4081d82d6c73ebfe6159fa94acd10dda826ccf0b14b86b54c"; + sha256 = "9128fc4c7b505c30b23a953cfab428fec361b7bca94b13718ec806b802bfaef0"; } - { 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.0b6/linux-x86_64/az/firefox-112.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "63f778e01748faa999374a82f72b58342e72fcc159f0b385ad393d96a9bf1001"; + sha256 = "6ad10ede0403064a94d98c802e8082a1988b2914565473034f068874588b0c7a"; } - { 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.0b6/linux-x86_64/be/firefox-112.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e1a9652fcd7b34ddddf80d2c4d1f7d13a44e382af722bf5a2d2f3a1a6d328fdb"; + sha256 = "b2b03e037a5d68c0f8e6bca169b513fd25167c710c84011d0162e435ca3dbcf1"; } - { 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.0b6/linux-x86_64/bg/firefox-112.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e90ff246ea24f285a51d10b31957301b6cc9f104d3cbb8913521ed9413449092"; + sha256 = "b3d8c55193980e6b705bfb728eeb0da53a9df676288433df312002e2feff60cd"; } - { 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.0b6/linux-x86_64/bn/firefox-112.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ee9f1665f8c76806fb8ead80b492ab39756d010ab70703b9a806bd511f5b2e5e"; + sha256 = "513bbf8cb0fc17ceae546dccf6c8f5cd43d78d2fccf212fb5762a210cdd2bd3d"; } - { 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.0b6/linux-x86_64/br/firefox-112.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4fc531ffe5ee4970e51723f741df9b1a0d32e0e67497c7296302e2aabdb66c3c"; + sha256 = "4ee6a09aa510535dd483a5cc570a202ac7ba5d9699070969740f38f98f143e7e"; } - { 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.0b6/linux-x86_64/bs/firefox-112.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "374fac7c2633e37e148d75ba8ad919e6f9101d155835f624c3bd3f72a5564c52"; + sha256 = "144558775c3e28b27cebaa136aec69d38abc29bd51af2cd625bcd15b1d5291c9"; } - { 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.0b6/linux-x86_64/ca-valencia/firefox-112.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9a3467b62347a6c022721100f694212b06cdb30d056741bfa393759068352331"; + sha256 = "7c6654dda1029eb23f41e73104187ea157298994127976e24ec0c82326de35bd"; } - { 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.0b6/linux-x86_64/ca/firefox-112.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cfd738a5fcdd6b0fc9f07b8a4c6f85e9f38740af7c797a488aa249d86ce49114"; + sha256 = "389b901dd0a4069ef9860379e71a12239dd4a33d4df05dfd7d16d35ec50d7748"; } - { 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.0b6/linux-x86_64/cak/firefox-112.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "0508c53ff3ae20712559c429f676b2dcfc5488f15746a5e802b759ae4b9af92e"; + sha256 = "e91ea1785dd87c2bb92f0f2126f82d4f6127301250886de313751118d4d86d02"; } - { 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.0b6/linux-x86_64/cs/firefox-112.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4f2dac86bc0d29fb86667a93f172a1077e6e18dadc8c9b1c80917cc48d186a5b"; + sha256 = "6ffd6aae1b31bf22095c1acff6d6fe53c747a875ef3868d0624873267a6ca7c2"; } - { 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.0b6/linux-x86_64/cy/firefox-112.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "947a766e64dc318162ce24c02a4e53498a8b261807a2e2f02df348aabe6fd203"; + sha256 = "ae0cfbbe890991bd30762f181a4ae7bde2701d5e0f924f6142b71e1cf9474f86"; } - { 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.0b6/linux-x86_64/da/firefox-112.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "557d3e24d92af23c2d7847aa156fb961ea6d00b677935eb37573e5d10a431e70"; + sha256 = "b7a6aecd661653c93e2237a27fed8ac169bfc4f2dcd2b377b820b685cffe7d1a"; } - { 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.0b6/linux-x86_64/de/firefox-112.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b0ace6526a07016e2b8a7413ee27ba282458854eeca0a563977b6a7dc79df517"; + sha256 = "936d530879ba9715446ac97b8a433987d25bd8d41e01b70c10e99994b56433a9"; } - { 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.0b6/linux-x86_64/dsb/firefox-112.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a7d34883dee70a0a1a354b19302af4e0a7dd605294489c3e732322fd9b27d471"; + sha256 = "96566692bd75645538f336b2322ad6821889bc1de73b63646b880d6b1263c90a"; } - { 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.0b6/linux-x86_64/el/firefox-112.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1dd23fcfa7d21fa0abd534b7fafcde2ebb68cc5d1082849b65ca853e8c97542e"; + sha256 = "d52d4040df2b1398eedea68f8253ed58b897c6da68ee11b13c81b5768c1d221f"; } - { 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.0b6/linux-x86_64/en-CA/firefox-112.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "bb07562373692afbb647ff83293e2c73be125ef3d5865e042f6f068e459df240"; + sha256 = "ac8763f0b3dadce233ac88e93f24695b9acb5299e1884feac7bfbd0a04cff0f1"; } - { 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.0b6/linux-x86_64/en-GB/firefox-112.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b0bd2e1e75672b70e66ddef4d69a30cee469178fea807a76fbd3f4a3b54f8377"; + sha256 = "6e5567e859557151c093727f7c7bab1961de6d1c8b8b8e11717d1f55c93f628b"; } - { 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.0b6/linux-x86_64/en-US/firefox-112.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d367fac2132309c669bb0e4419d27756ad1c500e8f3753d4ea6020eb7f7ad53c"; + sha256 = "235972a20d398a3641ffe7e427375f01744b0cf0487b450e23bf2d217f7390d2"; } - { 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.0b6/linux-x86_64/eo/firefox-112.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6fbf9f27f70308525b487d2ae308eeb3c704725113f1c23e03c166c1632452c3"; + sha256 = "3a4eda3ada0681c3033adde3b5de46cda7901de136cb18e64221e47e97f7bba5"; } - { 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.0b6/linux-x86_64/es-AR/firefox-112.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ff5859cd53d94135463d638ca0ea0cfad310f261dece75342d4860baf9e07832"; + sha256 = "70448e290002f4dd8ed8a3ae48f53eeaa568f68302bb36e0175c7b417ad8d3a5"; } - { 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.0b6/linux-x86_64/es-CL/firefox-112.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "22853be89138a70b5a45f1b983bf3d27f872d2ecea8127512848eca9335bc67c"; + sha256 = "13e5eddfa538961a0cd587c7d498a88daae23d578750e23ae48dd6f2398a3216"; } - { 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.0b6/linux-x86_64/es-ES/firefox-112.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "495c74d78b711eee03f2d376675547aa1bbcacc93817f1141a1cacb9d7a7b359"; + sha256 = "0429f562d61626e701c23292eb13f6787b29f8b8cb2aaa33adf35ba791e9166c"; } - { 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.0b6/linux-x86_64/es-MX/firefox-112.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "cec7c4d65ffd6ce0608f0063c9634f2a9624e0bace5cbe159f9171ae2a0747ec"; + sha256 = "df33f30d6f1852b4ae2f5fc2be567009d62c76d519c8741d83645bfbe5847701"; } - { 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.0b6/linux-x86_64/et/firefox-112.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "99f6dbfce8f79360d5fe9360b5d2f7e8b721ac9de7ddd958e24c8a8c1608a563"; + sha256 = "d89fafb4fdfa59e61478ee0668b1a51723bf7d974c8acfa568d73004ee022237"; } - { 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.0b6/linux-x86_64/eu/firefox-112.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1198890563e45116380b57ee3ec576458b58935a584ecd561bc05b8750808c1e"; + sha256 = "0d46ea00d2babd59fd78a754ea6e6a872912e5e9a956366a3b0bd402e3f31a0c"; } - { 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.0b6/linux-x86_64/fa/firefox-112.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc0bfefb8df93dbf384dd65b23da2ebbc1cc7d3a7c068f72a3ceea58a24e7fd1"; + sha256 = "c829052709ed804781b2f3f04eccc2fc5d6ef88f4cd049a0ab0ac98189fc8578"; } - { 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.0b6/linux-x86_64/ff/firefox-112.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ad9d500e301fb94c09d3ea334c9590462eacb7732ab3c43ff9184f09d05e3e94"; + sha256 = "bf7c2c400dea1fa5df076d7478cce9de30af37ddc192c889b4738a166d9cfa5b"; } - { 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.0b6/linux-x86_64/fi/firefox-112.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "216540e1c2fc59f946ebb0c3968045f928784fc38873bc96d9f5317bfae56df6"; + sha256 = "5edfebdfebe51909c1ec7177e497bd4d0728dcbfbb3e81aafa3878b7a6406418"; } - { 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.0b6/linux-x86_64/fr/firefox-112.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "84897d974fcc365287bab6d9e941c03c6aa464fba22b5968e3f5a41d21f8ac7f"; + sha256 = "2958284604ce96177fe3973460b2eb96e12902c363e40517cdfa0e90bb3c0858"; } - { 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.0b6/linux-x86_64/fur/firefox-112.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e03d8761e955becb1f6f542e697d7d64aaf90d1abac9ff0dfe0ae698aab91830"; + sha256 = "e82ee24e0bf4fffe3c185bec25563016906b7d0c093b4dcd1e67f72432c74399"; } - { 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.0b6/linux-x86_64/fy-NL/firefox-112.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e0cb84ee39ed5d8b7cd21bd8283e233a0547a98ff703d15ec001bf30049748ed"; + sha256 = "90c3862b789a5507026696c4794964cfc9d1f0c1ec3e41be2c7d6c008b56e1f8"; } - { 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.0b6/linux-x86_64/ga-IE/firefox-112.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ce2e7c971f787470f38e3b7a96d9670892de6480bb4fe8ac45bcdb0049033265"; + sha256 = "8dc83431305b71d33c85533304c054c9975ed835e610af800dcbc7e3b83eba5f"; } - { 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.0b6/linux-x86_64/gd/firefox-112.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "461f3d05b8d1b587111c952be55138d54b6747d9340278e0650f4f963cdb378a"; + sha256 = "3f656718bf9dabe3cf4fc3b8b089aec67acc4c8c61f4c3d2eb1a49cb13f7ceaf"; } - { 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.0b6/linux-x86_64/gl/firefox-112.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "25664e36f13283c637337b94cc7d90c296a854bb21de1f139b6682a2b39503aa"; + sha256 = "6d7db43edcaf6c797bcd2a6fa8684c3e56ae8fdcb344b7a8f2c86fab0e03c1fc"; } - { 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.0b6/linux-x86_64/gn/firefox-112.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "360fbd631fdbeb8ebc876920c8346a4f0f4d903ff931014db197b0ed0170512c"; + sha256 = "812518dab7d7d964ba8babca078df50cc38453b103ca803e09eb2e48173f1c1f"; } - { 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.0b6/linux-x86_64/gu-IN/firefox-112.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "42229ebfea176d3c0bf174115025fe9bd9d0303821618a2843a48364980c87e5"; + sha256 = "ccc8b86769c127c3f041c89ebe48fb88ff50df0ff95021f944801ab530f9c304"; } - { 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.0b6/linux-x86_64/he/firefox-112.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "eef8c9609920d4ab26030e697465c38783f6f8c9688d2f2ead3d6d572d57a8f6"; + sha256 = "b275c9ef40ce81cb6a85e210d7e3b547913af7ca3715dd54074e5024b428ba1b"; } - { 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.0b6/linux-x86_64/hi-IN/firefox-112.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "cdf20283ad2698a16c1977c75d1ff424f75008d2166585d41ef92b1293729ed0"; + sha256 = "4f3b3743ca324935aa3fec117a6d6cc1ee8321fd64e281529a8ed070ae2a013b"; } - { 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.0b6/linux-x86_64/hr/firefox-112.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9441a3683dd0a51360ab84d8c0adcf9bad148e37025e6484995bcdc141acdb67"; + sha256 = "059ff55d680a0d8f1bdfebe5deca396de923f6f4fecfca82b123061f5c47d3a8"; } - { 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.0b6/linux-x86_64/hsb/firefox-112.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a30c59deb36336392794867d12b4c6fbeaf4c8c2f4e98c843bc96799a877a2e"; + sha256 = "f62efb1274177339936547265b10de4e507e5ee71220aac10c9f00091f67abe5"; } - { 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.0b6/linux-x86_64/hu/firefox-112.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4ba34af1efa0f1b52858c200035d696e60417f36ff4884c88fee01e2589eddcd"; + sha256 = "4e66d7fed06b0b247e5b253b27a7bd647db142f1deda1edb4c0f3498843ae439"; } - { 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.0b6/linux-x86_64/hy-AM/firefox-112.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c20eac2ee61c73b0d5065b7842a4f5daecd3b29d5d508e6aac8512301da428cf"; + sha256 = "ef9dd23be04d7ee7b06ca830ad516765e95172dbbaae14b8a33e77c38edf7c84"; } - { 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.0b6/linux-x86_64/ia/firefox-112.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9c5aa72cb38a505f289df411bf458ec0aadca322b19819b6098ff08d74bf9fe3"; + sha256 = "163f9577825303ad0705df664d2359190d4555893d4deb60d8999b5f98f4578a"; } - { 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.0b6/linux-x86_64/id/firefox-112.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "46146a6c4fcd09e091202a20b4a352bbc9dacb84d7459a40079f7b95681d6ad2"; + sha256 = "558c1d87e938084462a118e1991d1d7e1e21cc4f046a9ff41a87bf1d5f883bd1"; } - { 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.0b6/linux-x86_64/is/firefox-112.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ff47754b70642cc10c151015f67465b4e334945a9d1861f194da6a0ffbd3a549"; + sha256 = "0cfa8d0c8f797266c6fcc8bf31d559d1c107c0e9a9c2e255ad41169496f25f44"; } - { 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.0b6/linux-x86_64/it/firefox-112.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e67c8c532ddd34cb1dd1195e116e87af8cabae73e4c734614cc8605cf0c2670b"; + sha256 = "8e9b0088965dc9a12aa7147ce057b1ad5950d4e935764edf8075e7a954870c86"; } - { 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.0b6/linux-x86_64/ja/firefox-112.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "022aee39de289422088628f9b71de28a3d9b994ad87f489c0f4491e7279106bb"; + sha256 = "37055a2e0dbcb2ae5daf068b1665a18a69623e0f16e3ae3e92bc1cbd763c4eac"; } - { 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.0b6/linux-x86_64/ka/firefox-112.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "05ee2bf3ee4c90f879b4410ada592c9feb53df9129df23f711896a5fd9e1d349"; + sha256 = "32ce3679cfd4496c2b15726e526589f88cf32be1c67015d2e7b64cf25d482c90"; } - { 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.0b6/linux-x86_64/kab/firefox-112.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c50c4992077a7cec127be1c648d431a69bca9f135b247e8d17339716c35c6301"; + sha256 = "3c2f0bc4289872cc4af3fedec73f378f5bed1494725b5166ff0241ea7a1cfacc"; } - { 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.0b6/linux-x86_64/kk/firefox-112.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "86bb3a893d3a93b54fb7c9de260fce58f33b7157d9ac67f8cf2e1206153d22b5"; + sha256 = "81b32893eac3bf5da780136b68f5bd8b7ff07d228f0745b2183275bd1d4c4cc8"; } - { 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.0b6/linux-x86_64/km/firefox-112.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a0b3a731be915fb4a60bd2fc665733bda240596f1a0560139fa2315343b61ece"; + sha256 = "d14299677c06c038c5065d2beb492ddc7589817e8da5f4ec18060ea2badcdf01"; } - { 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.0b6/linux-x86_64/kn/firefox-112.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "72a4374de710898854a360c8582c1395bf2956084c0cbaba550c1c0e3f9d6cf7"; + sha256 = "50ae16bbb02bd429052822d86a1a380782f4662ae3e422e609ab9dd0c49c7fd9"; } - { 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.0b6/linux-x86_64/ko/firefox-112.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "dccf0da734efcd432d6b3a0f2355e076389abab2195124f47fd718484dc40bdf"; + sha256 = "6eece940c50c4140480c81ef8f0ce5c69e58056b522c6a0e6afbe365a670ac52"; } - { 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.0b6/linux-x86_64/lij/firefox-112.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5f6be135e9246d5a866c89afab8cd0e97f57153073cb91d9171fc4710a08175e"; + sha256 = "b530e6c0ba7c339d2c9acdd09093d91c446078fcf3e206067d0ed3307d58e730"; } - { 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.0b6/linux-x86_64/lt/firefox-112.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cbe6953543c0d4ed357e963a4fa224bc93a4a6d7b5df3df6519c10427ea0e296"; + sha256 = "4c80c748503e6dd3610a16a1c5aa659ccd7c87e36995dc4dc8d6866f94bb0c63"; } - { 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.0b6/linux-x86_64/lv/firefox-112.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7aa9b425e18a65ea87a1ea8f9c53fdbd6c0cea6c1f8e1de969084a30d4fd3ae9"; + sha256 = "f6c9a2c64dcb1fbf5ed1926ec97c2f2d027f2293373570b144b8e848315b9932"; } - { 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.0b6/linux-x86_64/mk/firefox-112.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "149e4d575764ad523b63983b36eac28a0966a7c33b0e54e7e525e75f6cad8511"; + sha256 = "27e1ea632973fe0f033a867af5f640c9062c4a094374f06f7ed24920bbd90dac"; } - { 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.0b6/linux-x86_64/mr/firefox-112.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7b89022dfa8ec90607844004a82f6c064b768f0ff26bf4bab96c0f46d0c45321"; + sha256 = "b800670eb9767d3fdc7c1f4eee3dcb114a643aeac04a7c46c6dcd1fd26d767b5"; } - { 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.0b6/linux-x86_64/ms/firefox-112.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "efd9c123189f5cba21a1177f245403bd0b40acfef72a8bf696be3221c87c06c2"; + sha256 = "bf48affb46b6f6b1ef28eda29b4ba4050c4d0386c07261181c5f1e46fa3ec682"; } - { 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.0b6/linux-x86_64/my/firefox-112.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7d644179700df173a9111c41f3de5863f5d7d72d0552d2fcd99bbfd129b9a3b1"; + sha256 = "eba976f190093299f0eda2b486a690400a52e81be037e8cd12afce94f8df97cb"; } - { 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.0b6/linux-x86_64/nb-NO/firefox-112.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "233080da37207e934405f033e397d32dee4897b10a96372eafaad1c7c7202b6c"; + sha256 = "28a5a231ef583e9e2a9a1275c386491f5a32de673d7d6f91ddc6f47dc183ce16"; } - { 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.0b6/linux-x86_64/ne-NP/firefox-112.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "df8970e2b5cc7f96f3cbc22ea55d88919737478e1984ff651dc691577bbf27e9"; + sha256 = "7b504900c0b68be9b63bc08d8a148fb237eb65900b152a687639ccd32fe43c2d"; } - { 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.0b6/linux-x86_64/nl/firefox-112.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4c36621ccfe5532781bccf8c4b75889db028b4926f955f2f6f69ecea586c0f74"; + sha256 = "30ecc6272f59d3db4018b131efbcb98ac9724c4c8f6d48309c488113d658b206"; } - { 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.0b6/linux-x86_64/nn-NO/firefox-112.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "fb08d40b78af79860daa81c061405375ea119a382abf428c62da5a2688de38aa"; + sha256 = "e483a0f44f631a4f01c62ec4e31fcbf10e9b5de86aad0470ed46792c263078d5"; } - { 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.0b6/linux-x86_64/oc/firefox-112.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "28c50833f976fcd589e842a85e1befdc9272703491bb224048d7ff7ff9c6a83f"; + sha256 = "6df8c4f8cd34074e2e86de468a785ac00bc2d8fceb2bc9d62ff1b083ceee04f6"; } - { 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.0b6/linux-x86_64/pa-IN/firefox-112.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "e494e1b1e3c2a7847bd45305f98afe3427ba33145f85890ba01664cd383e4590"; + sha256 = "6fc85246861bc852f413d1c4ee42784f7969df13504ce54a3c570c47e1741844"; } - { 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.0b6/linux-x86_64/pl/firefox-112.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "46aa243e6466aad2cf4c9caee954cd420dd5ad095581574d7692f92b7feee57b"; + sha256 = "814a0bfef6e077f86c8d142b0fef2e1017836dbba4bd9247cd13325a6f88ca89"; } - { 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.0b6/linux-x86_64/pt-BR/firefox-112.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e30ce279396acf88a40ae40ac6831ca3a85d6a1051bc3554b51e8a3285d350ad"; + sha256 = "02442f1b2de00105fc6dcaa46a040b48446b671e5b8129f51ee600ee0f122e76"; } - { 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.0b6/linux-x86_64/pt-PT/firefox-112.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1dbd434d60463d59779a4aea948b7fd694f9c0eeb13d62531c3259b45190018f"; + sha256 = "f48a79caa82e3b307e3a3de7bb4a883a662db6f2ac9f44172e0d9e3ad4d71ba4"; } - { 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.0b6/linux-x86_64/rm/firefox-112.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5740e389e978ee285273fb24d12f5fb23b40741c429eecfe44b91f82d27ae414"; + sha256 = "99fc942cd487d122433ffa64645d9187fbf42c10f4415fa8c0616d52f6d065f2"; } - { 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.0b6/linux-x86_64/ro/firefox-112.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6c77aed73265b6c74cfc2f8126277c806b2d4f9629cbebcab15ddeae697c5477"; + sha256 = "5168fc51d066e5a576c1ad3392259b45ab4f8eb14c66461dc2a9e7721ce1f000"; } - { 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.0b6/linux-x86_64/ru/firefox-112.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0b8b9125a9dd6cbbf76e8f1b060ccbbfbae123b537d427a8ec608fef87effa98"; + sha256 = "2de9e8d22b3e60c5cc700c481fc7228097680076eb636a188c507086c81b236f"; } - { 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.0b6/linux-x86_64/sc/firefox-112.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "08780b4d08bfcfbcb260019e55ceffdce03819e3c50b26f8b0260a854a3f178e"; + sha256 = "563ebfaea00c3e25b753e77e10fb3ba1132396996a2ec5744093b72398973722"; } - { 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.0b6/linux-x86_64/sco/firefox-112.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "f76f8d4975a5803ae59ed8d7429914d0a67782f3c6ebe8de74c21c9b3dc422f7"; + sha256 = "c643b62d62ed158a41e6aeacb533795e1c3774d207afbe8a95488bca91742eb5"; } - { 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.0b6/linux-x86_64/si/firefox-112.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ddec5b1eda9ff9dadfa28274b237db1e070bba7602445d0659e56b4d83f5c32"; + sha256 = "6a82759501c7a6da27df5dd3e998e514a459d35139cb17648249599f3c521722"; } - { 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.0b6/linux-x86_64/sk/firefox-112.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7ba092acc5e90f2f0978e3d462946e647e1cfb20fa076f071668ad7e9a575dfe"; + sha256 = "2dd5c7c2743dd8018f46594c4ab7ade8b76e94b88f13ada5874722a88c48f72a"; } - { 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.0b6/linux-x86_64/sl/firefox-112.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dbeea39152cfd7515830d7e4a543d6c7bf91768ae39035cf817b2e919c1cc9be"; + sha256 = "7f5ea08a2978b7fdb148c515c213183217deb9f23c2bcd9fcff07ef0d58c5228"; } - { 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.0b6/linux-x86_64/son/firefox-112.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c3b4392bdd6eaf3f7cb4abd769a2389ffd9605b80b52a99a6084973a9c9eed16"; + sha256 = "ce987ec89797e07c51d0b96346243826d08a52365511e8671b3a2d1f8b0a57e1"; } - { 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.0b6/linux-x86_64/sq/firefox-112.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "372d6f5232a746679a3773ba3ee74762427f9b529f9bb681c8359dd0d5adb6c1"; + sha256 = "c5062fc67d51dd29df304b5ee381ddaad4fa62fa92a7b1ae5278671e95c2314a"; } - { 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.0b6/linux-x86_64/sr/firefox-112.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "edf3164ba81dae459415f8c41f0fac09372080d3fe413eb282789d3026db8f83"; + sha256 = "6fc309a7a2412e7822d7017ba2fee5f1cc5dec9d8021f0ae4cf9101a2c4dadd9"; } - { 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.0b6/linux-x86_64/sv-SE/firefox-112.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6a5da09f8f5dff0cd147af8b45c341f301b1716b9eebb0cc7bc348124c5fb242"; + sha256 = "c0794112545d72c57a98398d984ec88ce465559e7648cd835fb8df2944eec376"; } - { 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.0b6/linux-x86_64/szl/firefox-112.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "df07280e6be3573342c5421de2e7137e63fbe691590ab9cc442e63827803dcd8"; + sha256 = "e1e134dd0e9bfbdf06b2348bab4020e904fc50c3792738cee479562ed1093fc6"; } - { 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.0b6/linux-x86_64/ta/firefox-112.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "44d8ad4cd0dfccef357ef7b2d212a913cafc0433f2aa9a3672fd1df1e2a72c98"; + sha256 = "2cb9caa865ed321016cefb2d69c304b57a5346bc19f491163e6f7750719f3788"; } - { 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.0b6/linux-x86_64/te/firefox-112.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "70488686b28265481ddb882ea66ae03309828353a04123d46e33e19edb0f4c60"; + sha256 = "8bd811c257f9dea90ecb67a681ebe38c8e822c99a3a131008009570db5812b81"; } - { 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.0b6/linux-x86_64/th/firefox-112.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "70d3bf27c80954553b88fbdb486b310c19726e5953e91edd159e61fda76de6fc"; + sha256 = "968c068773476365ef0649b39354f46b4391d5adcc75ec7dedcdaf24bc9c3fac"; } - { 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.0b6/linux-x86_64/tl/firefox-112.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3126646299c67c74a59801c694e48e5f5402b14a636b4917253259967edbfce3"; + sha256 = "f62b4e88589a4bd66a29881e0f296bda9458616c922c9f727e37486703ee4103"; } - { 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.0b6/linux-x86_64/tr/firefox-112.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2ea8edfff3d4fc495e37d108cd5c8f7d003b929f82d065936a80e6daf4fc7d99"; + sha256 = "bbc7c06f87d6c7a2de53182f8584ccf74298af1ad64013e6c6915df90e26cb47"; } - { 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.0b6/linux-x86_64/trs/firefox-112.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fb29e43f65dbf2a550c5d25a170be28a05e96a1f4e3e735835be8db111220b06"; + sha256 = "18370b2ffb2b584c664c687ef716af4a0eeddb6851790ad2fb67dff393c85f88"; } - { 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.0b6/linux-x86_64/uk/firefox-112.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7a3111f74b3bc9333ebd2ce2db0c1d34c55196710bfe628be37924636feccf3e"; + sha256 = "196fc861eea70145835f93e7111e4453a42d16b1f243bb4ffcf1234f305d0c8c"; } - { 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.0b6/linux-x86_64/ur/firefox-112.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "dcd147e968ce2a97d36a3c2cc8b6c8c224e1f548623c30febf301d1870924315"; + sha256 = "0725751ea0f6f7fbe0f4e104ae7a9ad5957b9185c29d3955a9d0d30f3c09e06a"; } - { 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.0b6/linux-x86_64/uz/firefox-112.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9421f0b5848d2f15954539d59ae5ec92c4206abb48e608ed26dc5a5c55346b61"; + sha256 = "c9a139b876bbd13eef0e51316c07264aa7b2e1405b7e9b2bc5992cb954cd5975"; } - { 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.0b6/linux-x86_64/vi/firefox-112.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f3b4f54631e37488ed3444058eed40d060c82eeb67f423ba8a3d500dbfa4ad8f"; + sha256 = "73d827171ce290803434b0763efb9d93ce44089823f6dead23cd11cfb48b7dda"; } - { 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.0b6/linux-x86_64/xh/firefox-112.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ec40e4e8f37f561f8a49a014ef538e7e8d3b78dfa526657cc64f8784ee1f945a"; + sha256 = "3ff3c8f0f0d2cb18da7b8f110499491a8d5d285eb2cf52d38898706a03104dad"; } - { 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.0b6/linux-x86_64/zh-CN/firefox-112.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c4f780ebe92916044c71c48cb58e7dc10c08ff0ad7446d01a3ec5fdbf6c04e70"; + sha256 = "74c30b59b36560a275f89ae666c9f4d8ab41fb6dfe9c3176a993b85f6eb03f2a"; } - { 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.0b6/linux-x86_64/zh-TW/firefox-112.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7556349dda4963f88d79a58de2fd2d557411997485bb16dacd90be297c58769d"; + sha256 = "97d25ac61d9a85a00c2cd8ed4d5d47f2e3f4c5c1a46ca036cc79a0cd2eb955da"; } - { 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.0b6/linux-i686/ach/firefox-112.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8c8d1a43cbb010798570dca68fea1502a8d9ec0711bf3c69c2ddd173a3538317"; + sha256 = "19776a30548215f780e8013709cddbf77a92810e66847ef38a8e29e81221e50f"; } - { 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.0b6/linux-i686/af/firefox-112.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7c89e0f7270caf1ef3a69c5514da97cce715f4e3a52ee545ef5aa78cf03dd55c"; + sha256 = "2a575a6f8348e0e0084373f80197cbf78fddba5716b51926e9d2b707a7c64149"; } - { 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.0b6/linux-i686/an/firefox-112.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "355596b7006d114efc0a1c75cde51d01cfda3dfa06bd59fc0dd9ce036a54b77b"; + sha256 = "580a30e4e45bcacada0c42e7f4461df118bedcb3bef3dc32d78030025b4a1e6f"; } - { 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.0b6/linux-i686/ar/firefox-112.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c43c434a8f090343dd718d3549860ca6056ea75cd0a805eb74ac44a7475717ce"; + sha256 = "705dff2e9135a5db4260f16f1d4b94a01d2aba642049d5dc38c0b60c4bff0fc4"; } - { 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.0b6/linux-i686/ast/firefox-112.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c64aca4b338c1633fb0e64f1c5992121dc29908c34d776aa569ebf58fed065fb"; + sha256 = "30ef9890c33ec4f4c4b5a8c41ebcca3db93a20f24a61523b8446d4d89746a507"; } - { 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.0b6/linux-i686/az/firefox-112.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0370b48bd8b3c7f27fa6cc715acfdb0f8d065aaaac00c15250a47bdf7d481faa"; + sha256 = "7f679b6e47afeec3e5bf85ae2c3235e4962e36b751cf1a6fd67c0c822e20065b"; } - { 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.0b6/linux-i686/be/firefox-112.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c12a416339347b843990068f016d1fe199efecffeb57c4555f2fbbe71d6e37d0"; + sha256 = "ee9f99eee4460cb0862f6dc647cc494ffe28f11ed2999f005097510487eb165c"; } - { 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.0b6/linux-i686/bg/firefox-112.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d0587424301145187f35ce7474485517e9440f3e4c5e92eb3565a97c39c42d1a"; + sha256 = "f73d2142887d3a4ebc1c98b8482901039f5073bb6f07ee190753b7b892adf47d"; } - { 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.0b6/linux-i686/bn/firefox-112.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "68cd8fb4716dcb2a10b5c332c10d1f8c47ec79b0fc344275b3ac23086cb0b89a"; + sha256 = "e6a255f95e9bed6295c03383eb5b32930a7600529abd885c912638fc2c33ea33"; } - { 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.0b6/linux-i686/br/firefox-112.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7386b53e5c4eabc0f1ac191b6a93acca5b3fb38ce0f5006a0e94f3050d790281"; + sha256 = "a14a44af3576aae7ada0fe14856219803d7d2a025702430418e9ed46e62acd85"; } - { 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.0b6/linux-i686/bs/firefox-112.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "40686fd813e59c155ca4b08c9bf138be20ec655efdeeea9201f78f7b11615422"; + sha256 = "62a797df2f195d1fc3a402a55acef10c0e3aaeaa7c8dabdecf6ca41d3094a442"; } - { 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.0b6/linux-i686/ca-valencia/firefox-112.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b16cd0d27edd8a3477bea72326e9104734c276602b94299b58acdeba10ed1620"; + sha256 = "91d512c997715a15d4b02f59668587e8fce15dac958719c556abd452d82a3327"; } - { 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.0b6/linux-i686/ca/firefox-112.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f0e81d340f00c1ded4df4d0967c1183d4ef18c8f3864fdb520ffa32cec2fabfe"; + sha256 = "f302ccd5ad1ef1f4611fe4a8fcd9f9af14e5cb803c515419c464dbe41fe61b7c"; } - { 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.0b6/linux-i686/cak/firefox-112.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d6c1545923f780491c3b4d6789b55303c107c533375ffb04401781be56e7315f"; + sha256 = "05ea38ce95db95c44cb29cc72865f578d71353756a344d7e168bbed0796253f4"; } - { 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.0b6/linux-i686/cs/firefox-112.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5af2de24992583982afbb684c9c6e58a4d98eb35ee89d6cad6e9bd18bbecb470"; + sha256 = "dd74c98db61d4adaaa89262438430841501815adcf285fddb8b86456ead1284f"; } - { 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.0b6/linux-i686/cy/firefox-112.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3aa0dfa96a072c9a2a333666e419e000ab36861058b1cbce6abc11d935fa03be"; + sha256 = "56337dacca8929d3c65b188c56c333d0cf874cba2df89cf7b530853ffa6f1e19"; } - { 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.0b6/linux-i686/da/firefox-112.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6998603e2c5524c38b7b89bec452fc658956b55561c94fc4b0fe08691ec978e3"; + sha256 = "c7a86a7c2bd94cbced67eb151a102c9e59b86c623a5df86a6ea8e936ceca4074"; } - { 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.0b6/linux-i686/de/firefox-112.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d5b59dc00dc63ad988c9db7f770e31f9e5ea68fb15db894dd3fe90d78797932a"; + sha256 = "2a9417463238e4cade10ba64dc8677410dcb8ac1d0917e715f059060e52d6fb3"; } - { 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.0b6/linux-i686/dsb/firefox-112.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "526ac2c06239a7176422bf37757be3117a3b349e3f2c97c379ed797596047b54"; + sha256 = "70b660be2e0bed4a05cc0ee8adc2becd6583b835a9486228febd8905cca63ff9"; } - { 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.0b6/linux-i686/el/firefox-112.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9af390e46e28c9a5e3ab3646a04363ae618303d11bdb1661c0d1e5413e5c5b87"; + sha256 = "604183c159eab56032cd1a9ed45f9f63e9054eb860429e4d5e49159d8b422e18"; } - { 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.0b6/linux-i686/en-CA/firefox-112.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bb012f07f4e13d95d1ab24bebc9c655dabcf5a3d03e2cce578402cbf9274eb2a"; + sha256 = "979e3e37d25202601c2123f2175bf65c96111154e338c59780b8ba3afb018390"; } - { 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.0b6/linux-i686/en-GB/firefox-112.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "943f1fe86afa3c0f7ae8d348fc7c80e08a57d5117d1eb4c848b7ca3b75214e1d"; + sha256 = "5b3a8d845970563c991053327e4951f0b44d4e0ac2e96ef060dca757ba7dadf6"; } - { 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.0b6/linux-i686/en-US/firefox-112.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ef7b243ce04c41fd438b20522f7f90f47b903c513812606945cf9326ed183cb1"; + sha256 = "9349b8674173490d9886e2c3c31a72041da819021d1bd3f7eb85cd62f66468c9"; } - { 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.0b6/linux-i686/eo/firefox-112.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3e058915748fa0f50b1b439d5d933ef79f98cc6ff6112fe9a3ea0f9ff34f868f"; + sha256 = "5a7d10519cb3744f558605a4090fb2b3994cd5694f3210f5b0fcb1c82ba206b8"; } - { 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.0b6/linux-i686/es-AR/firefox-112.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e90bfaaa61c2569ecd6090f151cdbf9c2765ef6fe79ec301f23609ee0006f91c"; + sha256 = "e4bf9dc36cc77e6581c2eeded1915138e944cf113f7b733bf3f3323c6d954d50"; } - { 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.0b6/linux-i686/es-CL/firefox-112.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9c0a842c4ad9915e2ae03358277dd60e7935c736b1dd04c66795fa99c90a3dfc"; + sha256 = "93b4d67bfc8d8d6fbaa49b2973f4ab3f46d7f7dcecf4b4f4e44265c528145e76"; } - { 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.0b6/linux-i686/es-ES/firefox-112.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f37a758563eddf6f397785c79bd9233f4dd19a9830562ea821e64123c31cb64"; + sha256 = "3ee2c2475362ec2a4da4e5870676bece65a43f3b55a0d61dddb3c9875ab6ee31"; } - { 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.0b6/linux-i686/es-MX/firefox-112.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "547f4f9ffce5a7ea5ceabc4ba402eb42ec0ce539e5bd4e51374f2dae17ca7949"; + sha256 = "62e6ae0e8636ae43d0151fa549cf62c87cbc472ed9cd6f5783b8d4b76fb76996"; } - { 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.0b6/linux-i686/et/firefox-112.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "eff697113a52e31069e4961354eaafe78972dff7a68737fb6153a42780265c43"; + sha256 = "0a9bd46034f708195466c4002efec47e0a6316f31c3131a50f1cb6a31727b061"; } - { 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.0b6/linux-i686/eu/firefox-112.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b9f9aa5538b44f8365276f54f75bcee5725f915f1d57c2816b09254b8fd1d07e"; + sha256 = "334dc2222832a40d8bdfb831544300662be6c8ad650782a417e40d211bb7156c"; } - { 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.0b6/linux-i686/fa/firefox-112.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a48b03b41e7fe9f75b8b596ced9fa45c1f6fd709d67413691b93c53193156e75"; + sha256 = "a1cb40d0e0cc30e6430a2b24c33fa8721a82a0724d52098048d659d8f4b4aa27"; } - { 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.0b6/linux-i686/ff/firefox-112.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "03b86fe75130b180be97340616f9a5995bcb5e81d9900912fa9a324e0d409182"; + sha256 = "a687a279ae9b75d48b030458cf6ee82601f5da63fa3f1a856dfd03c9c185a371"; } - { 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.0b6/linux-i686/fi/firefox-112.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e9c3a886e6491d23631f724058d9d435cc9c0e60de3cb5b33ea3acfa8babb0ce"; + sha256 = "26c51b6966c6a1042baaeed143e242f47692bab7caab22037240d6f52d3e48a5"; } - { 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.0b6/linux-i686/fr/firefox-112.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dcb7513622428d5c91f32667a055e61072fe0d5039545bc683194b36d6bb49a3"; + sha256 = "6d75a816c793be15a3747cc550317abf443f9a348ca049769ca84ce9e09e46d9"; } - { 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.0b6/linux-i686/fur/firefox-112.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "33fdd12569cf1b8eec60ded795559286e7cfa41b2db58bfd9c7f4887000a6b82"; + sha256 = "1b6093306c6d8b5c4158c9b93fa95eeba5bc5a683ca25a126c95bde31ca97e16"; } - { 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.0b6/linux-i686/fy-NL/firefox-112.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "d95f0bc82184d007d55de86caaf84ac442ba56c840b6798dcfd5b8cc2854c4e6"; + sha256 = "e5edfba6e09a677a8ac5d7e482a26210c9c34c35ddf18d558aa26428b6a1f29f"; } - { 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.0b6/linux-i686/ga-IE/firefox-112.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "48d23034a37bdd46385b9974eaa4569c080b4a873e00e33be0abcc8e945e1f42"; + sha256 = "4e8e0584ed9246be2d41eda90852a202f259ee041a239f6005f37eb2127e0d6e"; } - { 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.0b6/linux-i686/gd/firefox-112.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b1facf79a7b6fc22d75307954dbb189a72644ee665a2d8dba1706b5421c6e96b"; + sha256 = "9dca713182c1a40859a648da50ab2b9d69fb3c213b34e7ef7ce328c0f2b04556"; } - { 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.0b6/linux-i686/gl/firefox-112.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "769315eb7186ef37227a43a96ee2a67634d9020f47fef673de9dafa66a2d7436"; + sha256 = "4a551695702b3cdff799390e783b0924432af243e5a546e183772de555874e47"; } - { 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.0b6/linux-i686/gn/firefox-112.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "fb48fe024c20a025084fbe6f261f756b2b609b72ffc59e9645b0bb88ccc00746"; + sha256 = "9e0130b8d9b093afb1896c3a70ee26d94bb8f486b449edb4774cdfaba0783201"; } - { 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.0b6/linux-i686/gu-IN/firefox-112.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5854e070c36bd433025d60c28ddcfd3ae73dd7f4787198dafb6b1e917cb3975"; + sha256 = "dab88118d1ab466c7726a1789381614fa21dc829aa6ce65ab57f8caf8079c065"; } - { 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.0b6/linux-i686/he/firefox-112.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b71d3776631872e549ac310638b51828c8b1b7a600943c73d65b5e9121e10b9e"; + sha256 = "4b7debe735b5b8aef668cf586be61a39e964d7990047deece2ba90f058917746"; } - { 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.0b6/linux-i686/hi-IN/firefox-112.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "61cb5d112085b4185ba21ce1277aebb43701970404a632cd255d2b010a8ca5dd"; + sha256 = "2e166358b50df0ebbf3c37a4fcfdb12c11d37c6ccdf215a1fa75b6abf6022a92"; } - { 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.0b6/linux-i686/hr/firefox-112.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0b3151de29c64199f4be91dd499f4e5b142dc5832fce7465b5ac709b103d2c06"; + sha256 = "550c33b0c45f69b8bcc90ab2f79b40ed63e65e9c93a16c6457838c3a1437c852"; } - { 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.0b6/linux-i686/hsb/firefox-112.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7935f0cddb2f8d79fb3295b286a5ac8a62f5dfe54b72aafa7ed4d90cd09e7e81"; + sha256 = "cbf4ab6aa4789bcd2e2eefb49285ef557148af04b9b80a7e705f8477c475b1c1"; } - { 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.0b6/linux-i686/hu/firefox-112.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ef39a9bd38c4e697b2acfc385e4f4b6bf64ee5196530a1f96d922a80f5e96811"; + sha256 = "b62c4ad1bb3e4ced77ee7f37685206974302598d9bd3e4fe5bb8d6631404896c"; } - { 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.0b6/linux-i686/hy-AM/firefox-112.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e4a35e4eb59270c98784fd5956d7576703b8d6f374e63ff99f859b4618a0e957"; + sha256 = "3348e171f9457adc872272f420e3c657532220a8b562f4baf55731944a36e9db"; } - { 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.0b6/linux-i686/ia/firefox-112.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f9f6c8df9633b5b04212ca108115b32b7b7d670e105e5eabf971ab6c87ade854"; + sha256 = "6ce221f1bdf3d0af0d149ff6ad630ae79e165a3e56d1157d12bd0530a669a635"; } - { 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.0b6/linux-i686/id/firefox-112.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fea802d675e2ccd2b389e81d3ef2766fa3083ece7a68450f33914421fe8081b5"; + sha256 = "f35d99e6410bc31c9bcb87f96aceb0c303223b57f5640e2bd950ae2dacc8432d"; } - { 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.0b6/linux-i686/is/firefox-112.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e2a5ea9a8cfe0d769c9b61f5a452e144973017c2e65d6ad03e190413c04a2430"; + sha256 = "456cde1dccb24c86e9ea049f1fd0d2b939307aa519f70761b90f9edb3cc3c103"; } - { 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.0b6/linux-i686/it/firefox-112.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "211864798e0ff9fb06f10fe9e0c36ab5617ef5447cf24d03b5127f3a456a6249"; + sha256 = "0cb75b4dfcd9d75673eeffe0d779cc4ea8762d97e9feea2e49d3908f63726b60"; } - { 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.0b6/linux-i686/ja/firefox-112.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad7dba75cc991240315eabd9c99a3d643c8cc9d403f679162961be5c7f9da198"; + sha256 = "278dd545a883088cad75b13225ecf639c6799ab198c0c3791e8bca5c92d2d177"; } - { 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.0b6/linux-i686/ka/firefox-112.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9a27a1b23da7c17881466ee52f0fd55de6069fbac45721e74c575a65d39924c5"; + sha256 = "ac969431f2807db57035faa6722cd124838a128e3f21011e98e95f6dcb57ad22"; } - { 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.0b6/linux-i686/kab/firefox-112.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f9b89268fb6cea643117779d845ca607de48b680c8331123ff9a2213a49c6aab"; + sha256 = "ff59f7d076f1410274bb627778b3ea672c47c576585f24aaf259eaf9329dea92"; } - { 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.0b6/linux-i686/kk/firefox-112.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b3995abef49360a373e73d612683a9de37df9da3172f754855977b2a350f02c2"; + sha256 = "3a4b1a95db17b68cd39da5c1cff17c4af616b45f754403a8ca7e26745cca447f"; } - { 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.0b6/linux-i686/km/firefox-112.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b113f611be572fad8d707ef089d1113a840f47341960b0180ce8c8d958c0fac1"; + sha256 = "5626087484f861a701387858f77852e7c89e86d65fb0826f256f59a94f45d791"; } - { 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.0b6/linux-i686/kn/firefox-112.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "43376fca7535feb95e083abf2cd695d452cb7c3d9e5136d617340f37bfd695e1"; + sha256 = "56d4e7875ad5a4aa3b4eaf48aa6dd9df6311b78fdc5c7d3bd6cd3a425c203974"; } - { 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.0b6/linux-i686/ko/firefox-112.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cab18f93e0ca6b56d5bbd269e33fc80e16e8048a359d81d6e272582c6c6e9a76"; + sha256 = "f9c93dcf09240788b0ca138c77ea3aa1f6c0aec58920be3fd4040e127e69ddaf"; } - { 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.0b6/linux-i686/lij/firefox-112.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "69c0416f559a64bb806ae7e3eca236ec13621cb8ab634e1aea901fdcb80180d6"; + sha256 = "e038a14c85ea3937ec770364449cc595257264f05f1cc6b8cdb143f66a891aee"; } - { 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.0b6/linux-i686/lt/firefox-112.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "ab662f5812d14e544255c1e708b9c1961ad6d9d37de25986aa4069beb568d9a2"; + sha256 = "5a47ee907197e21f2a7c8e13c22e6e01aa336c1adb608ba99a85e10f83058b94"; } - { 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.0b6/linux-i686/lv/firefox-112.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "39ba8132bb0178ebf707115a2a3c6a6eb2bcda82a3132a21ca8f8fc77f861312"; + sha256 = "dd97002a88bdeb2de908dace8f67b9240589e22f29d8a39ba3062aa07c925980"; } - { 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.0b6/linux-i686/mk/firefox-112.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "124b53c31c874fb32f7f006dd48332d44bb9a139947e52952eeb484d17247ddb"; + sha256 = "685647a2951a1684c71fe9179f49442cf8e14b26a137d8cce4eea7beec7e3839"; } - { 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.0b6/linux-i686/mr/firefox-112.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "58e7e6b526f00187cad5e032323c39d4efd58a9fd8e2e0a6ca46eca4f45e1c6f"; + sha256 = "1033c1f9dbd85640256c130331706867ed9f8bdffa5545212040712fac5e8d62"; } - { 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.0b6/linux-i686/ms/firefox-112.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fe19152b27b2ad3ba6bcaa127713a0a9191f7c81529ade02e48817f5f6cc12c4"; + sha256 = "d71844cbe97105e5bdf7c7a0b01c33dceb190c331526113f0efe114a163a2af9"; } - { 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.0b6/linux-i686/my/firefox-112.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6c39c38301d6e5d845c4a4ad34685d8017cb874665aba823e62cce651b388f56"; + sha256 = "4767bce810321d63d14a4b74a1e5387bca6f2181967fd2f06b03e0da849ef20c"; } - { 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.0b6/linux-i686/nb-NO/firefox-112.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e297b652111781206672b3c6191897080c3d6dff63e74f7f62c6a0f4292a3389"; + sha256 = "45048e94308db389ac5c42745024320d6dfe054e11b7ddbcb826382883b040c2"; } - { 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.0b6/linux-i686/ne-NP/firefox-112.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9d25913a2e07c874ede15a3849b396586a32b614ef29087774f244c40a33225e"; + sha256 = "5dd376e2a9c23088cc729c1c729830f9d1c2cda3ae9ea79e13c0ff722638d070"; } - { 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.0b6/linux-i686/nl/firefox-112.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ed3398198b475c4c369a340dbdddb687bdd8b5e0c397e981b3f2489d6e575447"; + sha256 = "9a6dd57d5ab5ca98d229d7d4a851fe6f8fcd2a996914b8a23dafae8b8fc8fc17"; } - { 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.0b6/linux-i686/nn-NO/firefox-112.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "91376b1de28595e2050fc0c56024cc89ec4143b590c51612218c2a822860834d"; + sha256 = "f991770a8a2685acf994d3dd12ae82f3eec687bfc90e2708cb53ca73b392cecf"; } - { 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.0b6/linux-i686/oc/firefox-112.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4ef41fadb4b297b781c8a24fd64302e6e348b455101c5450d9b3011e3bf1d638"; + sha256 = "48981d0797793095954146806120e894472dcfd98396f8bba4328036ca43ea7f"; } - { 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.0b6/linux-i686/pa-IN/firefox-112.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ca8122bcee87fc1384ea0ebebcf501e659987c58bd8a6a2a54f78681ca6df264"; + sha256 = "21b3fab3b57b512ce4699c18dbc3abcec7dc0b4cdba30ebcea0ec7c662ed2159"; } - { 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.0b6/linux-i686/pl/firefox-112.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6e9835f4ccf62810d4e9500f05bfe7b9be205b8103be642ded328bc85aa84c21"; + sha256 = "730232af1251d6b41b82b35fb21465a9d6af22d97654df0092a5070dd23d2f37"; } - { 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.0b6/linux-i686/pt-BR/firefox-112.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e9dd785fd994226e747586ab38a2bc503760938180c0aec1e3966ac35776cf85"; + sha256 = "ad03de89aa51b401845a663887dc707880ad2abb63ff763103f6d17b4e8eeefa"; } - { 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.0b6/linux-i686/pt-PT/firefox-112.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9f37f69dbdf6748da01c3fa9c581e44184091ac0ad85101da7d58f7115a3cdc4"; + sha256 = "b12b8c60458e366c975f88dfa3749ea43c2bd68486883b2bfe922541e4982f20"; } - { 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.0b6/linux-i686/rm/firefox-112.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "752b66437a1684c36847ed36f65005e9ca4156b05c93dcadcb842370792ab252"; + sha256 = "899de725c2b8fa7652c79f1b4e816acb93a2f32602c6530988f83f06bac7d975"; } - { 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.0b6/linux-i686/ro/firefox-112.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "3c5e8aed8dddf11964e3070d539377a82e63827ef1517553ae784565a0c241fc"; + sha256 = "025a050940b6388d791b9c3a08f6c5840615417ced4481cd11d7ef5c7e64f8ec"; } - { 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.0b6/linux-i686/ru/firefox-112.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b626cfce29b6bce883513057dc4571a489f5e0c392c7222e9853cac419923165"; + sha256 = "a35164120fa259bcc2c325aace7bee3b9a7d12c27ea7efd357c5ca35b3be1248"; } - { 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.0b6/linux-i686/sc/firefox-112.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d96abbf55494f33262ba3edf2552b96ba71defb0318a36118a8cbd26dd3ec4a0"; + sha256 = "383638b4d42846f7560f7ec9c7ad922048bd4a26d9c3ad970135f6c3c974cbbf"; } - { 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.0b6/linux-i686/sco/firefox-112.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "b352cf61ef75da6f2ec0c8fd6a16e90aa72961a82ceb7a014dfcb0a9ba35277b"; + sha256 = "e8db341fad63d07e25a6df1833e7cec51be6dba50df1d9b56ca7723f275228f9"; } - { 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.0b6/linux-i686/si/firefox-112.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a4ebfa843e140b8b7015fc6945dcc166211882662f00a6c4eb27d2334cb2fc97"; + sha256 = "5bbdcb123d8d7679838589353cccda6472cc656af103ca3fdcaad73b9e13d5a7"; } - { 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.0b6/linux-i686/sk/firefox-112.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "83d58804619b82afc9431d048c16cd3738dfa75bf9d6e069b1f020a2b628df1a"; + sha256 = "f2eea2a25a651232fd2a6f7292ff4aecf198260e354b6835827f7c917fac740c"; } - { 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.0b6/linux-i686/sl/firefox-112.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1c36099781dc219b1cca5d9796f3df67f0a10412c7dc494f2a8cfb53e4668ee8"; + sha256 = "07fa7dbdfe3aec9222d77ed0bf5622262970c899559514ac1a802fdda5aeeb96"; } - { 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.0b6/linux-i686/son/firefox-112.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4f27373905fed3827c1b74ce3de095d435e4dcc9a163d40690e072cbe42141c5"; + sha256 = "a1b8ea0657a86a5bf6177b7367604f3090799c75a81e126ded4b172c2141f522"; } - { 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.0b6/linux-i686/sq/firefox-112.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5080273f3461bf27473fbd4d435d5efc50f6e15ed7cb382f000db313a4df49d7"; + sha256 = "e06ae973fd38b96bac35ab0bc9cf4b126309f91accc74d7a516212dfae9a60cc"; } - { 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.0b6/linux-i686/sr/firefox-112.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d8589c74b96f1a162d1d37c9e280216af7769cb7f08c151a530fa1d44bf6311b"; + sha256 = "7dd65f794705aa6a397327b9468b349bb91773022124b1aff0d3077bc1aa7855"; } - { 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.0b6/linux-i686/sv-SE/firefox-112.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4026373c960ffc40beda3f9dd04b13d274d751247abe23631efe517b57ea23d8"; + sha256 = "0a21d28820d5412136805f036aa36264852b1633f950d7292f10231335545d0a"; } - { 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.0b6/linux-i686/szl/firefox-112.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "697404cbd67c589db561ebc2261fe15af6f272609d17cc5ecd6c434d95cb55e1"; + sha256 = "4865191a0fed0a435ce6970e5a61683ce0482737cbf0619b58faae263f3b84b6"; } - { 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.0b6/linux-i686/ta/firefox-112.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "187b26a699a3b7f4182433ba6a458420434137ae44fa662eb88e35d592de1dbf"; + sha256 = "6f77a1fe557eb3c31b588ad3da1656fb887f644a2732df958d04c7be072ec630"; } - { 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.0b6/linux-i686/te/firefox-112.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c21f404ae4626101fa63c7c5fb06a515ad76f5113196f8d5490adb1556808d80"; + sha256 = "5c00deefee9ba062189416083cf1c69d16df8afdce5d3bf24c164977c60018b5"; } - { 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.0b6/linux-i686/th/firefox-112.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8623f5d172c3148faeb0e67ee22aed2586dba858b3c8283ad8f5a05ab32d493a"; + sha256 = "b07e63db0a6c4c93da04304305bc2ea5d98c1802102e644de11d9fa59210545c"; } - { 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.0b6/linux-i686/tl/firefox-112.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b5609b75505ca2a27839ec7519eb4f21f2d84f8eda89b6b76b958b73c7b5e5cd"; + sha256 = "8a251397d02cf17bc4fa32c8c7c271a69de9ee896d60195c8dbf37171d42774a"; } - { 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.0b6/linux-i686/tr/firefox-112.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8239a21e49341ea63dec6e000d7854925b8885550148f1bdeed190fdacd54627"; + sha256 = "e5462ff92013f55e0e62e482c1ab75bde96ba227cc997fe6b7368e52c700fde2"; } - { 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.0b6/linux-i686/trs/firefox-112.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e7ecd2309bb66c2b635430e6f001c742d4e67eccc7d3278d64ff0086481ce037"; + sha256 = "97d33e734780c3c8f47f87b2db8c04e709c64ba6080e86352df9cdf0f74d8eb6"; } - { 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.0b6/linux-i686/uk/firefox-112.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "15eac212a24278055f27bbf9bb7d2bce298ad40d8474a09a64a8d6a82253a730"; + sha256 = "1d48cf9b0da2b9131e80fbca068c69a6e93d5fad1c0e6501ca9952f88bc5c3ce"; } - { 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.0b6/linux-i686/ur/firefox-112.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "5d59b25da307aef5d9baacb68059d04e5125e9f8c9ad72d229b6f59aed2cc856"; + sha256 = "3524739074f3355682aae83165b0617f27f967ff52f736e91f4a2502c9a0475d"; } - { 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.0b6/linux-i686/uz/firefox-112.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b66c8cc522829e6415bf452542d792946c62d6911ecdd8977dc36854a96bb59a"; + sha256 = "a5a8709a01c2c80371e2e996d15b987f637f80f450fec83d30b3912fb9780e5d"; } - { 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.0b6/linux-i686/vi/firefox-112.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b24e0038f2f8147c9dfa79acfd195e5ce8cfe27f5d7ace9a591a21dcda8889a5"; + sha256 = "a70fe7c7724459eef0af6aa473b39f1e67b1e97df0d5d668f605c3462929d3a9"; } - { 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.0b6/linux-i686/xh/firefox-112.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ba5d40a5cd4653e3f3381b25dee1c7a579986fa187e6a1c9fd6d81bd29c0a73e"; + sha256 = "96345654ac1c667f7d44a12c83a59492ccc9ba86e02be6ef25479a60a7196743"; } - { 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.0b6/linux-i686/zh-CN/firefox-112.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5b978f0f36e894eda54f0f690edc7e1fa156b898d550e747a8c5b712bbe2846b"; + sha256 = "4d1ba4d9703ceb99680d4e64f508eb727547593d153cc0639b372c4e09a7b6bb"; } - { 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.0b6/linux-i686/zh-TW/firefox-112.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7d4b52012de5cd28dd21b89c04f2ed1f392fa8637c07747e34619812daf40146"; + sha256 = "ec18e28bc82af7610f78e6c396bef2071300e692080de794acc42e6303a44ad2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d3231f98ceab5..d14876c99fb51 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ rec { firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "112.0b6"; + version = "112.0b7"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg=="; + sha512 = "sha512-81g/K0tLZ6lDnMnomMlX1++WMfK45PLBw7AzppuJGNhl9cnryc4BXilSMF9ibIuyTuSMpLHoCggFtH0k7IRyAA=="; }; meta = { @@ -56,12 +56,12 @@ rec { firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "112.0b6"; + version = "112.0b7"; 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 = "sha512-2g+2/0s2lp36P+W2Z+9zd8AaMKvDFXjV+JgRoqtFr57HPIC+HwW1f9Swg4dFUVN7oz1CQ7cZiPBuH+FmMT7Q6Q=="; }; meta = { diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 63cf728a0cbf9..8b05992828367 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/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/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 685bd7e42ac8f..a2eda0dc3c178 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/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 ]; @@ -132,10 +129,6 @@ stdenv.mkDerivation rec { 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/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 7a9e694214953..c60a867055ca0 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/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"; - revision = "1"; - sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw"; - }; - stable = import ./browser.nix { - channel = "stable"; - version = "107.0.1418.52"; + version = "113.0.1741.1"; revision = "1"; - sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day"; + sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio="; }; } diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 231a858ef4fcc..c361fbd07e999 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/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/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index b955f2ebdf63d..f14201eab0383 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/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/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 020277a33e7a7..0b36e75d9b006 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/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/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index e27ebb58bd455..dd389a374c50e 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/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/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix index d9a8e0693e799..4ac7a163b38e0 100644 --- a/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix +++ b/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/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index adafa76ddb6de..b6dc8d1280a38 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -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=" }, @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=", + "hash": "sha256-FO6SXpFk/DxOvDszwYiftB65JVNoN90JG6JFc8zid50=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.1.0", + "rev": "v4.1.1", "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=" }, @@ -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=", diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 5f857caee92c2..1366bfa7fdf55 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/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/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index a45fc62cf1f2a..9aaf19d75e93c 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/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/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index c9b2c4a21280c..9a8062521fbee 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "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/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 804deb10eb8c1..b7becb715bc8c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/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/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index d80d2b2f4df5a..a9e27186feb70 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/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/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index d3debb243a446..9e6e87aca07fc 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.18.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.19.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version @@ -10,7 +10,7 @@ buildGoModule rec { # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-xAOx4QOdD5MfFLqKTQRGMOnTZt14H523/quOLY5gBMk="; + hash = "sha256-PAxWijTAGOJKRDIKaulNPr/4uOJkm+vqNWAY7AjhFUw="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 91a424d9eb12e..d449ae7db817d 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/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/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch b/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch new file mode 100644 index 0000000000000..572619d515880 --- /dev/null +++ b/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/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7a3802a596804..f67bb6e4167cd 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/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/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index ac0aeba97215f..ebc105147d3d0 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/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/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8f44d79f817dd..403b0bc9e87c6 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/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/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 5dc7779e12e90..3cac4a2dcdd67 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.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/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7c0b8dc0747e8..ec920bf37d8e0 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/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/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 952851b08dbac..0ddf1fc8f9ccc 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/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/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index e2dfb12c92f94..ba4a75ddfbaac 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -145,6 +145,13 @@ stdenv.mkDerivation rec { mv usr/share/* $out/share/ mv opt/onlyoffice/desktopeditors $out/share + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + substituteInPlace $out/bin/onlyoffice-desktopeditors \ --replace "/opt/onlyoffice/" "$out/share/" diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index e73f438f76b8f..52d3c566179da 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/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/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 605a916c6b4da..2826035685a87 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08="; + hash = "sha256-rXiNhk+6eeYF5w/8jSJaEaLEgRYngqTV/wLkMvg6qOQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 3b66284e8b0c2..bcbc90fa37173 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.2.1"; + version = "unstable-2023-02-11"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; - rev = "v${version}"; - hash = "sha256-7Yj6OlZ7weenekXYGhK5EWcME20oCHiLPOxz5KEuKy4="; + rev = "c5f281452816d8de775b13a70fb90e79427c93c4"; + hash = "sha256-mzxtu6YTaZpR17m2WGiSDo/bAPXGJdQskyz7aqtxGoQ="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 89ba8bf0e9d96..c3880b0b1d2be 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/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/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 3740d4e392687..81fab07ecbf8b 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/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/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index f0cb044b3beb3..23310163f279e 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-1yJZtPZ4nMg9Kn3jHpN8b5XeFZ8ZeVLrKYWh7Rp3/oQ="; + hash = "sha256-l+L59QLLrAEVkAZjhxICJpa+j+jr1k/7B61JlapXGRI="; }; nativeBuildInputs = [ pkg-config cmake flex ]; diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index 5a0873b53f048..512f0414f1c69 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/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/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 1b5a0622f4e29..057b242e609b9 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/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/pkgs/applications/science/math/primecount/default.nix b/pkgs/applications/science/math/primecount/default.nix index 8fd2644ba1108..ee6b781d7d3fa 100644 --- a/pkgs/applications/science/math/primecount/default.nix +++ b/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/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 3caf1601084a1..70f5a4a61df61 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/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/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index dda41f24531b1..f1e55644fa5e6 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/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/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index db5b58132f288..ae1bc591989dd 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; + hash = "sha256-2MiFsOZpAlDVC4h3m3HHlMr2ytL/z47vrTwUMoHdegI="; }; - cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; + cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8="; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock index 926d2f18ceee9..eeec1102af357 100644 --- a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock +++ b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock @@ -78,9 +78,9 @@ checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -161,22 +161,22 @@ dependencies = [ [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.3", "slab", "socket2 0.4.9", "waker-fn", - "windows-sys 0.42.0", ] [[package]] @@ -226,24 +226,24 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -365,12 +365,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitflags" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" - -[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -457,13 +451,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.10", ] [[package]] @@ -543,24 +537,25 @@ version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "textwrap 0.11.0", "unicode-width", ] [[package]] name = "clap" -version = "4.1.11" +version = "4.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" +checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b" dependencies = [ - "bitflags 2.0.2", + "bitflags", "clap_derive", "clap_lex", "is-terminal", "once_cell", "strsim", "termcolor", + "terminal_size", ] [[package]] @@ -569,7 +564,7 @@ version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", ] [[package]] @@ -578,21 +573,20 @@ version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2171bc6242ad7a1801422bff039574449b5bd832b715222e500714ce10f91a54" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.1.9" +version = "4.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" +checksum = "9a932373bab67b984c790ddf2c9ca295d8e3af3b7ef92de5a5bacdccdee4b09b" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.10", ] [[package]] @@ -630,7 +624,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-foundation 0.7.0", "core-graphics 0.19.2", @@ -738,7 +732,7 @@ name = "config" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "colorgrad", "dirs-next", "enum-display-derive", @@ -806,7 +800,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.7.0", "foreign-types", "libc", @@ -818,7 +812,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "core-graphics-types", "foreign-types", @@ -831,7 +825,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "foreign-types", "libc", @@ -851,9 +845,9 @@ dependencies = [ [[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", ] @@ -1041,7 +1035,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -1058,7 +1052,7 @@ checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -1067,7 +1061,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libloading 0.7.4", "winapi", ] @@ -1391,6 +1385,17 @@ dependencies = [ ] [[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" @@ -1402,9 +1407,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.7" +version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "ff8b5875b64eb55f4b554f9d0e6413da078d96374974d8bb3bed5f02d55451ce" dependencies = [ "num-traits", ] @@ -1803,7 +1808,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "libgit2-sys", "log", @@ -1857,7 +1862,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags 1.3.2", + "bitflags", "ignore", "walkdir", ] @@ -1897,7 +1902,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-alloc-types", ] @@ -1907,7 +1912,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1929,7 +1934,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "gpu-descriptor-types", "hashbrown 0.12.3", ] @@ -1940,7 +1945,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -2028,7 +2033,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" dependencies = [ - "bitflags 1.3.2", + "bitflags", "com-rs", "libc", "libloading 0.7.4", @@ -2047,7 +2052,7 @@ dependencies = [ "byteorder", "crossbeam-channel", "flate2", - "nom 7.1.3", + "nom", "num-traits", ] @@ -2202,16 +2207,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 0.8.3", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -2277,9 +2282,9 @@ 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 0.12.3", @@ -2292,7 +2297,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags 1.3.2", + "bitflags", "inotify-sys", "libc", ] @@ -2326,9 +2331,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -2358,7 +2363,7 @@ checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.36.11", "windows-sys 0.45.0", ] @@ -2412,6 +2417,7 @@ dependencies = [ "config", "luahelper", "serde_json", + "wezterm-dynamic", ] [[package]] @@ -2464,7 +2470,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", ] @@ -2588,18 +2594,19 @@ dependencies = [ [[package]] name = "libssh-rs" -version = "0.1.5" -source = "git+https://github.com/wez/libssh-rs.git#c48876e7027d3c21747a283be631177aad533eff" +version = "0.1.7" +source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libssh-rs-sys", + "openssl-sys", "thiserror", ] [[package]] name = "libssh-rs-sys" version = "0.1.3" -source = "git+https://github.com/wez/libssh-rs.git#c48876e7027d3c21747a283be631177aad533eff" +source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c" dependencies = [ "cc", "libz-sys", @@ -2673,6 +2680,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2841,7 +2854,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "foreign-types", @@ -2874,9 +2887,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2952,7 +2965,7 @@ dependencies = [ "async-trait", "base64 0.21.0", "bintree", - "bitflags 1.3.2", + "bitflags", "chrono", "config", "crossbeam", @@ -3018,7 +3031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags", "codespan-reporting", "hexf-parse", "indexmap", @@ -3073,7 +3086,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "cfg-if", "libc", @@ -3086,7 +3099,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.6.5", @@ -3099,7 +3112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.6.5", @@ -3112,7 +3125,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", "memoffset 0.7.1", @@ -3128,16 +3141,6 @@ checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" [[package]] name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" @@ -3164,7 +3167,7 @@ version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3365,7 +3368,7 @@ version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -3381,9 +3384,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.0.12+3.0.8" +version = "300.0.13+3.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d974055736373bab35bdb25e578fd477e1e195611744c42373294ac8897068d" +checksum = "f00789a63ec8951fcda9adb0f2258582afdcfe1b2435e332d3a859896f814f0a" dependencies = [ "cc", ] @@ -3404,9 +3407,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" +checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" dependencies = [ "num-traits", "serde", @@ -3710,7 +3713,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crc32fast", "flate2", "miniz_oxide 0.6.2", @@ -3723,7 +3726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", - "bitflags 1.3.2", + "bitflags", "cfg-if", "concurrent-queue", "libc", @@ -3737,7 +3740,7 @@ name = "portable-pty" version = "0.8.1" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "downcast-rs", "filedescriptor", "futures", @@ -3763,9 +3766,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" dependencies = [ "anstyle", "difflib", @@ -3803,34 +3806,10 @@ dependencies = [ ] [[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.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" dependencies = [ "unicode-ident", ] @@ -3884,7 +3863,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags 1.3.2", + "bitflags", "getopts", "memchr", "unicase", @@ -4006,7 +3985,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -4055,7 +4034,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -4071,9 +4050,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -4088,9 +4067,9 @@ 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" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "renderdoc-sys" @@ -4100,9 +4079,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[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 0.21.0", "bytes", @@ -4206,7 +4185,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" dependencies = [ - "bitflags 1.3.2", + "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4217,9 +4196,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -4238,15 +4217,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.10" +version = "0.36.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +dependencies = [ + "bitflags", + "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 = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" dependencies = [ - "bitflags 1.3.2", - "errno", + "bitflags", + "errno 0.3.0", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.0", "windows-sys 0.45.0", ] @@ -4304,7 +4297,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation 0.9.3", "core-foundation-sys 0.8.3", "libc", @@ -4347,9 +4340,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] @@ -4366,13 +4359,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -4394,7 +4387,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -4647,7 +4640,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags 1.3.2", + "bitflags", "dlib", "lazy_static", "log", @@ -4762,7 +4755,7 @@ version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags 1.3.2", + "bitflags", "num-traits", ] @@ -4794,7 +4787,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "libssh2-sys", "parking_lot 0.11.2", @@ -4833,7 +4826,7 @@ checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" name = "strip-ansi-escapes" version = "0.1.0" dependencies = [ - "clap 4.1.11", + "clap 4.1.13", "termwiz", ] @@ -4862,9 +4855,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.2" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045" +checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" dependencies = [ "proc-macro2", "quote", @@ -4939,7 +4932,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix", + "rustix 0.36.11", "windows-sys 0.42.0", ] @@ -4963,14 +4956,24 @@ dependencies = [ ] [[package]] +name = "terminal_size" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" +dependencies = [ + "rustix 0.36.11", + "windows-sys 0.45.0", +] + +[[package]] name = "terminfo" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ "dirs", "fnv", - "nom 5.1.2", + "nom", "phf 0.11.1", "phf_codegen", ] @@ -5001,11 +5004,11 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "termwiz" -version = "0.21.0" +version = "0.22.0" dependencies = [ "anyhow", "base64 0.21.0", - "bitflags 1.3.2", + "bitflags", "cassowary", "criterion", "env_logger", @@ -5099,7 +5102,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.2", + "syn 2.0.10", ] [[package]] @@ -5316,9 +5319,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", "serde", @@ -5412,9 +5415,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -5670,7 +5673,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags 1.3.2", + "bitflags", "downcast-rs", "libc", "nix 0.24.3", @@ -5719,7 +5722,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags 1.3.2", + "bitflags", "wayland-client", "wayland-commons", "wayland-scanner", @@ -5768,7 +5771,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "clap 4.1.11", + "clap 4.1.13", "clap_complete", "clap_complete_fig", "codec", @@ -5942,11 +5945,11 @@ version = "0.1.0" dependencies = [ "anyhow", "benchmarking", - "bitflags 1.3.2", + "bitflags", "bytemuck", "cc", "chrono", - "clap 4.1.11", + "clap 4.1.13", "codec", "colorgrad", "config", @@ -6030,7 +6033,7 @@ name = "wezterm-gui-subcommands" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.1.11", + "clap 4.1.13", "config", ] @@ -6038,7 +6041,7 @@ dependencies = [ name = "wezterm-input-types" version = "0.1.0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "euclid", "lazy_static", "serde", @@ -6051,7 +6054,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async_ossl", - "clap 4.1.11", + "clap 4.1.13", "config", "env-bootstrap", "libc", @@ -6062,6 +6065,7 @@ dependencies = [ "portable-pty", "promise", "umask", + "wezterm-blob-leases", "wezterm-gui-subcommands", "wezterm-mux-server-impl", "wezterm-term", @@ -6108,9 +6112,9 @@ dependencies = [ "assert_fs", "async_ossl", "base64 0.21.0", - "bitflags 1.3.2", + "bitflags", "camino", - "clap 4.1.11", + "clap 4.1.13", "dirs-next", "env_logger", "filedescriptor", @@ -6140,7 +6144,7 @@ name = "wezterm-term" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags", "csscolorparser", "env_logger", "finl_unicode", @@ -6213,7 +6217,7 @@ checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ "arrayvec", "bit-vec", - "bitflags 1.3.2", + "bitflags", "codespan-reporting", "fxhash", "log", @@ -6230,15 +6234,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 1.3.2", + "bitflags", "block", "core-graphics-types", "d3d12", @@ -6276,7 +6280,7 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" dependencies = [ - "bitflags 1.3.2", + "bitflags", "js-sys", "web-sys", ] @@ -6337,7 +6341,7 @@ dependencies = [ "async-io", "async-task", "async-trait", - "bitflags 1.3.2", + "bitflags", "bytes", "cgl", "clipboard-win", @@ -6441,6 +6445,15 @@ dependencies = [ ] [[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets", +] + +[[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6553,9 +6566,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.3.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" dependencies = [ "memchr", ] @@ -6603,7 +6616,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0faeb4d7e2d54fff4a0584f61297e86b106914af2029778de7b427f72564d6c5" dependencies = [ - "bitflags 1.3.2", + "bitflags", "libc", "quick-xml 0.22.0", "x11", @@ -6614,7 +6627,7 @@ name = "xcb-imdkit" version = "0.2.0" source = "git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix#c6859ab2b8a233ca5dda5e8e4f1634d34ce9c85c" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "lazy_static", "pkg-config", @@ -6627,7 +6640,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -6761,9 +6774,9 @@ dependencies = [ [[package]] name = "zune-inflate" -version = "0.2.51" +version = "0.2.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01728b79fb9b7e28a8c11f715e1cd8dc2cda7416a007d66cac55cebb3a8ac6b" +checksum = "10ca8ee3897e213bf74d46641942575fb9b4bd9933cbce0b40eb320836da67e0" dependencies = [ "simd-adler32", ] diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index b4900c34b906e..899c599c23f38 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -31,14 +31,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20230320-124340-559cb7b0"; + version = "20230326-111934-3666303c"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-u9lOK4DV9NM3CUYjMTovCY4XF5Xxg4V+rQwIjioqTec="; + sha256 = "sha256-tgJUnQKVdLJKohda9oy9dwz53OiK4O0A9YlsI0o+meY="; }; postPatch = '' @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js="; - "libssh-rs-0.1.5" = "sha256-gxT9mZ+whotZhEoj783aQPlQPqQXd8gQL3zZglMYC1k="; + "libssh-rs-0.1.7" = "sha256-pLaWKk/iGy7FfoVafpPYzErnKudxeIWzssWv2Zlm58s="; "xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA="; }; }; diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index 4189822d268a4..69b1f299f5e7c 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/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/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 77d930b07122b..5ef18a9ea192f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.9.3", - "repo_hash": "sha256-WYzhKknxx3NwCsXsQCPNQNdoya010YbVh9uTpcHgSl4=", - "yarn_hash": "0msrbzqz5hgyl0c6dcxyzi6qnf2k3fmg44d201pa578p08xb0lld", + "version": "15.10.0", + "repo_hash": "sha256-jpJd6CneCfw+Ia0CTlX5YcEMl+2Tmd2+zfw8L+hKYTk=", + "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.9.3-ee", + "rev": "v15.10.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.9.3", - "GITLAB_PAGES_VERSION": "15.9.3", - "GITLAB_SHELL_VERSION": "14.17.0", - "GITLAB_WORKHORSE_VERSION": "15.9.3" + "GITALY_SERVER_VERSION": "15.10.0", + "GITLAB_PAGES_VERSION": "15.10.0", + "GITLAB_SHELL_VERSION": "14.18.0", + "GITLAB_WORKHORSE_VERSION": "15.10.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 2b7fa73d910e2..e5591cd5290b5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -12,13 +12,13 @@ gem 'rbtrace', require: false gem 'gitaly', '~> 15.5.0' # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.31' +gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 9.15' -gem 'google-protobuf', '~> 3.21.12' +gem 'google-protobuf', '~> 3.22.2' gem 'nokogiri', '~> 1.14' # Rails is currently blocked on the upgrade to the new major version for Redis, diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 93b568efe8670..43665f1e26634 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -40,7 +40,7 @@ GEM ffi (1.15.5) gitaly (15.5.0) grpc (~> 1.0) - gitlab-labkit (0.31.0) + gitlab-labkit (0.31.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -56,7 +56,7 @@ GEM with_env (= 1.1.0) xml-simple (~> 1.1.5) gitlab-markup (1.8.1) - google-protobuf (3.21.12) + google-protobuf (3.22.2) googleapis-common-protos-types (1.4.0) google-protobuf (~> 3.14) grpc (1.42.0) @@ -104,7 +104,7 @@ GEM method_source (~> 1.0) public_suffix (4.0.7) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.3) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) @@ -167,7 +167,7 @@ GEM sentry-raven (3.1.2) faraday (>= 1.0) thor (1.1.0) - thrift (0.17.0) + thrift (0.18.1) tomlrb (2.0.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) @@ -187,10 +187,10 @@ DEPENDENCIES activesupport (~> 6.1.7.2) factory_bot gitaly (~> 15.5.0) - gitlab-labkit (~> 0.31) + gitlab-labkit (~> 0.31, >= 0.31.1) gitlab-license_finder gitlab-markup (~> 1.8.0) - google-protobuf (~> 3.21.12) + google-protobuf (~> 3.22.2) grpc (~> 1.42.0) licensee (~> 9.15) nokogiri (~> 1.14) @@ -204,4 +204,4 @@ DEPENDENCIES sentry-raven (~> 3.1) BUNDLED WITH - 2.4.6 + 2.4.8 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 38f56ff7727ce..50a8bd4e25838 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.9.3"; + version = "15.10.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-WBg1fo8tG0tfrsu8QtIo0SY1ZbktVHfcTf77Ny29DSM="; + sha256 = "sha256-MHxpij4aT4sq7csWRAEr6NQ9PdFkEnrEPegVtBIXUNo="; }; - vendorSha256 = "sha256-IIvvI7CKLWB2W4fi/HLFtfZdovehxDmtQ8GUEw24fbY="; + vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d31f4c3d78585..d95e022a3b70c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zd8r189qcqr3xp6dinlw94sylxbyn56nnas7k0aw6xvr74q12v"; + sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; type = "gem"; }; - version = "0.31.0"; + version = "0.31.1"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -220,10 +220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; + sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm"; type = "gem"; }; - version = "3.21.12"; + version = "3.22.2"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -470,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.6.3"; }; rack-test = { dependencies = ["rack"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; + sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.1"; }; tomlrb = { groups = ["default" "development" "omnibus" "test"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index bdd8c4c43f6fd..a0f14cc853c1e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.7.3"; + version = "15.10.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-Aj6XQVIdulwx6mWivwYafR4yrWiNaDeyje3LFQzZPfU="; + sha256 = "sha256-LTUGWnZCqyLA5kNlCWMVGIOivfWVGb6GcAdO2tNW1/o="; }; - vendorHash = "sha256-mGcIN9gDCFfr1MvBdfR26LAbrAE2RNivhXP7fCNMyBQ="; + vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cfc79c9f26563..d2d8a372e5c38 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.17.0"; + version = "14.18.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-GTy+1O6Z7i+L8SSSQpYnN6SRfqDutkJYrj66tpX4f5M="; + sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-mFGkT5lyQfcaGz503vgqx/kP5S0V2Ks5HDmjx+BxZzg="; + vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 25064f22f4b4f..f48fea10d47a0 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.9.3"; + version = "15.10.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-wvoMBzRGp8RX2kHKKz3REDq8YLTsHbDayEMYi7hSzTE="; + vendorSha256 = "sha256-HG/QobU1LsFhbNF4lNq9tLwjcLD2l3TXnsJ+tjqc0Q8="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ed0c5127f7336..8cafe3b8909c9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -33,9 +33,6 @@ gem 'sprockets', '~> 3.7.0' gem 'view_component', '~> 2.74.1' -# Default values for AR models -gem 'default_value_for', '~> 3.4.0' - # Supported DBs gem 'pg', '~> 1.4.5' @@ -143,14 +140,12 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.15' +gem 'fog-aws', '~> 3.18' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' gem 'fog-google', '~> 1.19', require: 'fog/google' gem 'fog-local', '~> 0.8' -gem 'fog-openstack', '~> 1.0' -gem 'fog-rackspace', '~> 0.1.1' # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches # the rest-client gem to drop the Content-Length header field for chunked transfers, @@ -182,7 +177,7 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.170.0' +gem 'aws-sdk-core', '~> 3.170.1' gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-s3', '~> 1.119.1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' @@ -199,13 +194,13 @@ gem 'rdoc', '~> 6.3.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.17' +gem 'asciidoctor', '~> 2.0.18' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' -gem 'asciidoctor-kroki', '~> 0.7.0', require: false -gem 'rouge', '~> 3.30.0' +gem 'asciidoctor-kroki', '~> 0.8.0', require: false +gem 'rouge', '~> 4.1.0' gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.14.1' +gem 'nokogiri', '~> 1.14.2' # Calendar rendering gem 'icalendar' @@ -292,7 +287,7 @@ gem 'asana', '~> 0.10.13' gem 'ruby-fogbugz', '~> 0.3.0' # Kubernetes integration -gem 'kubeclient', '~> 4.9.3', path: 'vendor/gems/kubeclient' +gem 'kubeclient', '~> 4.11.0' # Sanitize user input gem 'sanitize', '~> 6.0' @@ -310,7 +305,7 @@ gem 'licensee', '~> 9.15' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'ruby-magic', '~> 0.5' +gem 'ruby-magic', '~> 0.6' # Faster blank gem 'fast_blank' @@ -348,7 +343,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.30.1' +gem 'gitlab-labkit', '~> 0.31.1' gem 'thrift', '>= 0.16.0' # I18n @@ -363,17 +358,20 @@ gem 'batch-loader', '~> 2.0.1' # Perf bar gem 'peek', '~> 1.1' +# Google Cloud Profiler support +gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false + # Snowplow events tracking gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.9', require: false + gem 'lefthook', '~> 1.3.3', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -416,7 +414,7 @@ group :development, :test do gem 'bundler-audit', '~> 0.7.0.1', require: false # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.3.0', require: false + gem 'benchmark-ips', '~> 2.11.0', require: false gem 'benchmark-memory', '~> 0.1', require: false gem 'knapsack', '~> 1.21.1' @@ -436,7 +434,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.7.0', require: false + gem 'gitlab-dangerfiles', '~> 3.8.0', require: false end group :development, :test, :coverage do @@ -456,7 +454,7 @@ group :test do gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-benchmark', '~> 0.6.0' - gem 'rspec-parameterized', require: false + gem 'rspec-parameterized', '~> 1.0', require: false gem 'capybara', '~> 3.35.3' gem 'capybara-screenshot', '~> 1.0.22' @@ -472,6 +470,7 @@ group :test do gem 'test-prof', '~> 1.0.7' gem 'rspec_junit_formatter' gem 'guard-rspec' + gem 'axe-core-rspec' # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false @@ -486,7 +485,7 @@ gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'stackprof', '~> 0.2.21', require: false +gem 'stackprof', '~> 0.2.23', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false @@ -518,7 +517,7 @@ gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.21', '>= 3.21.12' +gem 'google-protobuf', '~> 3.22', '>= 3.22.2' gem 'toml-rb', '~> 2.2.0' @@ -566,7 +565,7 @@ gem 'oj-introspect', '~> 0.7' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' -gem 'webauthn', '~> 2.3' +gem 'webauthn', '~> 3.0' # IPAddress utilities gem 'ipaddress', '~> 0.8.3' @@ -588,8 +587,18 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' gem 'arr-pm', '~> 0.0.12' # Apple plist parsing -gem 'CFPropertyList' +gem 'CFPropertyList', '~> 3.0.0' gem 'app_store_connect' # For phone verification gem 'telesignenterprise', '~> 2.2' + +# Ruby 3 extracts net-protocol into a separate gem, while Ruby 2 has it built-in +# This condition installs the gem only for Ruby 3 to avoid warnings on Ruby 2 +# Can be removed when support for Ruby 2 is dropped +install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0") } do + # BufferedIO patch + gem 'net-protocol', '~> 0.1.3' +end + +gem 'duo_api', '~> 1.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index c988145616ea4..1f1f566be37c0 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -11,6 +11,15 @@ PATH bundler PATH + remote: vendor/gems/cloud_profiler_agent + specs: + cloud_profiler_agent (0.0.1.pre) + google-cloud-profiler-v2 (~> 0.3) + google-protobuf (~> 3.13) + googleauth (>= 0.14) + stackprof (~> 0.2) + +PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: devise-pbkdf2-encryptable (0.0.0) @@ -31,15 +40,6 @@ PATH oj (~> 3.13.16) PATH - remote: vendor/gems/kubeclient - specs: - kubeclient (4.9.4.pre.gitlab1) - http (>= 3.0, < 6.0) - jsonpath (~> 1.0) - recursive-open-struct (~> 1.1, >= 1.1.1) - rest-client (~> 2.0) - -PATH remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) @@ -184,10 +184,10 @@ GEM faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (>= 1.4, < 3) - asciidoctor (2.0.17) + asciidoctor (2.0.18) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.7.0) + asciidoctor-kroki (0.8.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) @@ -198,13 +198,13 @@ GEM autoprefixer-rails (10.2.5.1) execjs (> 0) awesome_print (1.9.2) - awrence (1.1.1) + awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.703.0) + aws-partitions (1.730.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.170.0) + aws-sdk-core (3.170.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -218,6 +218,17 @@ GEM aws-sigv4 (~> 1.4) aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) + axe-core-api (4.6.0) + dumb_delegator + virtus + axe-core-rspec (4.6.0) + axe-core-api + dumb_delegator + virtus + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) nokogiri (~> 1, >= 1.10.8) @@ -232,7 +243,7 @@ GEM batch-loader (2.0.1) bcrypt (3.1.16) benchmark (0.2.0) - benchmark-ips (2.3.0) + benchmark-ips (2.11.0) benchmark-malloc (0.2.0) benchmark-memory (0.2.0) memory_profiler (~> 1) @@ -243,7 +254,8 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.11) - binding_ninja (0.2.3) + binding_of_caller (1.0.0) + debug_inspector (>= 0.0.1) bootsnap (1.16.0) msgpack (~> 1.2) browser (5.3.1) @@ -292,15 +304,17 @@ GEM nap open4 (~> 1.3) coderay (1.1.3) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) colored2 (3.1.2) commonmarker (0.23.6) concurrent-ruby (1.2.0) connection_pool (2.3.0) cork (0.3.0) colored2 (~> 3.1) - cose (1.0.0) + cose (1.3.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.4.0) + openssl-signature_algorithm (~> 1.0) countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) @@ -310,7 +324,7 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.12.0) + css_parser (1.14.0) addressable cvss-suite (3.0.1) danger (8.6.1) @@ -331,12 +345,11 @@ GEM gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) dead_end (3.1.1) + debug_inspector (1.1.0) deckar01-task_list (2.3.2) html-pipeline declarative (0.0.20) declarative_policy (1.1.0) - default_value_for (3.4.0) - activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) derailed_benchmarks (2.1.2) @@ -351,6 +364,8 @@ GEM rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -400,6 +415,8 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) + dumb_delegator (1.0.0) + duo_api (1.3.0) e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) @@ -502,7 +519,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.15.0) + fog-aws (3.18.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -528,15 +545,6 @@ GEM multi_json (~> 1.10) fog-local (0.8.0) fog-core (>= 1.27, < 3.0) - fog-openstack (1.0.8) - fog-core (~> 2.1) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -548,6 +556,14 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) + gapic-common (0.18.0) + faraday (>= 1.9, < 3.a) + faraday-retry (>= 1.0, < 3.a) + google-protobuf (~> 3.14) + googleapis-common-protos (>= 1.3.12, < 2.a) + googleapis-common-protos-types (>= 1.3.1, < 2.a) + googleauth (~> 1.0) + grpc (~> 1.36) gemoji (3.0.1) get_process_mem (0.2.7) ffi (~> 1.0) @@ -570,7 +586,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.7.0) + gitlab-dangerfiles (3.8.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -584,7 +600,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.30.1) + gitlab-labkit (0.31.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -660,6 +676,9 @@ GEM google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.0) + google-cloud-profiler-v2 (0.4.0) + gapic-common (>= 0.18.0, < 2.a) + google-cloud-errors (~> 1.0) google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -668,8 +687,12 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.21.12) - googleapis-common-protos-types (1.3.0) + google-protobuf (3.22.2) + googleapis-common-protos (1.4.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + grpc (~> 1.27) + googleapis-common-protos-types (1.5.0) google-protobuf (~> 3.14) googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) @@ -770,7 +793,7 @@ GEM nokogiri (~> 1.6) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (5.1.0) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -789,6 +812,7 @@ GEM icalendar (2.8.0) ice_cube (~> 0.16) ice_cube (0.16.4) + ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) invisible_captcha (2.0.0) @@ -843,9 +867,14 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) + kubeclient (4.11.0) + http (>= 3.0, < 6.0) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) + rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.9) + lefthook (1.3.3) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -945,13 +974,15 @@ GEM connection_pool (~> 2.2) net-ldap (0.17.1) net-ntp (2.1.3) + net-protocol (0.1.3) + timeout net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.14.1) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -1041,7 +1072,8 @@ GEM webfinger (>= 1.0.1) openssl (2.2.2) ipaddr - openssl-signature_algorithm (0.4.0) + openssl-signature_algorithm (1.3.0) + openssl (> 2.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1097,7 +1129,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.17.0) + prometheus-client-mmap (0.19.1) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -1223,7 +1255,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.30.0) + rouge (4.1.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1245,12 +1277,17 @@ GEM rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-parameterized (0.5.0) - binding_ninja (>= 0.2.3) + rspec-parameterized (1.0.0) + rspec-parameterized-core (< 2) + rspec-parameterized-table_syntax (< 2) + rspec-parameterized-core (1.0.0) parser proc_to_ast rspec (>= 2.13, < 4) unparser + rspec-parameterized-table_syntax (1.0.0) + binding_of_caller + rspec-parameterized-core (< 2) rspec-rails (6.0.1) actionpack (>= 6.1) activesupport (>= 6.1) @@ -1298,8 +1335,8 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-magic (0.5.4) - mini_portile2 (~> 2.6) + ruby-magic (0.6.0) + mini_portile2 (~> 2.8) ruby-progressbar (1.11.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) @@ -1335,7 +1372,6 @@ GEM addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) sd_notify (0.1.1) - securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) @@ -1425,7 +1461,7 @@ GEM mini_portile2 (~> 2.8.0) ssh_data (1.3.0) ssrf_filter (1.0.8) - stackprof (0.2.21) + stackprof (0.2.23) state_machines (0.5.0) state_machines-activemodel (0.8.0) activemodel (>= 5.1) @@ -1463,18 +1499,21 @@ GEM faraday (~> 1.0) text (1.3.1) thor (1.2.1) + thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) timeliness (0.3.10) + timeout (0.3.2) timfel-krb5-auth (0.8.3) tins (1.31.1) sync toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - tpm-key_attestation (0.9.0) + tpm-key_attestation (0.12.0) bindata (~> 2.4) - openssl-signature_algorithm (~> 0.4.0) + openssl (> 2.0) + openssl-signature_algorithm (~> 1.0) trailblazer-option (0.1.2) train-core (3.4.9) addressable (~> 2.5) @@ -1488,10 +1527,10 @@ GEM nokogiri (>= 1.7.0, <= 2.0) tty-color (0.6.0) tty-cursor (0.7.1) - tty-markdown (0.7.1) + tty-markdown (0.7.2) kramdown (>= 1.16.2, < 3.0) pastel (~> 0.8) - rouge (~> 3.14) + rouge (>= 3.14, < 5.0) strings (~> 0.2.0) tty-color (~> 0.5) tty-screen (~> 0.8) @@ -1521,9 +1560,9 @@ GEM uniform_notifier (1.16.0) unleash (3.2.2) murmurhash3 (~> 0.1.6) - unparser (0.6.0) + unparser (0.6.7) diff-lcs (~> 1.3) - parser (>= 3.0.0) + parser (>= 3.2.0) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1543,20 +1582,23 @@ GEM activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) + virtus (2.0.0) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) warning (1.3.0) - webauthn (2.3.0) + webauthn (3.0.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) bindata (~> 2.4) cbor (~> 0.5.9) - cose (~> 1.0) - openssl (~> 2.0) + cose (~> 1.1) + openssl (>= 2.2) safety_net_attestation (~> 0.4.0) - securecompare (~> 1.0) - tpm-key_attestation (~> 0.9.0) + tpm-key_attestation (~> 0.12.0) webfinger (1.2.0) activesupport httpclient (>= 2.4) @@ -1587,7 +1629,7 @@ PLATFORMS ruby DEPENDENCIES - CFPropertyList + CFPropertyList (~> 3.0.0) RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) @@ -1598,22 +1640,23 @@ DEPENDENCIES app_store_connect arr-pm (~> 0.0.12) asana (~> 0.10.13) - asciidoctor (~> 2.0.17) + asciidoctor (~> 2.0.18) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.7.0) + asciidoctor-kroki (~> 0.8.0) asciidoctor-plantuml (~> 0.0.16) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.2.4)! autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.170.0) + aws-sdk-core (~> 3.170.1) aws-sdk-s3 (~> 1.119.1) + axe-core-rspec babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - benchmark-ips (~> 2.3.0) + benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.1) bootsnap (~> 1.16.0) @@ -1625,6 +1668,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) + cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) @@ -1635,7 +1679,6 @@ DEPENDENCIES database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.2) declarative_policy (~> 1.1.0) - default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector @@ -1647,6 +1690,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5) doorkeeper-openid_connect (~> 1.8) + duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) @@ -1663,12 +1707,10 @@ DEPENDENCIES flipper-active_record (~> 0.25.0) flipper-active_support_cache_store (~> 0.25.0) fog-aliyun (~> 0.4) - fog-aws (~> 3.15) + fog-aws (~> 3.18) fog-core (= 2.1.0) fog-google (~> 1.19) fog-local (~> 0.8) - fog-openstack (~> 1.0) - fog-rackspace (~> 0.1.1) fugit (~> 1.8.1) fuubar (~> 2.2.0) gettext (~> 3.3) @@ -1676,10 +1718,10 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.9.0.pre.rc3) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.7.0) + gitlab-dangerfiles (~> 3.8.0) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.30.1) + gitlab-labkit (~> 0.31.1) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.9.0) @@ -1699,7 +1741,7 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.21, >= 3.21.12) + google-protobuf (~> 3.22, >= 3.22.2) gpgme (~> 2.0.22) grape (~> 1.5.2) grape-entity (~> 0.10.0) @@ -1737,8 +1779,8 @@ DEPENDENCIES kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) - kubeclient (~> 4.9.3)! - lefthook (~> 1.2.9) + kubeclient (~> 4.11.0) + lefthook (~> 1.3.3) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) @@ -1758,7 +1800,8 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.17.1) net-ntp - nokogiri (~> 1.14.1) + net-protocol (~> 0.1.3) + nokogiri (~> 1.14.2) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) @@ -1793,7 +1836,7 @@ DEPENDENCIES pg_query (~> 2.2, >= 2.2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.17) + prometheus-client-mmap (~> 0.19) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.1) @@ -1820,17 +1863,17 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.30.0) + rouge (~> 4.1.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) - rspec-parameterized + rspec-parameterized (~> 1.0) rspec-rails (~> 6.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop ruby-fogbugz (~> 0.3.0) - ruby-magic (~> 0.5) + ruby-magic (~> 0.6) ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.19) @@ -1863,7 +1906,7 @@ DEPENDENCIES sprite-factory (~> 1.7) sprockets (~> 3.7.0) ssh_data (~> 1.3) - stackprof (~> 0.2.21) + stackprof (~> 0.2.23) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) @@ -1886,11 +1929,11 @@ DEPENDENCIES view_component (~> 2.74.1) vmstat (~> 2.3.0) warning (~> 1.3.0) - webauthn (~> 2.3) + webauthn (~> 3.0) webmock (~> 3.9.1) webrick (~> 1.6.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.6 + 2.4.8 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 3e3e5d0d3282c..fe75ce4a2a9c1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -254,10 +254,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; + sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv"; type = "gem"; }; - version = "2.0.17"; + version = "2.0.18"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -276,10 +276,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08diy3wpmmaw9kabpr2wm908bgv71jj9l7z9fs6fj45fkkjf92jj"; + sha256 = "0dhsickf1i4cr1w3l9imbqizv67yx1iqh2dhj3lvvkk7j4s3yfz5"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -359,10 +359,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv"; + sha256 = "0gj8f8c54r9cabkm41s59sa1ca5wpbipw7gq3sfl87x9296227fx"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; aws-eventstream = { groups = ["default"]; @@ -379,10 +379,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j579s8y4ppgcxvvsxwbmisplgbi6l09jc4v593y17vrnbfgqcix"; + sha256 = "0awhivg7pr6b06r1jw663q0g7sm3i08n9n8bvry0qjsc03kq9aij"; type = "gem"; }; - version = "1.703.0"; + version = "1.730.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -401,10 +401,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; + sha256 = "19myd6fkrxmhrp55g2dlnqw0mnz96qv3zpl3zc0cv44zcbmaffsm"; type = "gem"; }; - version = "3.170.0"; + version = "3.170.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -439,6 +439,39 @@ src: }; version = "1.5.1"; }; + axe-core-api = { + dependencies = ["dumb_delegator" "virtus"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qkcia7yg50j0ycmzqnl2dzzz9a35wlg5fk30g0qs41z6p1xw38v"; + type = "gem"; + }; + version = "4.6.0"; + }; + axe-core-rspec = { + dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zvlrnxcyam2574gzn44r0ibz4h0s9j3vrp5lixi731qvp4mphhi"; + type = "gem"; + }; + version = "4.6.0"; + }; + axiom-types = { + dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; + type = "gem"; + }; + version = "0.1.1"; + }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; groups = ["default"]; @@ -526,10 +559,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j"; + sha256 = "1v3db77blqz3g4z8nskd3jhdviz5d6q2xxvzxvq5m2bk2228kahy"; type = "gem"; }; - version = "2.3.0"; + version = "2.11.0"; }; benchmark-malloc = { groups = ["default" "test"]; @@ -593,15 +626,16 @@ src: }; version = "2.4.11"; }; - binding_ninja = { - groups = ["default" "development" "test"]; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; type = "gem"; }; - version = "0.2.3"; + version = "1.0.0"; }; bootsnap = { dependencies = ["msgpack"]; @@ -827,6 +861,16 @@ src: }; version = "0.9.2"; }; + cloud_profiler_agent = { + dependencies = ["google-cloud-profiler-v2" "google-protobuf" "googleauth" "stackprof"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/vendor/gems/cloud_profiler_agent"; + type = "path"; + }; + version = "0.0.1.pre"; + }; coderay = { groups = ["default" "development" "test"]; platforms = [{ @@ -841,6 +885,17 @@ src: }; version = "1.1.3"; }; + coercible = { + dependencies = ["descendants_tracker"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; + type = "gem"; + }; + version = "1.0.0"; + }; colored2 = { groups = ["default" "development"]; platforms = []; @@ -898,10 +953,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.0.0"; + version = "1.3.0"; }; countries = { dependencies = ["i18n_data" "sixarm_ruby_unaccent"]; @@ -962,10 +1017,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; }; cvss-suite = { groups = ["default"]; @@ -1019,6 +1074,16 @@ src: }; version = "3.1.1"; }; + debug_inspector = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; deckar01-task_list = { dependencies = ["html-pipeline"]; groups = ["default"]; @@ -1050,17 +1115,6 @@ src: }; version = "1.1.0"; }; - default_value_for = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim"; - type = "gem"; - }; - version = "3.4.0"; - }; deprecation_toolkit = { dependencies = ["activesupport"]; groups = ["development" "test"]; @@ -1083,6 +1137,17 @@ src: }; version = "2.1.2"; }; + descendants_tracker = { + dependencies = ["thread_safe"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; + type = "gem"; + }; + version = "0.0.4"; + }; device_detector = { groups = ["default"]; platforms = []; @@ -1305,6 +1370,26 @@ src: }; version = "1.4.0"; }; + dumb_delegator = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "151fdn7y0gqs7f6y3y7rn3frv0z359qrw9hb4s7avn6j2qc42ppz"; + type = "gem"; + }; + version = "1.0.0"; + }; + duo_api = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk1437b5vrjg8prk2khsva5rkx3apsj7c46n3yk5b8g34787jc7"; + type = "gem"; + }; + version = "1.3.0"; + }; e2mmap = { groups = ["default" "development"]; platforms = []; @@ -1845,10 +1930,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130y73isnky4kgqwr1jhci3b51ld4i9r5a7132q6aq8cx8qjjx89"; + sha256 = "0127b2jx7lj82h96sm0rnmlgqzgiz5013m6z27vxnkmwrw78iigl"; type = "gem"; }; - version = "3.15.0"; + version = "3.18.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1894,28 +1979,6 @@ src: }; version = "0.8.0"; }; - fog-openstack = { - dependencies = ["fog-core" "fog-json" "ipaddress"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; - type = "gem"; - }; - version = "1.0.8"; - }; - fog-rackspace = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; - type = "gem"; - }; - version = "0.1.1"; - }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; groups = ["default"]; @@ -1969,6 +2032,17 @@ src: }; version = "0.9.0"; }; + gapic-common = { + dependencies = ["faraday" "faraday-retry" "google-protobuf" "googleapis-common-protos" "googleapis-common-protos-types" "googleauth" "grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1awn2k5b2sji74vr0xhg0v68h1y0msqpkwq5z8k31mp2ii9mmmbg"; + type = "gem"; + }; + version = "0.18.0"; + }; gemoji = { groups = ["default" "development" "test"]; platforms = []; @@ -2073,10 +2147,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg5nyp1lfqlksrh4dlnq8a4nhdbhhiwm4hif2smlmqcwr1bri9m"; + sha256 = "0zhsdnr3zbsym6j689d039hrd9if07jbircyl6ns4f5abwhc7w3y"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2106,10 +2180,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04xi2b9wna2z7qw6cdlypfibp5wnf30xn80dlpbdz0sc063bvvdx"; + sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; type = "gem"; }; - version = "0.30.1"; + version = "0.31.1"; }; gitlab-license = { groups = ["default"]; @@ -2403,6 +2477,17 @@ src: }; version = "1.3.0"; }; + google-cloud-profiler-v2 = { + dependencies = ["gapic-common" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qyknlvwji7vqhani490cacsrzlqfza10hv47him93yhfnqjmz2k"; + type = "gem"; + }; + version = "0.4.0"; + }; google-cloud-storage = { dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; groups = ["default"]; @@ -2419,10 +2504,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dcgkhjiaxha3yznyxxzm8a4n4jf61rk7kgbxy4sdkb865zbn2ab"; + sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm"; type = "gem"; }; - version = "3.21.12"; + version = "3.22.2"; + }; + googleapis-common-protos = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10p3kl9xdxl4xsijkj2l6qn525xchkbfhx3ch603ammibbxq08ys"; + type = "gem"; + }; + version = "1.4.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2430,10 +2526,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w860lqs5j6n58a8qn4wr16hp0qz7cq5h67dgma04gncjwqiyhf5"; + sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -2784,10 +2880,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jn1y6sfxpfaq0hcblv8hhyxzam8n39kvypi07q2vxaimh6ly7mj"; + sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; http-accept = { groups = ["default"]; @@ -2883,6 +2979,16 @@ src: }; version = "0.16.4"; }; + ice_nine = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; imagen = { dependencies = ["parser"]; groups = ["coverage" "default" "development" "test"]; @@ -3133,10 +3239,11 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/kubeclient"; - type = "path"; + remotes = ["https://rubygems.org"]; + sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; + type = "gem"; }; - version = "4.9.4.pre.gitlab1"; + version = "4.11.0"; }; launchy = { dependencies = ["addressable"]; @@ -3154,10 +3261,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07bh4ns9b58nrjjsfx2r69ki56f7nclcczsravkj9ilgw1lagm0z"; + sha256 = "0pfwsag1zm990mk8sgagnzkanaf7c6k6dnwf32pnmbdbs2csfsc2"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.3"; }; letter_opener = { dependencies = ["launchy"]; @@ -3652,6 +3759,17 @@ src: }; version = "2.1.3"; }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; net-scp = { dependencies = ["net-ssh"]; groups = ["default"]; @@ -3709,10 +3827,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; + sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.2"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4047,14 +4165,15 @@ src: version = "2.2.2"; }; openssl-signature_algorithm = { + dependencies = ["openssl"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "0.4.0"; + version = "1.3.0"; }; opentracing = { groups = ["default"]; @@ -4283,10 +4402,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "095gq9sr6pab1jzbvn3pjs7i1p5hnlasnhvq2xdfsvxjyw33fvbn"; + sha256 = "0zcw8yx7c2mmmcl3kq7nswansshcpxzqjbxf61xqfydbmhd5z2vi"; type = "gem"; }; - version = "0.17.0"; + version = "0.19.1"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4864,10 +4983,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; + sha256 = "046xwhfhi2krmbaqmg9vshf01vzld8smczx6dwppinv61ndc2vqg"; type = "gem"; }; - version = "3.30.0"; + version = "4.1.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4947,15 +5066,37 @@ src: version = "3.12.3"; }; rspec-parameterized = { - dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; + dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m142sp884z3k3xd42ngf0n8a83hvcihcj1n66qyxlgdnl3sqqzi"; + sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; type = "gem"; }; - version = "0.5.0"; + version = "1.0.0"; + }; + rspec-parameterized-core = { + dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; + type = "gem"; + }; + version = "1.0.0"; + }; + rspec-parameterized-table_syntax = { + dependencies = ["binding_of_caller" "rspec-parameterized-core"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; + type = "gem"; + }; + version = "1.0.0"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -5105,10 +5246,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m91qhhh2sakmd6kznipmwwb3i2qlfx40fpnj4vsh40d2f2v25rc"; + sha256 = "00b15fd74bkrxfqbx1gg2nw78fs7lvmn8mf92bway8vxgf3kh8bv"; type = "gem"; }; - version = "0.5.4"; + version = "0.6.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; @@ -5299,16 +5440,6 @@ src: }; version = "0.1.1"; }; - securecompare = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; - type = "gem"; - }; - version = "1.0.0"; - }; seed-fu = { dependencies = ["activerecord" "activesupport"]; groups = ["default"]; @@ -5705,10 +5836,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b"; + sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; type = "gem"; }; - version = "0.2.21"; + version = "0.2.23"; }; state_machines = { groups = ["default"]; @@ -5921,6 +6052,16 @@ src: }; version = "1.2.1"; }; + thread_safe = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; thrift = { groups = ["default"]; platforms = []; @@ -5951,6 +6092,16 @@ src: }; version = "0.3.10"; }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + type = "gem"; + }; + version = "0.3.2"; + }; timfel-krb5-auth = { groups = ["default" "kerberos"]; platforms = []; @@ -5994,15 +6145,15 @@ src: version = "1.3.0"; }; tpm-key_attestation = { - dependencies = ["bindata" "openssl-signature_algorithm"]; + dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4"; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; type = "gem"; }; - version = "0.9.0"; + version = "0.12.0"; }; trailblazer-option = { groups = ["default"]; @@ -6062,10 +6213,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14nwxdh5yr2xlpgxjqmdgjlrj1h9ddpc1r00sp1jxp1sc7jsqbq6"; + sha256 = "04f599zn5rfndq4d9l0acllfpc041bzdkkz2h6x0dl18f2wivn0y"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; }; tty-prompt = { dependencies = ["pastel" "tty-reader"]; @@ -6220,10 +6371,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0246c6j1lbi6jgga3n2br1nyvnwzh1bz0r9yca5d4cihb100byja"; + sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.7"; }; uri_template = { groups = ["default"]; @@ -6310,6 +6461,17 @@ src: }; version = "2.74.1"; }; + virtus = { + dependencies = ["axiom-types" "coercible" "descendants_tracker"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hniwgbdsjxa71qy47n6av8faf8qpwbaapms41rhkk3zxgjdlhc8"; + type = "gem"; + }; + version = "2.0.0"; + }; vmstat = { groups = ["default"]; platforms = []; @@ -6342,15 +6504,15 @@ src: version = "1.3.0"; }; webauthn = { - dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "tpm-key_attestation"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17nqmi6n4s3i6pmcd7myf7w49q9xd5xlcvz9vbqijlm4yicyxywn"; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; type = "gem"; }; - version = "2.3.0"; + version = "3.0.0"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index a39a1fd79d84f..8532231ac8e94 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/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/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index 82a09bbaca7c0..b20d73d7c09b9 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/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/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 2de8989830c3a..4143c21218daf 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.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/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8298469e1d98f..52a20bb57f20d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/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/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 5ea14cae03352..65d377043822b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/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/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix new file mode 100644 index 0000000000000..a4ab7c0805c87 --- /dev/null +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, makeRustPlatform +, hostPlatform +, targetPlatform +, lld +}: + +let + arch = targetPlatform.qemuArch; + + target = ./. + "/${arch}-unknown-none.json"; + + 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/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json b/pkgs/applications/virtualization/rust-hypervisor-firmware/x86_64-unknown-none.json new file mode 100644 index 0000000000000..f42155ae32eec --- /dev/null +++ b/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/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 6bcd15dc52ffa..035fc9ceb2d00 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/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/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 1279397cccc27..173dc919c74e9 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -11,86 +11,77 @@ , wayland , wlroots , xcbutilcursor +, pulseaudio }: -let - unwrapped = python3Packages.buildPythonPackage rec { - pname = "qtile"; - version = "0.22.1"; +python3Packages.buildPythonPackage rec { + pname = "qtile"; + version = "0.22.1"; - src = fetchFromGitHub { - owner = "qtile"; - repo = "qtile"; - rev = "v${version}"; - hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; - }; + src = fetchFromGitHub { + owner = "qtile"; + repo = "qtile"; + rev = "v${version}"; + hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; + }; - patches = [ - ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 - ]; + patches = [ + ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 + ]; - postPatch = '' - substituteInPlace libqtile/pangocffi.py \ - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 - substituteInPlace libqtile/backend/x11/xcursors.py \ - --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 - ''; + postPatch = '' + substituteInPlace libqtile/pangocffi.py \ + --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 + substituteInPlace libqtile/backend/x11/xcursors.py \ + --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - pkg-config - ] ++ (with python3Packages; [ - setuptools-scm - ]); + nativeBuildInputs = [ + pkg-config + ] ++ (with python3Packages; [ + setuptools-scm + ]); - propagatedBuildInputs = with python3Packages; [ - xcffib - (cairocffi.override { withXcffib = true; }) - setuptools - python-dateutil - dbus-python - dbus-next - mpd2 - psutil - pyxdg - pygobject3 - pywayland - pywlroots - xkbcommon - ]; + propagatedBuildInputs = with python3Packages; [ + xcffib + (cairocffi.override { withXcffib = true; }) + setuptools + python-dateutil + dbus-python + dbus-next + mpd2 + psutil + pyxdg + pygobject3 + pywayland + pywlroots + xkbcommon + pulseaudio + ]; - buildInputs = [ - libinput - wayland - wlroots - libxkbcommon - ]; + buildInputs = [ + libinput + wayland + wlroots + libxkbcommon + ]; - # for `qtile check`, needs `stubtest` and `mypy` commands - makeWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ mypy ]}" - ]; + # for `qtile check`, needs `stubtest` and `mypy` commands + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ mypy ]}" + ]; - doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. + doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. - meta = with lib; { - homepage = "http://www.qtile.org/"; - license = licenses.mit; - description = "A small, flexible, scriptable tiling window manager written in Python"; - platforms = platforms.linux; - maintainers = with maintainers; [ kamilchm ]; - }; + meta = with lib; { + homepage = "http://www.qtile.org/"; + license = licenses.mit; + description = "A small, flexible, scriptable tiling window manager written in Python"; + platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm arjan-s ]; }; -in -(python3.withPackages (_: [ unwrapped ])).overrideAttrs (_: { - # otherwise will be exported as "env", this restores `nix search` behavior - name = "${unwrapped.pname}-${unwrapped.version}"; - # export underlying qtile package - passthru = { inherit unwrapped; }; - - # restore original qtile attrs - inherit (unwrapped) pname version meta; -}) +} diff --git a/pkgs/applications/window-managers/qtile/wrapper.nix b/pkgs/applications/window-managers/qtile/wrapper.nix new file mode 100644 index 0000000000000..8cb5596a84468 --- /dev/null +++ b/pkgs/applications/window-managers/qtile/wrapper.nix @@ -0,0 +1,9 @@ +{ python3, qtile-unwrapped }: +(python3.withPackages (_: [ qtile-unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${qtile-unwrapped.pname}-${qtile-unwrapped.version}"; + # export underlying qtile package + passthru = { unwrapped = qtile-unwrapped; }; + # restore original qtile attrs + inherit (qtile-unwrapped) pname version meta; +}) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix index c4d967a11c699..0d98c0a2bc645 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/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/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 76e68573faa82..ce807b932a197 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -2,6 +2,7 @@ args @ { name +, version ? null , runScript ? "bash" , extraInstallCommands ? "" , meta ? {} @@ -19,11 +20,12 @@ 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" ]); etcBindEntries = let @@ -102,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 : @@ -115,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. @@ -203,7 +205,11 @@ let bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name { + versionStr = lib.optionalString (version != null) ("-" + version); + + nameAndVersion = name + versionStr; + +in runCommandLocal nameAndVersion { inherit meta; passthru = passthru // { @@ -215,6 +221,7 @@ in runCommandLocal name { echo >&2 "" exit 1 ''; + inherit args fhsenv; }; } '' mkdir -p $out/bin diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index e7db6a75297d1..6f0adfb4e08cb 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,11 +1,11 @@ -{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }: +{ lib, callPackage, runCommandLocal, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in -args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: +args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: let - env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); + env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]); chrootenv = callPackage ./chrootenv {}; @@ -23,7 +23,11 @@ let exec ${run} "$@" ''; -in runCommandLocal name { + versionStr = lib.optionalString (version != null) ("-" + version); + + nameAndVersion = name + versionStr; + +in runCommandLocal nameAndVersion { inherit meta; passthru = passthru // { diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 81f1010e467cb..7b602e2507d51 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/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/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 67c3dc7a3c12c..e563c21331870 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "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/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index 0685e5d5b6a05..25a6524dc0b35 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation rec { description = "The theme from libadwaita ported to GTK-3"; homepage = "https://github.com/lassekongo83/adw-gtk3"; license = licenses.lgpl21Only; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ciferkey ]; }; } diff --git a/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/pkgs/desktops/deepin/apps/deepin-clone/default.nix new file mode 100644 index 0000000000000..9252224488ee1 --- /dev/null +++ b/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/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 96c3d08b65dc7..1c3d8db8a026d 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -39,6 +39,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/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index dc5728791b609..5fa1a17c4240b 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/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/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 0fd84aaba7485..f86ab85f9ad70 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.2"; - sha256 = "sha256-RpFVJSq/DxyA5ne1h+Nr3xfL+DTzg1cTqIDVOPC/pF4="; + version = "1.6.3"; + sha256 = "sha256-tnpQRYLV48NxKsWDjVSmypx6X1bVbx2U5Q8kQaP0AW8="; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index 4970d02e32c13..6637b769dd650 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/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/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 5aa423bbf84ba..26fce1d8d4900 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -49,7 +49,7 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "hip-${hipPlatform}"; - version = "5.4.3"; + version = "5.4.4"; outputs = [ "out" diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 1daeb745e588d..ef7ff66e74641 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/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/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 0000000000000..32f1d13a9dc23 --- /dev/null +++ b/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/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..d824516c0a16c --- /dev/null +++ b/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/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/pkgs/development/compilers/llvm/git/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000000..1354ad267314a --- /dev/null +++ b/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/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 318a7ac340529..5518eb64bbd87 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/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/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 0da71d1de10db..ce55ed1bfd1b1 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.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/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index b3a66f12dc43e..e6d32f40c40ea 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/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/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index e323d74a26bba..c86e71ad366b1 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/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/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index e221956cf225f..45d35d027b88a 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/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/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index d3bee03c5e194..bd147fffc99d7 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "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/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 74f09ce292836..a0c679b4fe01d 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/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/pkgs/development/libraries/cppcodec/default.nix b/pkgs/development/libraries/cppcodec/default.nix new file mode 100644 index 0000000000000..d3ead22f6b134 --- /dev/null +++ b/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/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 15eedbdfc485c..6b660a491f231 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/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/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index c933dc35f2181..bdf7a68ffbe33 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.03.06.00"; + version = "2023.03.20.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "refs/tags/v${version}"; - hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E="; + hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ="; }; nativeBuildInputs = [ cmake ]; @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++14 implementation of the TLS-1.3 standard"; homepage = "https://github.com/facebookincubator/fizz"; + changelog = "https://github.com/facebookincubator/fizz/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 670fa30cb0f13..333d8196d57f1 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/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/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/development/libraries/libnitrokey/default.nix new file mode 100644 index 0000000000000..2f06fe8eafba4 --- /dev/null +++ b/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/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 3dfb910f1cd6d..a04050458edfd 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/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/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 752c19fb2cf1d..5e559af9357bd 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -39,6 +39,14 @@ stdenv.mkDerivation rec { libva ]; + # Note: Attempt to remove on next release after 0.0.9 + # nixpkgs reference: https://github.com/NixOS/nixpkgs/pull/221978#issuecomment-1483892437 + # upstream: https://github.com/elFarto/nvidia-vaapi-driver/issues/188 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format=" + "-Wno-error=int-conversion" + ]; + postFixup = '' addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" ''; diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 4221d24679c3b..058abe3990b38 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ 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 = [ diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index 843eb2f5b1038..b3e8c8fbae288 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/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/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 8447c25cd7075..a8e8a9cc847f8 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/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/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index e8ff5df1a9e55..6b52ddf01f1a3 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/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/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 192bb470a66d4..8f84a973bf0fa 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/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/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 8330ce3e2bc3b..20b2cd66a758e 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/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/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix index 2004f8868caff..68ba880a7987d 100644 --- a/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/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/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 3e6ac4ae2d967..3236d47750702 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix index 57647c97c4165..1fe020f6490b6 100644 --- a/pkgs/development/ocaml-modules/cstruct/async.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 9efe75af70c9a..9877adbcf81a5 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index 7226193565b19..3aa70e5c9986d 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b640c9745f3b0..f2b19355b099e 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix index a20911cbb299c..3b28cda15afc1 100644 --- a/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/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/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index 064bdadb32851..40467a77a57fe 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/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/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix index 5a17abdcc5321..2b4013eb46a03 100644 --- a/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/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/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix index d2dad611bf466..664cb5dead17c 100644 --- a/pkgs/development/ocaml-modules/dbf/default.nix +++ b/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/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index f5303db9a3b54..cdb1e3fc20058 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/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/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index d3e29be3c6882..d777755253c27 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/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/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 90f56c1596323..f24866a815c1a 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/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/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 1ffc95d3c2250..5e1a0461abb13 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/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/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 680c77dfa39e9..1079f554731df 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/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/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix index 8d1414731f135..afd49b8716562 100644 --- a/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/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/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix index fc06efae7e043..59d47d2daf5f9 100644 --- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix +++ b/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/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index b576282224053..79142f0e8d4d2 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/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/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix index 1f1417f672752..39bdca1119a45 100644 --- a/pkgs/development/ocaml-modules/magic-trace/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix b/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix index 78f3e48c5bd46..a6978d3d5811e 100644 --- a/pkgs/development/ocaml-modules/mirage-block-ramdisk/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 0d0851536b38e..e32523c85eb64 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-block/combinators.nix b/pkgs/development/ocaml-modules/mirage-block/combinators.nix index 7dee169afd5b0..fc50002da1e62 100644 --- a/pkgs/development/ocaml-modules/mirage-block/combinators.nix +++ b/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/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix index 161fd4a66ead9..0cd1f1717ea66 100644 --- a/pkgs/development/ocaml-modules/mirage-block/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix index bdafeb4305498..74ff38f9a70ac 100644 --- a/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix index 2fcd58973bcd8..b0746c54162af 100644 --- a/pkgs/development/ocaml-modules/mirage-console/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-console/unix.nix b/pkgs/development/ocaml-modules/mirage-console/unix.nix index 634bcc353ad35..ca8c2aeac5e31 100644 --- a/pkgs/development/ocaml-modules/mirage-console/unix.nix +++ b/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/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index d4904e77430a1..5500d0551253a 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/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/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index bc987eff9884a..6b454512915b8 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 023896447db19..12681911a3de1 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/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/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/pkgs/development/ocaml-modules/mirage-random-test/default.nix index 81d75db77251c..24339b49568cc 100644 --- a/pkgs/development/ocaml-modules/mirage-random-test/default.nix +++ b/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/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix index a119395764e57..ba70665c6edef 100644 --- a/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/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/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 058261a78d3d8..7960042ff9cc8 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/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/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index ffd183787793c..e73492830893c 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/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/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 078d50da895be..45f52ba5bded3 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/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/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix index d4eaaae65caa0..3b0895b7b2f62 100644 --- a/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/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/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 24043ef4391eb..d2721c5398e24 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/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/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 0ff1963fcaf02..93bee8f101562 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/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/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 354a8ca2098a9..14c29f3daee0c 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/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/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix index 872d11606ff67..e727c8667669b 100644 --- a/pkgs/development/ocaml-modules/vchan/default.nix +++ b/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/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index f7ade2ec80703..9dea4a64a5082 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/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/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 4b6c0d89a82ad..b3c8c241ae41a 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/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/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index a3f4e0abcdef5..093ca1ffe9025 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/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/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index a7fb853f3becd..f0867b4ec314e 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/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/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix index c265fe71d4924..95ccaf3d05513 100644 --- a/pkgs/development/octave-modules/control/default.nix +++ b/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/pkgs/development/octave-modules/database/c_verror.patch b/pkgs/development/octave-modules/database/c_verror.patch new file mode 100644 index 0000000000000..9726a29512eb5 --- /dev/null +++ b/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/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix index 3e1fe863276cd..811278af5027e 100644 --- a/pkgs/development/octave-modules/database/default.nix +++ b/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/pkgs/development/octave-modules/doctest/default.nix b/pkgs/development/octave-modules/doctest/default.nix index 3c02a20cdad15..456b9810df90f 100644 --- a/pkgs/development/octave-modules/doctest/default.nix +++ b/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/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix index 08c4305999b36..e1410fd8368f5 100644 --- a/pkgs/development/octave-modules/image-acquisition/default.nix +++ b/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/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index 3cce6f2cad559..3cc0873e3813b 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/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/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index 505670f6298b1..829f6eb9287e6 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/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/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix index 21ba508500e97..6c6d306abd1d5 100644 --- a/pkgs/development/octave-modules/ocl/default.nix +++ b/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/pkgs/development/octave-modules/parallel/default.nix b/pkgs/development/octave-modules/parallel/default.nix index 11fba7d363009..45c57d72f20fb 100644 --- a/pkgs/development/octave-modules/parallel/default.nix +++ b/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/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix index 507ed1100a425..41ee75cb1a800 100644 --- a/pkgs/development/octave-modules/sparsersb/default.nix +++ b/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/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index fa67936d2bcd1..0b161c261c407 100644 --- a/pkgs/development/octave-modules/stk/default.nix +++ b/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/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix index 1d3715b3d73b6..2ca59a972cb69 100644 --- a/pkgs/development/octave-modules/symbolic/default.nix +++ b/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/pkgs/development/octave-modules/tisean/default.nix b/pkgs/development/octave-modules/tisean/default.nix index bfe01f10f2fff..71d05dc7a1f00 100644 --- a/pkgs/development/octave-modules/tisean/default.nix +++ b/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/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 044bbf7be6e10..aa0414fe7985d 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/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/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index dfb88f77aae35..470a600810bb5 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/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/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 8faa98cfda065..90c4a2bfc9afe 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/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/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 89cf42a6a2474..f1c8f0bb54d08 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/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/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index e82df588323b0..621f8ef5b2cc0 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/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/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix new file mode 100644 index 0000000000000..d993f1a9746fd --- /dev/null +++ b/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/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 588ca836ad8f1..b93d3baddcc4a 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/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/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 278d7c15faa1a..8d087712a5393 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/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/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index d3592d76a8f09..bbac242bea972 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/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/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 343e5705f4019..652ac0e1c1ed6 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "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/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index e8859128b5f8f..39e6ff6ed760a 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/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/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 1d5cd945881d6..815b695ce1c28 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/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/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 77698e3ace2e9..a2ed64150f73a 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.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/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1842c9c5becea..329db692d1395 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/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/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 021d9533b445b..6333f2f72df05 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/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/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index ce2a5366ac60e..922f8163e171c 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/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/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 3ab5abb61d909..f69cb6709fda2 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/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/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index a9aadb85210b6..7d6148616e0e2 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/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/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index afcd8841d3bdd..88fdc5465c54d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.2.11"; + version = "2023.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Nrq7Bc9Lzdle8/rINp/GPy+DWANgMe7WCLP48gHohIo="; + hash = "sha256-ZclhJoJg80P0iysA0G7+gTg8S3qJaaAbHsr4v6DUGKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 010edcd27a1e2..6f22a64317d6e 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/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/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 07f23d4312eda..3fa6b9b6732ef 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.21"; + version = "0.8.22"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Zgsgt78ll/5NVSca4lnxXYkiw5FE2WgcO10o/IZaHgQ="; + hash = "sha256-YrvRlSogw9YSuOvm4PfjrKGvgiBqdXAO9CKqGcBBH0g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index ee73eb9405ec3..b3ca15ee3c635 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/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/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index f159508f90e84..ba22cca45fb5e 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/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/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 2d10d77f0d710..fd40463f2f71b 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/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/pkgs/development/python-modules/nextcloudmonitor/default.nix b/pkgs/development/python-modules/nextcloudmonitor/default.nix index 35ac2a4b6ce7c..521295f536208 100644 --- a/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/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/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix index 59f8a881a5dd5..b0748f64b805b 100644 --- a/pkgs/development/python-modules/niapy/default.nix +++ b/pkgs/development/python-modules/niapy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "niapy"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "NiaOrg"; repo = "NiaPy"; rev = "refs/tags/${version}"; - hash = "sha256-bZ9bONFntNx5tcm/gR/uPS5CqicJX281WsvSno8aVlY="; + hash = "sha256-qstTxUo4jZ8YKbEjtDtSZUvR67VNkBQJdXeERJPOMDw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index a1764765ef3d5..1b7f7957382cf 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/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/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index a839667e3258b..db1c0190149f3 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "13.4.1"; + version = "13.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f4Xq68QBcnHZdwZrAwg7QUvZrXYvrflEkh1us48YN/g="; + hash = "sha256-AW1MPFXQ/8/KqUr4wM263nSzrN67ai+L/dXVTCUG8uI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 58bd99ae1f254..b94cec292402b 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/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/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 89ced453a9d3b..81a81f221e269 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/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/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 5fd60d40e1bfb..ed472ce739e43 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/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/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index a0d41e0a56a82..7dbf0c8e6c6b4 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "110"; + version = "111"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-2eHKFq+urzJS3K55O0hca0h4ElowJZD6nIkYkzyBFCM="; + hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index aefb4cc43f546..2449ecafb9155 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/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/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 69314340cd1df..caa013f226883 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/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/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix index 134319d0a89b4..637bd4dc17b37 100644 --- a/pkgs/development/python-modules/pymoo/default.nix +++ b/pkgs/development/python-modules/pymoo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , writeText , autograd @@ -19,13 +20,13 @@ buildPythonPackage rec { pname = "pymoo"; - version = "0.6.0"; + version = "0.6.0.1"; src = fetchFromGitHub { owner = "anyoptimization"; repo = "pymoo"; rev = version; - hash = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ="; + hash = "sha256-+qtW7hfSo266n1SRzAgHIu99W5Sl+NYbKOHXv/JI9IA="; }; pymoo_data = fetchFromGitHub { @@ -35,6 +36,14 @@ buildPythonPackage rec { hash = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0="; }; + patches = [ + # https://github.com/anyoptimization/pymoo/pull/407 + (fetchpatch { + url = "https://github.com/anyoptimization/pymoo/commit/be57ece64275469daece1e8ef12b2b6ee05362c9.diff"; + hash = "sha256-BLPrUqNbAsAecfYahESEJF6LD+kehUYmkTvl/nvyqII="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "cma==3.2.2" "cma" \ diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index 4c53c37d5c241..0b6bb48857bce 100644 --- a/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/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/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index cb1da5238681a..4f7eb66231951 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -1,21 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , setuptools , multipledispatch , numpy }: buildPythonPackage rec { - version = "0.10.3"; pname = "pyrr"; + version = "unstable-2022-07-22"; - src = fetchPypi { - inherit pname version; - sha256 = "3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d"; + src = fetchFromGitHub { + owner = "adamlwgriffiths"; + repo = "Pyrr"; + rev = "f6c8698c48a75f3fb7ad0d47d0ce80a04f87ba2f"; + hash = "sha256-u9O52MQskZRzw0rBH6uPdXdikWLJe7wyBZGNKIFA4BA="; }; - buildInputs = [ setuptools ]; propagatedBuildInputs = [ multipledispatch numpy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 909dad99fb8f6..0b57dce5ec1a8 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/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/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 11d3bdc3adfcd..dcfed60a8c1e4 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/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/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index f1a079d5896e6..d08e62a815556 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/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/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 7dd424820c236..4e41507632693 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/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/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index c14c12c9780c4..d79ed33208144 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , bleak , click , buildPythonPackage @@ -15,12 +14,12 @@ buildPythonPackage rec { version = "0.4.11"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "emlove"; repo = pname; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; @@ -37,8 +36,6 @@ buildPythonPackage rec { pytest-asyncio pytest-mock pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 76962bb496718..3ba8f9487d58f 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -6,7 +6,7 @@ , xorgserver , pulseaudio , pytest-asyncio -, qtile +, qtile-unwrapped , keyring , requests , stravalib @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ pytest-asyncio - qtile.unwrapped + qtile-unwrapped pulseaudio keyring requests diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index ce04921804143..10a336905baa0 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.6"; + version = "0.5.7"; 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-orNKPm51rOOM49+RUUjI7+gTo3GoQv5h7b/gPFFZBTE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 0e82762339caa..66836286794d0 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/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/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index e84dd51d702c4..1113083266a2f 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/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/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 3b2701960f87d..592c5d72da7dc 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/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/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index a8614aa5bba91..185a8a4fdf678 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/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/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index 19190404a6b6e..7710cdc152c04 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/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/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 409d6584d7f7b..34306f386f6fb 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/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/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4d90e4e17e429..fb9f9f930d190 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/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/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 510e75a25a3a3..fd36854ebb6e5 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.6"; + version = "2.1.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RNoh7Uo7I5kMveX74Gt8r9Mse6qdYOqc/UKrEfuNm18="; + hash = "sha256-+Kae+mqx4ySXX8FlpVPdbXOJ3IsYfgdm7mM5V8f9JOI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index 85b8a26abc36e..c86bc6b2af67d 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/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/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 2de6d701399ab..e0a50279def68 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/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/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index a2adbeb87d291..5bc5ece21861b 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/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/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 0852ce740ede9..59e8d5ca3a9a3 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/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/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 98b51b21f8a31..997548cc3caa4 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -28,7 +27,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - asynctest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 4b55e598e2c0e..f487cc71b4356 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/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/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 2c73f5800558a..e6aa92cd357b6 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/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/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 0ff47dae38f0c..be67115333c1b 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "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/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 93f26dc7d5983..fcb849d4369cb 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/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/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index 2e1a77eda9186..276057583f4ed 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/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/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 390b25b642c23..158e73ccd9d9f 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/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/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 6ede440cc6119..30f9097be31dc 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/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/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 05b303878779d..334c52cd47f8a 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/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/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index 36055cc2b8824..ed46312a580f4 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/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/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 3f969acf89aeb..09d4aaa074c3b 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/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/pkgs/development/tools/exhaustive/default.nix b/pkgs/development/tools/exhaustive/default.nix new file mode 100644 index 0000000000000..7445ae5236dbb --- /dev/null +++ b/pkgs/development/tools/exhaustive/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "exhaustive"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "nishanths"; + repo = "exhaustive"; + rev = "v${version}"; + hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA="; + }; + + vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Check exhaustiveness of switch statements of enum-like constants in Go code"; + homepage = "https://github.com/nishanths/exhaustive"; + license = licenses.bsd2; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/development/tools/golangci-lint-langserver/default.nix index d2c3202f21462..142abf1dec6f0 100644 --- a/pkgs/development/tools/golangci-lint-langserver/default.nix +++ b/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/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 0f0c486ee6171..30529f03ffdb2 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/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/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index f76c120b87f3c..eab14d4541c9c 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/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/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index fef2306b1cd74..e568568ccdeb9 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/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/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/development/tools/language-servers/vala-language-server/default.nix index 71fa107afc560..40710ad83da30 100644 --- a/pkgs/development/tools/language-servers/vala-language-server/default.nix +++ b/pkgs/development/tools/language-servers/vala-language-server/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja @@ -17,24 +16,15 @@ stdenv.mkDerivation rec { pname = "vala-language-server"; - version = "0.48.5"; + version = "0.48.7"; src = fetchFromGitHub { owner = "vala-lang"; repo = pname; rev = version; - sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM="; + sha256 = "sha256-Vl5DjKBdpk03aPD+0xGoTwD9Slg1rREorqZGX5o10cY="; }; - patches = [ - # Fix regex for links in comments - # https://github.com/vala-lang/vala-language-server/pull/268 - (fetchpatch { - url = "https://github.com/vala-lang/vala-language-server/commit/b6193265d68b90755d57938c2ba1895841cf4b36.patch"; - sha256 = "sha256-nWG+xQAPDVBXamuKQymvn/FBHEP7Ta9p/vhYjxxBGzI="; - }) - ]; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix new file mode 100644 index 0000000000000..8ff7bc02705ab --- /dev/null +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -0,0 +1,37 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, withSimd ? true +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "rsonpath"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "v0ldek"; + repo = "rsonpath"; + rev = "v${version}"; + hash = "sha256-ip8+Wy9rmTzFccmjYWb3Nk+gkq3g4e1ty/5+ldIOO10="; + }; + + cargoHash = "sha256-5V0H2FeHI1SByzLsviOR+qHwYhZGiNmMawCTYjk2P24="; + + 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 ]; + # build fails on platforms without simd support, even when withSimd = false + broken = !stdenv.isx86_64; + }; +} diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index b862cb1218112..7c307c503fef0 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.4.0"; + version = "0.4.1"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-6ok8N5y/Wtz4t0414GHT7qc5D2ysw97oKASbKHPLXN8="; + sha256 = "sha256-omov7/o1ToWJBTsDXTp3FNLk7PuWGL3J6pNz6n47taU="; }; - cargoSha256 = "sha256-dxjVlbnewFdnO294L+9kQE8owlgyPaxepxtmC7V9nGk="; + cargoSha256 = "sha256-UkccHrs3q4MlIaK/lo+bPC9Jy/JCBjGzo8jgjZsvEIc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/misc/texlab/Cargo.lock b/pkgs/development/tools/misc/texlab/Cargo.lock index 59566d3b49947..7349b26f7d239 100644 --- a/pkgs/development/tools/misc/texlab/Cargo.lock +++ b/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/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 63f4ca45a9429..2f47fb46ffa6f 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/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/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 13b61e1d694de..0102a34994629 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/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/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index e6798260f94b1..b16f04cef265e 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.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/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index a582ce805a913..e7e9f3982de78 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.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/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 812a02b2eddad..c4e81d4eca7ee 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/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/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 0842a07049c51..b4f5b5f1604d6 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.4.2"; + version = "5.5.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-Zrn+4/zeqJXkKOSsbpPR2bO+ilApn8JUVAgqWydv/Is="; + sha256 = "sha256-ZY0AiT1hrxsBXnIkBcoB5d2s8Cc/N7qmVGjuYm2DvOM="; }; buildInputs = [ nodejs ]; @@ -21,15 +21,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = testers.testVersion { + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; - command = "twilio version"; }; meta = with lib; { description = "Unleash the power of Twilio from your command prompt"; homepage = "https://github.com/twilio/twilio-cli"; - changelog = "https://github.com/twilio/twilio-cli/blob/${version}/CHANGES.md"; + changelog = "https://github.com/twilio/twilio-cli/blob/${finalAttrs.version}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; platforms = nodejs.meta.platforms; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 67fe882f69973..734b2559dc04e 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU="; + hash = "sha256-Q/FLvZqmih3StVmLvEmJ5tY7Lz3dqFPUEn9HNubLNMY="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s="; + cargoHash = "sha256-SCaP6JtLztIO9Od75i4GkMPbLqpf52sAZVPHG86VcX0="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index e7a477dd11b9b..24ef87503a310 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.32.2"; + version = "4.33.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-gP5Ah/KVWtmEl1CUKge5XdsYwoAAdNabb10b0pdN0tk="; + hash = "sha256-Ur6Ro4i184kJKRBpF++crGOBpl9GDMdNrH4h/ftaGxo="; }; - vendorHash = "sha256-/7ah71isg0GB9PncNamMKaW2cW+EMN2BaPqP7gsLMmg="; + vendorHash = "sha256-o/Bn2YUXU+qKxRGFzIfhV9t1gVhfFOERAlTGHD5mxD0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index c50176dce790e..8d461104eaacd 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell +{ lib, stdenv, writeShellScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , extraArgs ? "" # arguments to always pass to steam +, extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # exclude game specific libraries }: @@ -52,6 +53,8 @@ let fi ''; + envScript = lib.toShellVars extraEnv; + in buildFHSUserEnv rec { name = "steam"; @@ -228,8 +231,7 @@ in buildFHSUserEnv rec { export SDL_JOYSTICK_DISABLE_UDEV=1 '' + extraProfile; - runScript = writeScript "steam-wrapper.sh" '' - #!${runtimeShell} + runScript = writeShellScript "steam-wrapper.sh" '' if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/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/pkgs/games/xgalaga++/default.nix b/pkgs/games/xgalaga++/default.nix new file mode 100644 index 0000000000000..ba78e28644145 --- /dev/null +++ b/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/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index f5a104fd08c3f..7cdf66377d8fe 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/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/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 8ae4df6409d5d..eba9faa6beeee 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "1.22"; + version = "2.0"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-wYXFromLV1BCiSWlzphtCSBOWacQ3yC7i2kxxH4y88Y="; - aarch64-linux = "sha256-t3waCv2hwkchWPlfx1bsKKB6imp7F6scRnZUQSwS6fI="; - x86_64-darwin = "sha256-x5Gr6z5ma+0AF7DEXJpqG+yg3ym+w2ULTqfpdLjfHGo="; - aarch64-darwin = "sha256-vvGZoN+Yi6FZDblhxwDzRneVtWaFFaOjyRG7017BzZI="; + x86_64-linux = "sha256-GqxgbJCLjXcXHT49fJL1IUJmh9oL4Lfokt7HqzshtWw="; + aarch64-linux = "sha256-3+S5EnyvTBKxkFbV7fg+qVDFLr25jMeDwb+MuqDJHMg="; + x86_64-darwin = "sha256-VO2dnNqbgyPKvZVMC0CG15JAaBelzcnkifmbZMS+38Y="; + aarch64-darwin = "sha256-RbpeIA5LYCUkhyLMo3dYvUe7uLyOD4Ey7qCvIg5JQAg="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 1cf1400f996b7..2ca74fb5f058d 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/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/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 156bb150c5f7a..15a3c9e6c18b4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }: +{ lib, callPackage, fetchFromGitHub, fetchurl, fetchpatch, stdenv, pkgsi686Linux }: let generic = args: let @@ -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 @@ -98,7 +98,28 @@ rec { persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; }; - legacy_340 = generic { + legacy_340 = let + # Source cooresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms + aurPatches = fetchFromGitHub { + owner = "archlinux-jerry"; + repo = "nvidia-340xx"; + rev = "fe2b38e66f2199777bcede6eb35c5df0210f15dc"; + hash = "sha256-hPFfzWGo2jF/DLm1OkP+BBnRY69N8kKUZ1EGkoHJlKA="; + }; + patchset = [ + "0001-kernel-5.7.patch" + "0002-kernel-5.8.patch" + "0003-kernel-5.9.patch" + "0004-kernel-5.10.patch" + "0005-kernel-5.11.patch" + "0006-kernel-5.14.patch" + "0007-kernel-5.15.patch" + "0008-kernel-5.16.patch" + "0009-kernel-5.17.patch" + "0010-kernel-5.18.patch" + "0011-kernel-6.0.patch" + ]; + in generic { version = "340.108"; sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0"; sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6"; @@ -106,7 +127,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; - broken = kernel.kernelAtLeast "5.5"; - patches = [ ./vm_operations_struct-fault.patch ]; + broken = kernel.kernelAtLeast "6.2"; + patches = map (patch: "${aurPatches}/${patch}") patchset; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index e56318deca96d..b76e64232b74a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/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/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch b/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch deleted file mode 100644 index 6ce5c1205e2d5..0000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5 ---- a/kernel/uvm/nvidia_uvm_lite.c -+++ b/kernel/uvm/nvidia_uvm_lite.c -@@ -818,8 +818,15 @@ done: - } - - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _fault(struct vm_fault *vmf) -+#endif - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ struct vm_area_struct *vma = vmf->vma; -+#endif - #if defined(NV_VM_FAULT_HAS_ADDRESS) - unsigned long vaddr = vmf->address; - #else -@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops = - // it's dealing with anonymous mapping (see handle_pte_fault). - // - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else -+int _sigbus_fault(struct vm_fault *vmf) -+#endif - { - vmf->page = NULL; - return VM_FAULT_SIGBUS; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b0769f70ca488..b800e2ee98de5 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/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 +, perl +, undmg , dbus-glib +, glib +, xorg , zlib -, bbe +, kernel , bash -, timetrap -, netcat , cups -, kernel ? null -, libsOnly ? false -, fetchurl -, undmg -, perl -, autoPatchelfHook +, 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; - - buildInputs = with xorg; [ libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]; - - runtimeDependencies = [ glib xorg.libXrandr ]; - - inherit libsOnly; + nativeBuildInputs = [ + autoPatchelfHook + bbe + makeWrapper + p7zip + perl + undmg + ] ++ kernel.moduleBuildDependencies; + + buildInputs = [ + dbus-glib + glib + xorg.libX11 + xorg.libXcomposite + xorg.libXext + xorg.libXrandr + xorg.libXi + xorg.libXinerama + zlib + ]; + + 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 - ''; - - kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; - kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; + ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) - libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; + runHook postUnpack + ''; - 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 - - # 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 + # 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 ../../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 + + for i in lib/libPrl*.0.0; do + cp $i $out/lib + ln -s $out/$i $out/''${i%.0.0} + done - mkdir -p $out/share/man/man8 - install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 + mkdir -p $out/share/man/man8 + install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 - substituteInPlace ../99prltoolsd-hibernate \ - --replace "/bin/bash" "${bash}/bin/bash" + 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 - fi + 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/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5e5ec6d793128..8655bd2ed323e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/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. @@ -256,5 +256,13 @@ in { sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U="; isUnstable = true; + + # Necessary for 6.2.8+ and 6.3 compatibility, see https://github.com/openzfs/zfs/issues/14658 + extraPatches = [ + (fetchpatch { + url = "https://github.com/openzfs/zfs/pull/14668.patch"; + hash = "sha256-PR7hxxdjLkjszADdw0R0JRmBPfDlsXG6D+VfC7QzEhk="; + }) + ]; }; } diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix index 3e71fc7765620..4a2ed9bd57296 100644 --- a/pkgs/servers/authelia/default.nix +++ b/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/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix index 913b607ac8435..cdcc0ddb63acd 100644 --- a/pkgs/servers/honk/default.nix +++ b/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/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index fa20e46055409..11d97faaaf460 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/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/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 004aa72c7cbad..440c9c67519f1 100644 --- a/pkgs/servers/jackett/default.nix +++ b/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/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3e9fadea76fa0..0061fa71e6b85 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/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/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index aa7e4136017f3..037f5f81f5237 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.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/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 82e30b57c3c8f..d1048d107e2e3 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -5,20 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "microbin"; - version = "1.1.0"; + version = "1.2.1"; - # GitHub sources do not have Cargo.lock + # The GitHub source is outdated src = fetchCrate { inherit pname version; - sha256 = "sha256-gfEO7Rrzc4KSnSXFrMmGLrTXuZIUCdumt2N429nHPi8="; + hash = "sha256-OLg0ejs9nanMNlY0lcnJ/RoRwefrXEaaROwx5aPx4u8="; }; - cargoSha256 = "sha256-k/5CG8bf5RuO6K9mEj6seqV6AuWMqatBRDaSS0guhi0="; + cargoHash = "sha256-XdHP0XruqtyLyGbLHielnmTAc3ZgeIyyZnknO+5k4Xo="; meta = with lib; { description = "A tiny, self-contained, configurable paste bin and URL shortener written in Rust"; homepage = "https://github.com/szabodanika/microbin"; + changelog = "https://github.com/szabodanika/microbin/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya figsoda ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index fc455b92ae890..6fffc192e27d2 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/caarlos0/domain_exporter"; description = "Exports the expiration time of your domains as prometheus metrics"; license = licenses.mit; - maintainers = with maintainers; [ mmilata prusnak peterhoeg ]; + maintainers = with maintainers; [ mmilata prusnak peterhoeg caarlos0 ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index aeca7c90eb9a6..528bd65e9161d 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-Bi24tg/ukFLmSbhAY3gZqT7qc0xWwLlLQxGB6F+qiUQ="; + sha256 = "sha256-eY9/a+uFJJ8lT+0ZGa+ExjKf0V6JOqI3l1sZbfQEXOc="; }; - vendorSha256 = "sha256-ocapAJAQD84zISbTduAf3QyjaZ0UroNMdQig6IBNDpw="; + vendorSha256 = "sha256-sMWprCRUvF6voLM3GjTq9tId1GoCPac/RE6hXL+LBEE="; doCheck = true; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index fde3454dd310b..ef8335c56ccca 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/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/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index bdc94c57bc89d..8685a92818847 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/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/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 7f7abbdb4afc5..5ba480ea5cf57 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/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 <tyhou13@gmx.com>", "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/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 05960e62965d7..b2a1f1923ce67 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/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/pkgs/servers/web-apps/lemmy/update.sh b/pkgs/servers/web-apps/lemmy/update.sh index 2df3f9e88d064..a2657025a0e27 100755 --- a/pkgs/servers/web-apps/lemmy/update.sh +++ b/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/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index a30ceae722738..aeeb57fa3792d 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/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/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index a0a8421a7c2b4..8e1f61dc5dd35 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/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/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index e6113c0d76962..ff4656f6650f3 100644 --- a/pkgs/shells/dash/default.nix +++ b/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/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 3a5a83ad1f8c1..18fa69c604272 100644 --- a/pkgs/shells/zsh/default.nix +++ b/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/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index e9bd772a94d1f..08028053bec6f 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/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/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 65b6eb0301e16..d0a7bce8bc028 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/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/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 65c850fdca91c..3ea03db31adf3 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/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/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 668110650f3b1..f4c6955d28765 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/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/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4df33fa2d82bb..b124e250af91c 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/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/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 836c1068531e1..50b83a6664b77 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-XphLzYdZg+aSk7fgDz61ADxb+sgsck6TuZ1++PGu/dE="; + hash = "sha256-3MiKivewGl4J/yQJ+wLTwh8w6HO8XuX9/b6mwtbvW3o="; }; vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 71d823244faee..9992f118cad01 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY="; + sha256 = "sha256-ryLqGH81Z+5GQ1ROHpCWmCHKSfS8g35b0wCmr8aokWk="; }; - vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; + vendorHash = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; doCheck = false; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 34bd7c56178d4..36bd2065de7e5 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/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/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index eee9c70fccc46..451ed58d81858 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/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/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 559fcf2a0ff9a..5487a26417505 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/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/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index eea423b897a63..a59c2695c20a5 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/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/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index c8f4b7d931162..f0cf68e8d8e42 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-BeihN4cNsdYYLfct2pirenEA3rN2lH6FS51ZyRTCx7s="; + hash = "sha256-1n3LpaKOCQS2CIa25fdSvHycOlxwlhU4VbWtyp24bFE="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index c0c770631032d..49cb954b2939f 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.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/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index db44108112f3c..9c4099783e0c6 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/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/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 0835540d92d85..432c59bd02a37 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/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/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index c363752467fa7..a4c5c6451228f 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/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/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 2213067f9bc96..29bb0f1f27c3a 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-e6AkxC3TP2StApPSWaadLz/AFmaKBKCrS5HuocvmfQs="; + hash = "sha256-05bGVtjbyd9e/Ega/Lv1Yy4gVDlJfygxD1g8bu5FuWY="; }; - cargoHash = "sha256-E3IX3JSc8Rq8Qnx6Lk+PQgGfHptidxPaOqejYJgudlw="; + cargoHash = "sha256-uzgMqfQCUzOOYCirLWsH2xm02T0UZXcMKCMmM45AkBg="; meta = with lib; { description = "Puts bad Linux applications in a box with only their files"; diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index d57475fb59383..cc28ddb12a6e7 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.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/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/tools/misc/chatgpt-cli/default.nix new file mode 100644 index 0000000000000..0818e860b5ce4 --- /dev/null +++ b/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/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index c229667db474a..c34bc26b0e7aa 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/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/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index b6125b9faf761..f44b3c7a1bcfd 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/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/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 0a41ef0f8bec5..ea1b04de25cc0 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/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/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index d4bdeffc4fb2a..2a85535b29aa8 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.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/pkgs/tools/misc/shell_gpt/default.nix b/pkgs/tools/misc/shell_gpt/default.nix new file mode 100644 index 0000000000000..695ceb15fe04b --- /dev/null +++ b/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.linux; + license = licenses.mit; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 81964d8921158..e290598faeb22 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/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/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 3c72233743f44..6968fff13e7d7 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/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/pkgs/tools/misc/svu/default.nix b/pkgs/tools/misc/svu/default.nix new file mode 100644 index 0000000000000..62568696c42dd --- /dev/null +++ b/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/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix index abfd48b83a8d4..6332f6de64ec5 100644 --- a/pkgs/tools/misc/timer/default.nix +++ b/pkgs/tools/misc/timer/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { description = "A `sleep` with progress"; homepage = "https://github.com/caarlos0/timer"; license = licenses.mit; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ zowoq caarlos0 ]; }; } diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 23477e46c1177..2fcb42f9ab0c9 100644 --- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/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/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 4d1783b53acc7..5fd808cd1d810 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/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/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 45d7e95103b49..eda5790c7c41a 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/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/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 4666cdf97bd98..9311451a5259c 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.22.1"; + version = "3.22.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - hash = "sha256-hkYN28M2t8SXmIrSEQEWM5ndCx1xgpHThNg0UFzQqLU="; + hash = "sha256-q6neBDk/kcvAoih4urRTFmhH6N7Fh/hEJQtL//kqJiI="; }; vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y="; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index e3ca1df480238..84ad4e56755e9 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/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/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 6577334b228ec..ef43b2b9de448 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; - maintainers = with maintainers; [ marsam techknowlogick ]; + maintainers = with maintainers; [ marsam techknowlogick caarlos0 ]; license = with licenses; [ mit ]; }; } diff --git a/pkgs/tools/package-management/zkg/default.nix b/pkgs/tools/package-management/zkg/default.nix new file mode 100644 index 0000000000000..8abd58f7da4f4 --- /dev/null +++ b/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/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/tools/security/argocd-vault-plugin/default.nix index 785caa8f536d2..0f0901f372fca 100644 --- a/pkgs/tools/security/argocd-vault-plugin/default.nix +++ b/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/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix index b4a108e8eb84b..00573070a31c4 100644 --- a/pkgs/tools/security/dontgo403/default.nix +++ b/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/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index b23e8ebe54a34..55b85b95437c2 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-25"; + version = "2023-03-28"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pmhjSZMnTJn0MDKsCk799DrHBDqvUw8M9wxBx65W9pQ="; + hash = "sha256-aduDgEj07Gy+P6xDa8DUT31ZHEWXHlzspi7ZY2wCl9A="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/tools/security/katana/default.nix index bd5947b689f57..0e248cfb2b25c 100644 --- a/pkgs/tools/security/katana/default.nix +++ b/pkgs/tools/security/katana/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "katana"; - version = "0.0.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Ax99pmoxlyUGLN2OdIItTNTnO/fDquvNadNnNG6ElEk="; + rev = "refs/tags/v${version}"; + hash = "sha256-OSvkQIpZEMav1dh3DDTqFxoFbc6sWOjhslqVJcUS104="; }; - vendorHash = "sha256-IJcMIJF2A5DfyBdcIXTbeX72Q/4SAVZ0U3UIQ2H0fEc="; + vendorHash = "sha256-u/3MMuq2Zab6k+vPQ0iKQf8k9zMV2aIgIsTee0VUQaI="; CGO_ENABLED = 0; @@ -23,6 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A next-generation crawling and spidering framework"; homepage = "https://github.com/projectdiscovery/katana"; + changelog = "https://github.com/projectdiscovery/katana/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index acc82636f32f0..8f8991801f7ce 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/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/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix deleted file mode 100644 index 11dcd63d77616..0000000000000 --- a/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/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/tools/security/pcsc-safenet/default.nix index 68006a40da8d3..2fcbd302e8ccf 100644 --- a/pkgs/tools/security/pcsc-safenet/default.nix +++ b/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 - mkdir -p pcsc/drivers - mv usr/share/eToken/drivers/* pcsc/drivers/ - rm -r usr/share/eToken/drivers - - # Move binaries out - mv usr/bin bin - - # Move UI to bin - mv usr/share/SAC/SACUIProcess bin/ - rm -r usr/share/SAC + mv usr/* . - mkdir $out - cp -r {bin,etc,lib,pcsc,usr,var} $out/ - - 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 + mkdir -p pcsc/drivers + mv -- lib/pkcs11/* pcsc/drivers/ + rmdir lib/pkcs11 + + mkdir "$out" + cp -r ./* "$out/" + + # 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 + + # 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 + + ln -sf ${lib.getLib openssl_1_1}/lib/libcrypto.so $out/lib/libcrypto.so.1.1.0 ''; dontAutoPatchelf = true; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 7bfa0e0a19ad6..f4be423a269ff 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/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/pkgs/tools/security/vaultwarden/Cargo.lock b/pkgs/tools/security/vaultwarden/Cargo.lock index 8bf1ee42722f0..6c893cad2c6b0 100644 --- a/pkgs/tools/security/vaultwarden/Cargo.lock +++ b/pkgs/tools/security/vaultwarden/Cargo.lock @@ -3,56 +3,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -86,6 +42,28 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -100,35 +78,145 @@ dependencies = [ ] [[package]] +name = "async-executor" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 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.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +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-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +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" @@ -164,25 +247,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.67" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "binascii" @@ -197,15 +277,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", @@ -329,16 +439,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -349,19 +449,32 @@ dependencies = [ ] [[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "cookie" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917" +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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +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 = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" + +[[package]] +name = "futures-lite" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +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]] @@ -936,26 +1102,22 @@ dependencies = [ ] [[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" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "glob" -version = "0.3.0" +name = "gloo-timers" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +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 = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +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", ] @@ -1214,21 +1379,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" [[package]] -name = "inout" -version = "0.1.3" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "generic-array", + "cfg-if", ] [[package]] -name = "instant" -version = "0.1.12" +name = "io-lifetimes" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ - "cfg-if", + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.45.0", ] [[package]] @@ -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 = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +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", @@ -1296,6 +1475,15 @@ dependencies = [ ] [[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -1372,6 +1561,18 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -1653,33 +1856,18 @@ dependencies = [ ] [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.3.0" +version = "1.17.1" 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", @@ -1735,6 +1923,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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 = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] name = "paste" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" +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", ] @@ -1968,29 +2177,23 @@ dependencies = [ ] [[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" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +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" @@ -3105,16 +3362,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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", ] @@ -3154,15 +3401,25 @@ 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 = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +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 = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-streams" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +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", @@ -3362,6 +3639,17 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -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_aarch64_gnullvm" -version = "0.42.0" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows-targets" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +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_msvc" -version = "0.39.0" +name = "windows_aarch64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.39.0" +version = "0.42.2" 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" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.39.0" +version = "0.42.2" 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" 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/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index a98d6beb9a355..a31f5e45c4a82 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/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/pkgs/tools/security/vaultwarden/update.nix b/pkgs/tools/security/vaultwarden/update.nix index 44af26ada0d8e..c2c03413cc435 100644 --- a/pkgs/tools/security/vaultwarden/update.nix +++ b/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/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 28b60517ad655..43de28a914a96 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/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/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index 3f751dc4d7e62..098f4c5e201a6 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/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/pkgs/tools/text/nerdfix/default.nix b/pkgs/tools/text/nerdfix/default.nix new file mode 100644 index 0000000000000..2609ca84b7632 --- /dev/null +++ b/pkgs/tools/text/nerdfix/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "nerdfix"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "loichyan"; + repo = "nerdfix"; + rev = "v${version}"; + hash = "sha256-p6SXdMniUoAUcX4xQYBJ0Yfs0N29wITO0d7GpxavQP0="; + }; + + cargoHash = "sha256-GMpl4Gw9sbS2WEbf435fipYTghmJ8VsayiWxH1PhxA0="; + + meta = with lib; { + description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; + homepage = "https://github.com/loichyan/nerdfix"; + changelog = "https://github.com/loichyan/nerdfix/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/tools/typesetting/typst/Cargo.lock index fe52185931f81..c595674ad62cd 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/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/pkgs/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 783a2bf4eb51d..ed5473892e4c3 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -7,25 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "22-03-21-2"; + version = "23-03-28"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; - rev = version; - hash = "sha256-bJPGs/Bd9nKYDrCCaFT+20+1wTN4YdkV8bGrtOCR4tM="; + rev = "v${version}"; + hash = "sha256-0fTGbXdpzPadABWqdReQNZf2N7OMZ8cs9U5fmhfN6m4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "biblatex-0.6.3" = "sha256-TfH2tk7B61HHqpdGY48TdPKelp4+78x+8LRFobAg8QA="; - "comemo-macros-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/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 47b59353af86d..164605b3d8a25 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/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/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4bf8208bba6a..d6108f66e25b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 489e3d50e00cd..496faefd0c911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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; }; @@ -10128,6 +10130,8 @@ with pkgs; neofetch = callPackage ../tools/misc/neofetch { }; + nerdfix = callPackage ../tools/text/nerdfix { }; + nerdfonts = callPackage ../data/fonts/nerdfonts { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -10922,6 +10926,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 { }; @@ -11364,6 +11372,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; }; @@ -12422,6 +12434,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 { }; @@ -15579,8 +15593,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 { }; @@ -18731,6 +18746,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 { }; @@ -19606,6 +19623,8 @@ with pkgs; cppcms = callPackage ../development/libraries/cppcms { }; + cppcodec = callPackage ../development/libraries/cppcodec { }; + cppunit = callPackage ../development/libraries/cppunit { }; cpputest = callPackage ../development/libraries/cpputest { }; @@ -21609,6 +21628,8 @@ with pkgs; libnice = callPackage ../development/libraries/libnice { }; + libnitrokey = callPackage ../development/libraries/libnitrokey { }; + libnsl = callPackage ../development/libraries/libnsl { }; liboping = callPackage ../development/libraries/liboping { }; @@ -24748,6 +24769,8 @@ with pkgs; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; }; + exhaustive = callPackage ../development/tools/exhaustive { }; + exhibitor = callPackage ../servers/exhibitor { }; hyp = callPackage ../servers/http/hyp { }; @@ -25412,6 +25435,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; @@ -28690,8 +28715,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 { }; @@ -30618,6 +30643,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 { }; @@ -33258,6 +33285,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 { }; @@ -33610,6 +33639,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 @@ -33883,6 +33913,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 { }; @@ -34113,7 +34145,8 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - qtile = callPackage ../applications/window-managers/qtile { }; + qtile-unwrapped = callPackage ../applications/window-managers/qtile { }; + qtile = callPackage ../applications/window-managers/qtile/wrapper.nix { }; vimgolf = callPackage ../games/vimgolf { }; @@ -36397,6 +36430,8 @@ with pkgs; xcowsay = callPackage ../games/xcowsay { }; + xgalagapp = callPackage ../games/xgalaga++ { }; + xjump = callPackage ../games/xjump { }; xmoto = callPackage ../games/xmoto { }; @@ -39126,6 +39161,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 { @@ -39304,7 +39341,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 { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index cbb4581126e58..3754c8a004ab7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/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/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 71772fe38fe3d..a8afc883fcae4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -92,11 +92,11 @@ let ack = buildPerlPackage rec { pname = "ack"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v${version}.tar.gz"; - hash = "sha256-AxRNEHBknpL2obfSC9xTXiuxrCWNqr5ILpqoJ3tI8AU="; + hash = "sha256-6nyqFPdX3ggzEO0suimGYd3Mpd7gbsjxgEPqYlp53yA="; }; outputs = ["out" "man"]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b04f6296d338..12a65e9a4c9c6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1477,6 +1477,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 { }; |