diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS
index 96bdccccf5..2e223ede69 100644
--- a/third_party/nixpkgs/.github/CODEOWNERS
+++ b/third_party/nixpkgs/.github/CODEOWNERS
@@ -90,6 +90,9 @@
# NixOS integration test driver
/nixos/lib/test-driver @tfc
+# NixOS QEMU virtualisation
+/nixos/virtualisation/qemu-vm.nix @raitobezarius
+
# Systemd
/nixos/modules/system/boot/systemd.nix @NixOS/systemd
/nixos/modules/system/boot/systemd @NixOS/systemd
@@ -139,7 +142,7 @@
# C compilers
/pkgs/development/compilers/gcc @matthewbauer
-/pkgs/development/compilers/llvm @matthewbauer
+/pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius
# Compatibility stuff
/pkgs/top-level/unix-tools.nix @matthewbauer
diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md
index 7ebff3d332..82f8d022a9 100644
--- a/third_party/nixpkgs/CONTRIBUTING.md
+++ b/third_party/nixpkgs/CONTRIBUTING.md
@@ -43,6 +43,7 @@ Below is a short excerpt of some points in there:
* Not start with the package name.
* More generally, it should not refer to the package name.
* Not end with a period (or any punctuation for that matter).
+ * Aim to inform while avoiding subjective language.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
* If in doubt, try to contact the upstream developers for clarification.
diff --git a/third_party/nixpkgs/doc/.gitignore b/third_party/nixpkgs/doc/.gitignore
index e532ed0eb9..b08285995f 100644
--- a/third_party/nixpkgs/doc/.gitignore
+++ b/third_party/nixpkgs/doc/.gitignore
@@ -8,3 +8,4 @@ manual-full.xml
out
result
result-*
+media
diff --git a/third_party/nixpkgs/doc/Makefile b/third_party/nixpkgs/doc/Makefile
index ee98a3ee92..208f23f502 100644
--- a/third_party/nixpkgs/doc/Makefile
+++ b/third_party/nixpkgs/doc/Makefile
@@ -19,6 +19,9 @@ pandoc_flags = --extract-media=$(pandoc_media_dir) \
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
+.PHONY: render-md
+render-md: ${MD_TARGETS}
+
.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
diff --git a/third_party/nixpkgs/doc/builders/special.xml b/third_party/nixpkgs/doc/builders/special.xml
index c971134819..18cf6cfd39 100644
--- a/third_party/nixpkgs/doc/builders/special.xml
+++ b/third_party/nixpkgs/doc/builders/special.xml
@@ -9,4 +9,5 @@
+
diff --git a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
index cacad261e2..0adacb59cf 100644
--- a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
+++ b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
@@ -1,6 +1,6 @@
-# buildFHSUserEnv {#sec-fhs-environments}
+# buildFHSEnv {#sec-fhs-environments}
-`buildFHSUserEnv` provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound `/nix/store`, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are:
+`buildFHSEnv` provides a way to build and run FHS-compatible lightweight sandboxes. It creates an isolated root with bound `/nix/store`, so its footprint in terms of disk space needed is quite small. This allows one to run software which is hard or unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions, games distributed as tarballs, software with integrity checking and/or external self-updated binaries. It uses Linux namespaces feature to create temporary lightweight environments which are destroyed after all child processes exit, without root user rights requirement. Accepted arguments are:
- `name`
Environment name.
@@ -26,7 +26,7 @@ One can create a simple environment using a `shell.nix` like that:
```nix
{ pkgs ? import {} }:
-(pkgs.buildFHSUserEnv {
+(pkgs.buildFHSEnv {
name = "simple-x11-env";
targetPkgs = pkgs: (with pkgs;
[ udev
diff --git a/third_party/nixpkgs/doc/builders/special/vm-tools.section.md b/third_party/nixpkgs/doc/builders/special/vm-tools.section.md
new file mode 100644
index 0000000000..3b6fb0d255
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/special/vm-tools.section.md
@@ -0,0 +1,148 @@
+# vmTools {#sec-vm-tools}
+
+A set of VM related utilities, that help in building some packages in more advanced scenarios.
+
+## `vmTools.createEmptyImage` {#vm-tools-createEmptyImage}
+
+A bash script fragment that produces a disk image at `destination`.
+
+### Attributes
+
+* `size`. The disk size, in MiB.
+* `fullName`. Name that will be written to `${destination}/nix-support/full-name`.
+* `destination` (optional, default `$out`). Where to write the image files.
+
+## `vmTools.runInLinuxVM` {#vm-tools-runInLinuxVM}
+
+Run a derivation in a Linux virtual machine (using Qemu/KVM).
+By default, there is no disk image; the root filesystem is a `tmpfs`, and the Nix store is shared with the host (via the [9P protocol](https://wiki.qemu.org/Documentation/9p#9p_Protocol)).
+Thus, any pure Nix derivation should run unmodified.
+
+If the build fails and Nix is run with the `-K/--keep-failed` option, a script `run-vm` will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively.
+
+### Attributes
+
+* `preVM` (optional). Shell command to be evaluated *before* the VM is started (i.e., on the host).
+* `memSize` (optional, default `512`). The memory size of the VM in MiB.
+* `diskImage` (optional). A file system image to be attached to `/dev/sda`.
+ Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
+
+### Examples
+
+Build the derivation hello inside a VM:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+runInLinuxVM hello
+```
+
+Build inside a VM with extra memory:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+runInLinuxVM (hello.overrideAttrs (_: { memSize = 1024; }))
+```
+
+Use VM with a disk image (implicitly sets `diskImage`, see [`vmTools.createEmptyImage`](#vm-tools-createEmptyImage)):
+```nix
+{ pkgs }: with pkgs; with vmTools;
+runInLinuxVM (hello.overrideAttrs (_: {
+ preVM = createEmptyImage {
+ size = 1024;
+ fullName = "vm-image";
+ };
+}))
+```
+
+## `vmTools.extractFs` {#vm-tools-extractFs}
+
+Takes a file, such as an ISO, and extracts its contents into the store.
+
+### Attributes
+
+* `file`. Path to the file to be extracted.
+ Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
+* `fs` (optional). Filesystem of the contents of the file.
+
+### Examples
+
+Extract the contents of an ISO file:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+extractFs { file = ./image.iso; }
+```
+
+## `vmTools.extractMTDfs` {#vm-tools-extractMTDfs}
+
+Like [](#vm-tools-extractFs), but it makes use of a [Memory Technology Device (MTD)](https://en.wikipedia.org/wiki/Memory_Technology_Device).
+
+## `vmTools.runInLinuxImage` {#vm-tools-runInLinuxImage}
+
+Like [](#vm-tools-runInLinuxVM), but instead of using `stdenv` from the Nix store, run the build using the tools provided by `/bin`, `/usr/bin`, etc. from the specified filesystem image, which typically is a filesystem containing a [FHS](https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard)-based Linux distribution.
+
+## `vmTools.makeImageTestScript` {#vm-tools-makeImageTestScript}
+
+Generate a script that can be used to run an interactive session in the given image.
+
+### Examples
+
+Create a script for running a Fedora 27 VM:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+makeImageTestScript diskImages.fedora27x86_64
+```
+
+Create a script for running an Ubuntu 20.04 VM:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+makeImageTestScript diskImages.ubuntu2004x86_64
+```
+
+## `vmTools.diskImageFuns` {#vm-tools-diskImageFuns}
+
+A set of functions that build a predefined set of minimal Linux distributions images.
+
+### Images
+
+* Fedora
+ * `fedora26x86_64`
+ * `fedora27x86_64`
+* CentOS
+ * `centos6i386`
+ * `centos6x86_64`
+ * `centos7x86_64`
+* Ubuntu
+ * `ubuntu1404i386`
+ * `ubuntu1404x86_64`
+ * `ubuntu1604i386`
+ * `ubuntu1604x86_64`
+ * `ubuntu1804i386`
+ * `ubuntu1804x86_64`
+ * `ubuntu2004i386`
+ * `ubuntu2004x86_64`
+ * `ubuntu2204i386`
+ * `ubuntu2204x86_64`
+* Debian
+ * `debian10i386`
+ * `debian10x86_64`
+ * `debian11i386`
+ * `debian11x86_64`
+
+### Attributes
+
+* `size` (optional, defaults to `4096`). The size of the image, in MiB.
+* `extraPackages` (optional). A list names of additional packages from the distribution that should be included in the image.
+
+### Examples
+
+8GiB image containing Firefox in addition to the default packages:
+```nix
+{ pkgs }: with pkgs; with vmTools;
+diskImageFuns.ubuntu2004x86_64 { extraPackages = [ "firefox" ]; size = 8192; }
+```
+
+## `vmTools.diskImageExtraFuns` {#vm-tools-diskImageExtraFuns}
+
+Shorthand for `vmTools.diskImageFuns. { extraPackages = ... }`.
+
+## `vmTools.diskImages` {#vm-tools-diskImages}
+
+Shorthand for `vmTools.diskImageFuns. { }`.
diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix
index ac405c3790..4f55c95a04 100644
--- a/third_party/nixpkgs/doc/default.nix
+++ b/third_party/nixpkgs/doc/default.nix
@@ -20,6 +20,10 @@ in pkgs.stdenv.mkDerivation {
ln -s ${doc-support} ./doc-support/result
'';
+ preBuild = ''
+ make -j$NIX_BUILD_CORES render-md
+ '';
+
installPhase = ''
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")"
diff --git a/third_party/nixpkgs/doc/doc-support/lib-function-locations.nix b/third_party/nixpkgs/doc/doc-support/lib-function-locations.nix
index 3ede09ba50..1ee5964833 100644
--- a/third_party/nixpkgs/doc/doc-support/lib-function-locations.nix
+++ b/third_party/nixpkgs/doc/doc-support/lib-function-locations.nix
@@ -1,6 +1,6 @@
{ pkgs, nixpkgs ? { }, libsets }:
let
- revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
+ revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");
libDefPos = prefix: set:
builtins.concatMap
diff --git a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md
index e359acb3a8..6ca1997083 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md
@@ -37,7 +37,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`,
* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
-* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
+* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Coq packages to work correctly,
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md
index cefdd68c35..c697a69087 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md
@@ -20,6 +20,7 @@ In the following is an example expression using `buildGoModule`, the following a
To obtain the actual hash, set `vendorHash = lib.fakeSha256;` and run the build ([more details here](#sec-source-hashes)).
- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums.
+- `modPostBuild`: Shell commands to run after the build of the go-modules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute.
```nix
pet = buildGoModule rec {
@@ -114,7 +115,16 @@ done
## Attributes used by the builders {#ssec-go-common-attributes}
-Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used:
+Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` go-modules fixed output derivation as well:
+
+- [`sourceRoot`](#var-stdenv-sourceRoot)
+- [`prePatch`](#var-stdenv-prePatch)
+- [`patches`](#var-stdenv-patches)
+- [`patchFlags`](#var-stdenv-patchFlags)
+- [`postPatch`](#var-stdenv-postPatch)
+- [`preBuild`](#var-stdenv-preBuild)
+
+In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, both `buildGoModule` and `buildGoPackage` respect Go-specific attributes that tweak them to behave slightly differently:
### `ldflags` {#var-go-ldflags}
diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md
index 4b4f523129..a36843c97c 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md
@@ -108,7 +108,7 @@ haskell.compiler.ghcjs ghcjs-8.10.7
Each of those compiler versions has a corresponding attribute set built using
it. However, the non-standard package sets are not tested regularly and, as a
result, contain fewer working packages. The corresponding package set for GHC
-9.4.4 is `haskell.packages.ghc944`. In fact `haskellPackages` is just an alias
+9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias
for `haskell.packages.ghc927`:
```console
diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md
index 6d5e465ec3..fdb570ebc3 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md
@@ -229,7 +229,7 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info.
#### Pitfalls {#javascript-node2nix-pitfalls}
- If upstream package.json does not have a "version" attribute, `node2nix` will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json).
-- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs-16_x`.
+- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs_16`.
- `node2nix` does not like missing packages from NPM. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of NPM.
### yarn2nix {#javascript-yarn2nix}
diff --git a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md
index 92ce8af133..2ed02ab9d6 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/lua.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/lua.section.md
@@ -129,16 +129,21 @@ Let's present the luarocks way first and the manual one in a second time.
### Packaging a library on luarocks {#packaging-a-library-on-luarocks}
[Luarocks.org](https://luarocks.org/) is the main repository of lua packages.
-The site proposes two types of packages, the rockspec and the src.rock
+The site proposes two types of packages, the `rockspec` and the `src.rock`
(equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source).
-These packages can have different build types such as `cmake`, `builtin` etc .
-Luarocks-based packages are generated in pkgs/development/lua-modules/generated-packages.nix from
-the whitelist maintainers/scripts/luarocks-packages.csv and updated by running maintainers/scripts/update-luarocks-packages.
+Luarocks-based packages are generated in [pkgs/development/lua-modules/generated-packages.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/generated-packages.nix) from
+the whitelist maintainers/scripts/luarocks-packages.csv and updated by running
+the script
+[maintainers/scripts/update-luarocks-packages](https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/update-luarocks-packages):
+
+```sh
+./maintainers/scripts/update-luarocks-packages update
+```
[luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).
The automation only goes so far though and some packages need to be customized.
-These customizations go in `pkgs/development/lua-modules/overrides.nix`.
+These customizations go in [pkgs/development/lua-modules/overrides.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/overrides.nix).
For instance if the rockspec defines `external_dependencies`, these need to be manually added to the overrides.nix.
You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.
diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md
index 39e38c6a12..bf0d663179 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md
@@ -212,7 +212,7 @@ Note: this is not possible anymore for Neovim.
## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}
-Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names).
After running `./update.py`, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`.
@@ -226,7 +226,7 @@ deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`.
-To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running.
+To add a new plugin, run `./update.py add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running.
Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim.
diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md
index 0b4777efdb..2e0cae67d5 100644
--- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md
@@ -86,6 +86,23 @@ meta.platforms = lib.platforms.linux;
Attribute Set `lib.platforms` defines [various common lists](https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix) of platforms types.
+### `badPlatforms` {#var-meta-badPlatforms}
+
+The list of Nix [platform types](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L75-L81) on which the package is known not to be buildable.
+Hydra will never create prebuilt binaries for these platform types, even if they are in [`meta.platforms`](#var-meta-platforms).
+In general it is preferable to set `meta.platforms = lib.platforms.all` and then exclude any platforms on which the package is known not to build.
+For example, a package which requires dynamic linking and cannot be linked statically could use this:
+
+```nix
+meta.platforms = lib.platforms.all;
+meta.badPlatforms = [ lib.systems.inspect.patterns.isStatic ];
+```
+
+The [`lib.meta.availableOn`](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/lib/meta.nix#L95-L106) function can be used to test whether or not a package is available (i.e. buildable) on a given platform.
+Some packages use this to automatically detect the maximum set of features with which they can be built.
+For example, `systemd` [requires dynamic linking](https://github.com/systemd/systemd/issues/20600#issuecomment-912338965), and [has a `meta.badPlatforms` setting](https://github.com/NixOS/nixpkgs/blob/b03ac42b0734da3e7be9bf8d94433a5195734b19/pkgs/os-specific/linux/systemd/default.nix#L752) similar to the one above.
+Packages which can be built with or without `systemd` support will use `lib.meta.availableOn` to detect whether or not `systemd` is available on the [`hostPlatform`](#ssec-cross-platform-parameters) for which they are being built; if it is not available (e.g. due to a statically-linked host platform like `pkgsStatic`) this support will be disabled by default.
+
### `tests` {#var-meta-tests}
::: {.warning}
@@ -173,7 +190,7 @@ To be effective, it must be presented directly to an evaluation process that han
### `hydraPlatforms` {#var-meta-hydraPlatforms}
-The list of Nix platform types for which the Hydra instance at `hydra.nixos.org` will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
+The list of Nix platform types for which the [Hydra](https://github.com/nixos/hydra) [instance at `hydra.nixos.org`](https://nixos.org/hydra) will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of `meta.platforms`. Thus, the only reason to set `meta.hydraPlatforms` is if you want `hydra.nixos.org` to build the package on a subset of `meta.platforms`, or not at all, e.g.
```nix
meta.platforms = lib.platforms.linux;
@@ -182,7 +199,26 @@ meta.hydraPlatforms = [];
### `broken` {#var-meta-broken}
-If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed.
+If set to `true`, the package is marked as "broken", meaning that it won’t show up in [search.nixos.org](https://search.nixos.org/packages), and cannot be built or installed unless the environment variable [`NIXPKGS_ALLOW_BROKEN`](#opt-allowBroken) is set.
+Such unconditionally-broken packages should be removed from Nixpkgs eventually unless they are fixed.
+
+The value of this attribute can depend on a package's arguments, including `stdenv`.
+This means that `broken` can be used to express constraints, for example:
+
+- Does not cross compile
+
+ ```nix
+ meta.broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+ ```
+
+- Broken if all of a certain set of its dependencies are broken
+
+ ```nix
+ meta.broken = lib.all (map (p: p.meta.broken) [ glibc musl ])
+ ```
+
+This makes `broken` strictly more powerful than `meta.badPlatforms`.
+However `meta.availableOn` currently examines only `meta.platforms` and `meta.badPlatforms`, so `meta.broken` does not influence the default values for optional dependencies.
## Licenses {#sec-meta-license}
diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
index 081d1e778f..8d125d5b2f 100644
--- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
+++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md
@@ -16,7 +16,8 @@ stdenv.mkDerivation {
}
```
-(`stdenv` needs to be in scope, so if you write this in a separate Nix expression from `pkgs/all-packages.nix`, you need to pass it as a function argument.) Specifying a `name` and a `src` is the absolute minimum Nix requires. For convenience, you can also use `pname` and `version` attributes and `mkDerivation` will automatically set `name` to `"${pname}-${version}"` by default. Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs, as it allows us to reuse the version easily:
+(`stdenv` needs to be in scope, so if you write this in a separate Nix expression from `pkgs/all-packages.nix`, you need to pass it as a function argument.) Specifying a `name` and a `src` is the absolute minimum Nix requires. For convenience, you can also use `pname` and `version` attributes and `mkDerivation` will automatically set `name` to `"${pname}-${version}"` by default.
+**Since [RFC 0035](https://github.com/NixOS/rfcs/pull/35), this is preferred for packages in Nixpkgs**, as it allows us to reuse the version easily:
```nix
stdenv.mkDerivation rec {
@@ -33,7 +34,8 @@ Many packages have dependencies that are not provided in the standard environmen
```nix
stdenv.mkDerivation {
- name = "libfoo-1.2.3";
+ pname = "libfoo";
+ version = "1.2.3";
...
buildInputs = [libbar perl ncurses];
}
@@ -45,7 +47,8 @@ Often it is necessary to override or modify some aspect of the build. To make th
```nix
stdenv.mkDerivation {
- name = "fnord-4.5";
+ pname = "fnord";
+ version = "4.5";
...
buildPhase = ''
gcc foo.c -o foo
@@ -65,7 +68,8 @@ While the standard environment provides a generic builder, you can still supply
```nix
stdenv.mkDerivation {
- name = "libfoo-1.2.3";
+ pname = "libfoo";
+ version = "1.2.3";
...
builder = ./builder.sh;
}
diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix
index d9a6eab060..1f11eaaa82 100644
--- a/third_party/nixpkgs/lib/attrsets.nix
+++ b/third_party/nixpkgs/lib/attrsets.nix
@@ -9,7 +9,7 @@ let
in
rec {
- inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr;
+ inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr removeAttrs;
/* Return an attribute from nested attribute sets.
diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix
index 4357a03533..4ecbdac3c1 100644
--- a/third_party/nixpkgs/lib/generators.nix
+++ b/third_party/nixpkgs/lib/generators.nix
@@ -426,4 +426,81 @@ ${expr "" v}
abort "generators.toDhall: cannot convert a null to Dhall"
else
builtins.toJSON v;
+
+ /*
+ Translate a simple Nix expression to Lua representation with occasional
+ Lua-inlines that can be construted by mkLuaInline function.
+
+ Configuration:
+ * multiline - by default is true which results in indented block-like view.
+ * indent - initial indent.
+
+ Attention:
+ Regardless of multiline parameter there is no trailing newline.
+
+ Example:
+ generators.toLua {}
+ {
+ cmd = [ "typescript-language-server" "--stdio" ];
+ settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)'';
+ }
+ ->
+ {
+ ["cmd"] = {
+ "typescript-language-server",
+ "--stdio"
+ },
+ ["settings"] = {
+ ["workspace"] = {
+ ["library"] = (vim.api.nvim_get_runtime_file("", true))
+ }
+ }
+ }
+
+ Type:
+ toLua :: AttrSet -> Any -> String
+ */
+ toLua = {
+ /* If this option is true, the output is indented with newlines for attribute sets and lists */
+ multiline ? true,
+ /* Initial indentation level */
+ indent ? ""
+ }@args: v:
+ with builtins;
+ let
+ innerIndent = "${indent} ";
+ introSpace = if multiline then "\n${innerIndent}" else " ";
+ outroSpace = if multiline then "\n${indent}" else " ";
+ innerArgs = args // { indent = innerIndent; };
+ concatItems = concatStringsSep ",${introSpace}";
+ isLuaInline = { _type ? null, ... }: _type == "lua-inline";
+ in
+ if v == null then
+ "nil"
+ else if isInt v || isFloat v || isString v || isBool v then
+ builtins.toJSON v
+ else if isList v then
+ (if v == [ ] then "{}" else
+ "{${introSpace}${concatItems (map (value: "${toLua innerArgs value}") v)}${outroSpace}}")
+ else if isAttrs v then
+ (
+ if isLuaInline v then
+ "(${v.expr})"
+ else if v == { } then
+ "{}"
+ else
+ "{${introSpace}${concatItems (
+ lib.attrsets.mapAttrsToList (key: value: "[${builtins.toJSON key}] = ${toLua innerArgs value}") v
+ )}${outroSpace}}"
+ )
+ else
+ abort "generators.toLua: type ${typeOf v} is unsupported";
+
+ /*
+ Mark string as Lua expression to be inlined when processed by toLua.
+
+ Type:
+ mkLuaInline :: String -> AttrSet
+ */
+ mkLuaInline = expr: { _type = "lua-inline"; inherit expr; };
}
diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix
index 7e6fa5ecfb..85e24e08d3 100644
--- a/third_party/nixpkgs/lib/systems/default.nix
+++ b/third_party/nixpkgs/lib/systems/default.nix
@@ -136,6 +136,7 @@ rec {
else if final.isPower then "powerpc"
else if final.isRiscV then "riscv"
else if final.isS390 then "s390"
+ else if final.isLoongArch64 then "loongarch"
else final.parsed.cpu.name;
qemuArch =
@@ -185,6 +186,7 @@ rec {
pulseSupport = false;
smbdSupport = false;
seccompSupport = false;
+ enableDocs = false;
hostCpuTargets = [ "${final.qemuArch}-linux-user" ];
};
wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal;
diff --git a/third_party/nixpkgs/lib/systems/doubles.nix b/third_party/nixpkgs/lib/systems/doubles.nix
index 6b19309d11..6d2f015674 100644
--- a/third_party/nixpkgs/lib/systems/doubles.nix
+++ b/third_party/nixpkgs/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ let
# Linux
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
- "armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux"
+ "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux"
"microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"
"s390x-linux" "x86_64-linux"
@@ -86,6 +86,7 @@ in {
m68k = filterDoubles predicates.isM68k;
s390 = filterDoubles predicates.isS390;
s390x = filterDoubles predicates.isS390x;
+ loongarch64 = filterDoubles predicates.isLoongArch64;
js = filterDoubles predicates.isJavaScript;
bigEndian = filterDoubles predicates.isBigEndian;
diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix
index 9ea2e3b56e..3ae5d6ffd4 100644
--- a/third_party/nixpkgs/lib/systems/examples.nix
+++ b/third_party/nixpkgs/lib/systems/examples.nix
@@ -90,6 +90,10 @@ rec {
config = "mipsel-unknown-linux-gnu";
} // platforms.fuloong2f_n32;
+ loongarch64-linux = {
+ config = "loongarch64-unknown-linux-gnu";
+ };
+
# can execute on 32bit chip
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix
index b32c863010..89e9f4231d 100644
--- a/third_party/nixpkgs/lib/systems/inspect.nix
+++ b/third_party/nixpkgs/lib/systems/inspect.nix
@@ -9,6 +9,14 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis
rec {
# these patterns are to be matched against {host,build,target}Platform.parsed
patterns = rec {
+ # The patterns below are lists in sum-of-products form.
+ #
+ # Each attribute is list of product conditions; non-list values are treated
+ # as a singleton list. If *any* product condition in the list matches then
+ # the predicate matches. Each product condition is tested by
+ # `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of
+ # the product.
+
isi686 = { cpu = cpuTypes.i686; };
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
@@ -49,6 +57,7 @@ rec {
isM68k = { cpu = { family = "m68k"; }; };
isS390 = { cpu = { family = "s390"; }; };
isS390x = { cpu = { family = "s390"; bits = 64; }; };
+ isLoongArch64 = { cpu = { family = "loongarch"; bits = 64; }; };
isJavaScript = { cpu = cpuTypes.javascript; };
is32bit = { cpu = { bits = 32; }; };
diff --git a/third_party/nixpkgs/lib/systems/parse.nix b/third_party/nixpkgs/lib/systems/parse.nix
index bd3366e140..ea8e1ff8fc 100644
--- a/third_party/nixpkgs/lib/systems/parse.nix
+++ b/third_party/nixpkgs/lib/systems/parse.nix
@@ -131,6 +131,8 @@ rec {
or1k = { bits = 32; significantByte = bigEndian; family = "or1k"; };
+ loongarch64 = { bits = 64; significantByte = littleEndian; family = "loongarch"; };
+
javascript = { bits = 32; significantByte = littleEndian; family = "javascript"; };
};
diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix
index baa382f3e5..49336b8b96 100644
--- a/third_party/nixpkgs/lib/tests/misc.nix
+++ b/third_party/nixpkgs/lib/tests/misc.nix
@@ -915,6 +915,72 @@ runTests {
};
+ testToLuaEmptyAttrSet = {
+ expr = generators.toLua {} {};
+ expected = ''{}'';
+ };
+
+ testToLuaEmptyList = {
+ expr = generators.toLua {} [];
+ expected = ''{}'';
+ };
+
+ testToLuaListOfVariousTypes = {
+ expr = generators.toLua {} [ null 43 3.14159 true ];
+ expected = ''
+ {
+ nil,
+ 43,
+ 3.14159,
+ true
+ }'';
+ };
+
+ testToLuaString = {
+ expr = generators.toLua {} ''double-quote (") and single quotes (')'';
+ expected = ''"double-quote (\") and single quotes (')"'';
+ };
+
+ testToLuaAttrsetWithLuaInline = {
+ expr = generators.toLua {} { x = generators.mkLuaInline ''"abc" .. "def"''; };
+ expected = ''
+ {
+ ["x"] = ("abc" .. "def")
+ }'';
+ };
+
+ testToLuaAttrsetWithSpaceInKey = {
+ expr = generators.toLua {} { "some space and double-quote (\")" = 42; };
+ expected = ''
+ {
+ ["some space and double-quote (\")"] = 42
+ }'';
+ };
+
+ testToLuaWithoutMultiline = {
+ expr = generators.toLua { multiline = false; } [ 41 43 ];
+ expected = ''{ 41, 43 }'';
+ };
+
+ testToLuaBasicExample = {
+ expr = generators.toLua {} {
+ cmd = [ "typescript-language-server" "--stdio" ];
+ settings.workspace.library = generators.mkLuaInline ''vim.api.nvim_get_runtime_file("", true)'';
+ };
+ expected = ''
+ {
+ ["cmd"] = {
+ "typescript-language-server",
+ "--stdio"
+ },
+ ["settings"] = {
+ ["workspace"] = {
+ ["library"] = (vim.api.nvim_get_runtime_file("", true))
+ }
+ }
+ }'';
+ };
+
# CLI
testToGNUCommandLine = {
diff --git a/third_party/nixpkgs/lib/tests/systems.nix b/third_party/nixpkgs/lib/tests/systems.nix
index 88e2e4206d..792aa94f33 100644
--- a/third_party/nixpkgs/lib/tests/systems.nix
+++ b/third_party/nixpkgs/lib/tests/systems.nix
@@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests {
testredox = mseteq redox [ "x86_64-redox" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];
- testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ];
+ testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ];
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 05bb679373..9ff9657229 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -101,6 +101,13 @@
github = "0xd61";
githubId = 8351869;
};
+ _0xMRTT = {
+ email = "0xMRTT@proton.me";
+ name = "0xMRTT";
+ github = "0xMRTT";
+ githubId = 105598867;
+ matrix = "@0xmrtt:envs.net";
+ };
_1000101 = {
email = "b1000101@pm.me";
github = "1000101";
@@ -1054,6 +1061,16 @@
githubId = 1342360;
name = "Andrew Morgan";
};
+ anpin = {
+ email = "pavel@anpin.fyi";
+ github = "anpin";
+ githubId = 6060545;
+ matrix = "@anpin:matrix.org";
+ name = "Pavel Anpin";
+ keys = [{
+ fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407";
+ }];
+ };
anpryl = {
email = "anpryl@gmail.com";
github = "anpryl";
@@ -1124,6 +1141,16 @@
githubId = 73002165;
name = "apfelkuchen6";
};
+ aplund = {
+ email = "austin.lund@gmail.com";
+ matrix = "@aplund:matrix.org";
+ github = "aplund";
+ githubId = 1369436;
+ name = "Austin Lund";
+ keys = [{
+ fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE";
+ }];
+ };
applePrincess = {
email = "appleprincess@appleprincess.io";
github = "applePrincess";
@@ -3287,9 +3314,12 @@
}];
};
cyntheticfox = {
- email = "houstdav000@gmail.com";
+ email = "cyntheticfox@gh0st.sh";
github = "cyntheticfox";
githubId = 17628961;
+ keys = [{
+ fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821";
+ }];
matrix = "@houstdav000:gh0st.ems.host";
name = "Cynthia Fox";
};
@@ -3508,10 +3538,16 @@
};
davidcromp = {
email = "davidcrompton1192@gmail.com";
- github = "DavidCromp";
+ github = "CyborgPotato";
githubId = 10701143;
name = "David Crompton";
};
+ david-hamelin = {
+ email = "david.hamelin@outlook.fr";
+ github = "HamelinDavid";
+ githubId = 118536343;
+ name = "David Hamelin";
+ };
davidrusu = {
email = "davidrusu.me@gmail.com";
github = "davidrusu";
@@ -3533,6 +3569,12 @@
fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154";
}];
};
+ davisrichard437 = {
+ email = "davisrichard437@gmail.com";
+ github = "davisrichard437";
+ githubId = 85075437;
+ name = "Richard Davis";
+ };
davorb = {
email = "davor@davor.se";
github = "davorb";
@@ -4143,6 +4185,16 @@
githubId = 1931963;
name = "David Sferruzza";
};
+ dsuetin = {
+ name = "Danil Suetin";
+ email = "suetin085@gmail.com";
+ matrix = "@dani0854:matrix.org";
+ github = "dani0854";
+ githubId = 32674935;
+ keys = [{
+ fingerprint = "6CC2 D713 6703 0D86 CA29 C71F 23B5 AA6F A374 F2FE";
+ }];
+ };
dsymbol = {
name = "dsymbol";
github = "dsymbol";
@@ -4482,6 +4534,7 @@
};
elvishjerricco = {
email = "elvishjerricco@gmail.com";
+ matrix = "@elvishjerricco:matrix.org";
github = "ElvishJerricco";
githubId = 1365692;
name = "Will Fancher";
@@ -4806,7 +4859,7 @@
name = "Eric Evenchick";
};
evenbrenden = {
- email = "evenbrenden@gmail.com";
+ email = "packages@anythingexternal.com";
github = "evenbrenden";
githubId = 2512008;
name = "Even Brenden";
@@ -5096,6 +5149,12 @@
github = "fkautz";
githubId = 135706;
};
+ FlafyDev = {
+ name = "Flafy Arazi";
+ email = "flafyarazi@gmail.com";
+ github = "FlafyDev";
+ githubId = 44374434;
+ };
Flakebi = {
email = "flakebi@t-online.de";
github = "Flakebi";
@@ -5118,6 +5177,13 @@
githubId = 66178592;
name = "Pavel Zolotarevskiy";
};
+ flexiondotorg = {
+ name = "Martin Wimpress";
+ email = "martin@wimpress.org";
+ matrix = "@wimpress:matrix.org";
+ github = "flexiondotorg";
+ githubId = 304639;
+ };
fliegendewurst = {
email = "arne.keller@posteo.de";
github = "FliegendeWurst";
@@ -5463,6 +5529,11 @@
githubId = 2430469;
name = "Gavin Rogers";
};
+ gaykitty = {
+ github = "gaykitty";
+ githubId = 126119280;
+ name = "Kitty Pride";
+ };
gazally = {
email = "gazally@runbox.com";
github = "gazally";
@@ -5542,6 +5613,12 @@
fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4";
}];
};
+ geri1701 = {
+ email = "geri@sdf.org";
+ github = "geri1701";
+ githubId = 67984144;
+ name = "Gerhard Schwanzer";
+ };
gerschtli = {
email = "tobias.happ@gmx.de";
github = "Gerschtli";
@@ -5901,6 +5978,12 @@
fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC";
}];
};
+ hacker1024 = {
+ name = "hacker1024";
+ email = "hacker1024@users.sourceforge.net";
+ github = "hacker1024";
+ githubId = 20849728;
+ };
hagl = {
email = "harald@glie.be";
github = "hagl";
@@ -6062,6 +6145,12 @@
githubId = 2405974;
name = "Sébastian Méric de Bellefon";
};
+ hellwolf = {
+ email = "zhicheng.miao@gmail.com";
+ github = "hellwolf";
+ githubId = 186660;
+ name = "Miao, ZhiCheng";
+ };
henkery = {
email = "jim@reupload.nl";
github = "henkery";
@@ -6264,6 +6353,12 @@
githubId = 53281855;
name = "hqurve";
};
+ hraban = {
+ email = "hraban@0brg.net";
+ github = "hraban";
+ githubId = 137852;
+ name = "Hraban Luyat";
+ };
hrdinka = {
email = "c.nix@hrdinka.at";
github = "hrdinka";
@@ -6634,6 +6729,12 @@
githubId = 54999;
name = "Ariel Nunez";
};
+ ionutnechita = {
+ email = "ionut_n2001@yahoo.com";
+ github = "ionutnechita";
+ githubId = 9405900;
+ name = "Ionut Nechita";
+ };
iopq = {
email = "iop_jr@yahoo.com";
github = "iopq";
@@ -6701,6 +6802,12 @@
fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F";
}];
};
+ ivanmoreau = {
+ email = "Iván Molina Rebolledo";
+ github = "ivanmoreau";
+ githubId = 10843250;
+ name = "ivan@ivmoreau.com";
+ };
ivan-timokhin = {
email = "nixpkgs@ivan.timokhin.name";
name = "Ivan Timokhin";
@@ -6874,6 +6981,12 @@
githubId = 6874204;
name = "Jason Carr";
};
+ jasonodoom = {
+ email = "jasonodoom@riseup.net";
+ github = "jasonodoom";
+ githubId = 6789916;
+ name = "Jason Odoom";
+ };
javaguirre = {
email = "contacto@javaguirre.net";
github = "javaguirre";
@@ -8090,6 +8203,12 @@
githubId = 843652;
name = "Kim Burgess";
};
+ kindrowboat = {
+ email = "hello@kindrobot.ca";
+ github = "kindrowboat";
+ githubId = 777773;
+ name = "Stef Dunlap";
+ };
kini = {
email = "keshav.kini@gmail.com";
github = "kini";
@@ -8121,6 +8240,11 @@
githubId = 12160;
name = "Kirill Radzikhovskyy";
};
+ kiskae = {
+ github = "Kiskae";
+ githubId = 546681;
+ name = "Jeroen van Leusen";
+ };
kisonecat = {
email = "kisonecat@gmail.com";
github = "kisonecat";
@@ -8339,7 +8463,7 @@
};
kristian-brucaj = {
email = "kbrucaj@gmail.com";
- github = "Kristian-Brucaj";
+ github = "Flameslice";
githubId = 8893110;
name = "Kristian Brucaj";
};
@@ -8415,6 +8539,12 @@
githubId = 2422454;
name = "Kai Wohlfahrt";
};
+ kylehendricks = {
+ name = "Kyle Hendricks";
+ email = "kyle-github@mail.hendricks.nu";
+ github = "kylehendricks";
+ githubId = 981958;
+ };
kyleondy = {
email = "kyle@ondy.org";
github = "KyleOndy";
@@ -8747,6 +8877,12 @@
githubId = 3696783;
name = "Leroy Hopson";
};
+ lillycham = {
+ email = "lillycat332@gmail.com";
+ github = "lillycat332";
+ githubId = 54189319;
+ name = "Lilly Cham";
+ };
lilyball = {
email = "lily@sb.org";
github = "lilyball";
@@ -9161,6 +9297,13 @@
githubId = 2057309;
name = "Sergey Sofeychuk";
};
+ lx = {
+ email = "alex@adnab.me";
+ github = "Alexis211";
+ githubId = 101484;
+ matrix = "@lx:deuxfleurs.fr";
+ name = "Alex Auvolat";
+ };
lxea = {
email = "nix@amk.ie";
github = "lxea";
@@ -9493,7 +9636,7 @@
mateodd25 = {
email = "mateodd@icloud.com";
github = "mateodd25";
- githubId = 854770;
+ githubId = 7878181;
name = "Mateo Diaz";
};
math-42 = {
@@ -10504,6 +10647,12 @@
githubId = 133448;
name = "Mikołaj Siedlarek";
};
+ mslingsby = {
+ email = "morten.slingsby@eviny.no";
+ github = "MortenSlingsby";
+ githubId = 111859550;
+ name = "Morten Slingsby";
+ };
msm = {
email = "msm@tailcall.net";
github = "msm-code";
@@ -10794,6 +10943,12 @@
githubId = 137805;
name = "Alexander Tsvyashchenko";
};
+ ne9z = {
+ email = "yuchen@apvc.uk";
+ github = "ne9z";
+ githubId = 77314501;
+ name = "Maurice Zhou";
+ };
nebulka = {
email = "arapun@proton.me";
github = "nebulka1";
@@ -10889,6 +11044,16 @@
githubId = 34162313;
name = "Jason Wing";
};
+ netfox = {
+ name = "netfox";
+ email = "say-hi@netfox.rip";
+ matrix = "@netfox:catgirl.cloud";
+ github = "0xnetfox";
+ githubId = 97521402;
+ keys = [{
+ fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7";
+ }];
+ };
netixx = {
email = "dev.espinetfrancois@gmail.com";
github = "netixx";
@@ -11183,6 +11348,12 @@
githubId = 3521180;
name = "Tom Sydney Kerckhove";
};
+ NotAShelf = {
+ name = "NotAShelf";
+ email = "itsashelf@gmail.com";
+ github = "NotAShelf";
+ githubId = 62766066;
+ };
notbandali = {
name = "Amin Bandali";
email = "bandali@gnu.org";
@@ -11374,6 +11545,15 @@
fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F";
}];
};
+ oddlama = {
+ email = "oddlama@oddlama.org";
+ github = "oddlama";
+ githubId = 31919558;
+ name = "oddlama";
+ keys = [{
+ fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A";
+ }];
+ };
odi = {
email = "oliver.dunkl@gmail.com";
github = "odi";
@@ -11450,6 +11630,12 @@
githubId = 1538622;
name = "Michael Reilly";
};
+ onedragon = {
+ name = "YiLong Liu";
+ email = "18922251299@163.com";
+ github = "jackyliu16";
+ githubId = 50787361;
+ };
onixie = {
email = "onixie@gmail.com";
github = "onixie";
@@ -11652,6 +11838,12 @@
githubId = 11016164;
name = "Fedor Pakhomov";
};
+ pallix = {
+ email = "pierre.allix.work@gmail.com";
+ github = "pallix";
+ githubId = 676838;
+ name = "Pierre Allix";
+ };
paluh = {
email = "paluho@gmail.com";
github = "paluh";
@@ -11788,6 +11980,16 @@
githubId = 26949935;
name = "Pierce Bartine";
};
+ pbek = {
+ email = "patrizio@bekerle.com";
+ matrix = "@patrizio:bekerle.com";
+ github = "pbek";
+ githubId = 1798101;
+ name = "Patrizio Bekerle";
+ keys = [{
+ fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC";
+ }];
+ };
pblkt = {
email = "pebblekite@gmail.com";
github = "pblkt";
@@ -11830,6 +12032,12 @@
githubId = 920910;
name = "peelz";
};
+ pelme = {
+ email = "andreas@pelme.se";
+ github = "pelme";
+ githubId = 20529;
+ name = "Andreas Pelme";
+ };
penalty1083 = {
email = "penalty1083@outlook.com";
github = "penalty1083";
@@ -12533,6 +12741,12 @@
githubId = 4579165;
name = "Danny Bautista";
};
+ pyxels = {
+ email = "pyxels.dev@gmail.com";
+ github = "Pyxels";
+ githubId = 39232833;
+ name = "Jonas";
+ };
q3k = {
email = "q3k@q3k.org";
github = "q3k";
@@ -12549,6 +12763,12 @@
fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
}];
};
+ qjoly = {
+ email = "github@thoughtless.eu";
+ github = "qjoly";
+ githubId = 82603435;
+ name = "Quentin JOLY";
+ };
qknight = {
email = "js@lastlog.de";
github = "qknight";
@@ -12580,6 +12800,15 @@
githubId = 1024891;
name = "Jens Nolte";
};
+ quentin = {
+ email = "quentin@mit.edu";
+ github = "quentinmit";
+ githubId = 115761;
+ name = "Quentin Smith";
+ keys = [{
+ fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697";
+ }];
+ };
quentini = {
email = "quentini@airmail.cc";
github = "QuentinI";
@@ -12674,6 +12903,13 @@
githubId = 14829269;
name = "Ram Kromberg";
};
+ rampoina = {
+ email = "rampoina@protonmail.com";
+ matrix = "@rampoina:matrix.org";
+ github = "Rampoina";
+ githubId = 5653911;
+ name = "Rampoina";
+ };
ranfdev = {
email = "ranfdev@gmail.com";
name = "Lorenzo Miglietta";
@@ -12944,6 +13180,12 @@
github = "ribose-jeffreylau";
githubId = 2649467;
};
+ ricarch97 = {
+ email = "ricardo.steijn97@gmail.com";
+ github = "RicArch97";
+ githubId = 61013287;
+ name = "Ricardo Steijn";
+ };
richardipsum = {
email = "richardipsum@fastmail.co.uk";
github = "richardipsum";
@@ -14215,7 +14457,7 @@
name = "Smitty van Bodegom";
email = "me@smitop.com";
matrix = "@smitop:kde.org";
- github = "Smittyvb";
+ github = "syvb";
githubId = 10530973;
};
sna = {
@@ -14608,10 +14850,12 @@
name = "Stijn DW";
};
StillerHarpo = {
- email = "florianengel39@gmail.com";
+ email = "engelflorian@posteo.de";
github = "StillerHarpo";
githubId = 25526706;
name = "Florian Engel";
+ keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }];
+ matrix = "@qe7ftcyrpg:matrix.org";
};
stites = {
email = "sam@stites.io";
@@ -14698,6 +14942,12 @@
githubId = 187109;
name = "Bjarki Ágúst Guðmundsson";
};
+ surfaceflinger = {
+ email = "nat@nekopon.pl";
+ github = "surfaceflinger";
+ githubId = 44725111;
+ name = "nat";
+ };
suryasr007 = {
email = "94suryateja@gmail.com";
github = "suryasr007";
@@ -15027,6 +15277,12 @@
githubId = 1755789;
name = "Robert Irelan";
};
+ tennox = {
+ email = "tennox+nix@txlab.io";
+ github = "tennox";
+ githubId = 2084639;
+ name = "Manu";
+ };
teozkr = {
email = "teo@nullable.se";
github = "nightkr";
@@ -17175,7 +17431,7 @@
zseri = {
name = "zseri";
email = "zseri.devel@ytrizja.de";
- github = "zseri";
+ github = "fogti";
githubId = 1618343;
keys = [{
fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D";
diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh b/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
index 9e6ebafacc..044151305e 100755
--- a/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
+++ b/third_party/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh
@@ -112,6 +112,8 @@ The short version is this:
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
+More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell).
+
---
This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.
diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
index 4acb76233c..4fee433084 100755
--- a/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
+++ b/third_party/nixpkgs/maintainers/scripts/haskell/update-stackage.sh
@@ -58,6 +58,7 @@ sed -r \
-e '/ distribution-nixpkgs /d' \
-e '/ jailbreak-cabal /d' \
-e '/ language-nix /d' \
+ -e '/ hackage-db /d' \
-e '/ cabal-install /d' \
-e '/ lsp /d' \
-e '/ lsp-types /d' \
diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
index 8c39d289f7..86fecbc3d8 100755
--- a/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
+++ b/third_party/nixpkgs/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
@@ -15,8 +15,29 @@
# password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.)
# Those fields are specified under `upload` on the `cabal` man page.
+if test -z "$CABAL_DIR"; then
+ dirs=(
+ "$HOME/.cabal"
+ "${XDG_CONFIG_HOME:-$HOME/.config}/cabal"
+ )
+ missing=true
+
+ for dir in "${dirs[@]}"; do
+ if test -d "$dir"; then
+ export CABAL_DIR="$dir"
+ missing=false
+ break
+ fi
+ done
+
+ if $missing; then
+ echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2
+ exit 101
+ fi
+fi
+
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
-username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")
-password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")
+username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
+password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //")
curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv
echo
diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
index 514a967009..e93ceeebc9 100644
--- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
@@ -40,6 +40,7 @@ lrexlib-pcre,,,,,,vyp
lrexlib-posix,,,,,,
lua-cjson,,,,,,
lua-cmsgpack,,,,,,
+lua-curl,,,,,,
lua-iconv,,,,,,
lua-lsp,,,,,,
lua-messagepack,,,,,,
diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
index 3341fea291..7c6cfd4fed 100644
--- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
+++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
@@ -1,4 +1,7 @@
-# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py
+# python library used to update plugins:
+# - pkgs/applications/editors/vim/plugins/update.py
+# - pkgs/applications/editors/kakoune/plugins/update.py
+# - maintainers/scripts/update-luarocks-packages
# format:
# $ nix run nixpkgs.python3Packages.black -c black update.py
@@ -315,10 +318,10 @@ def run_nix_expr(expr):
with CleanEnvironment():
cmd = ["nix", "eval", "--extra-experimental-features",
"nix-command", "--impure", "--json", "--expr", expr]
- log.debug("Running command %s", cmd)
+ log.debug("Running command %s", " ".join(cmd))
out = subprocess.check_output(cmd)
- data = json.loads(out)
- return data
+ data = json.loads(out)
+ return data
class Editor:
@@ -344,12 +347,39 @@ class Editor:
self.cache_file = cache_file or f"{name}-plugin-cache.json"
self.nixpkgs_repo = None
+ def add(self, args):
+ '''CSV spec'''
+ log.debug("called the 'add' command")
+ fetch_config = FetchConfig(args.proc, args.github_token)
+ editor = self
+ for plugin_line in args.add_plugins:
+ log.debug("using plugin_line", plugin_line)
+ pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
+ log.debug("loaded as pdesc", pdesc)
+ append = [ pdesc ]
+ editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append)
+ plugin, _ = prefetch_plugin(pdesc, )
+ autocommit = not args.no_commit
+ if autocommit:
+ commit(
+ editor.nixpkgs_repo,
+ "{drv_name}: init at {version}".format(
+ drv_name=editor.get_drv_name(plugin.normalized_name),
+ version=plugin.version
+ ),
+ [args.outfile, args.input_file],
+ )
+
+ # Expects arguments generated by 'update' subparser
+ def update(self, args ):
+ '''CSV spec'''
+ print("the update member function should be overriden in subclasses")
+
def get_current_plugins(self) -> List[Plugin]:
"""To fill the cache"""
data = run_nix_expr(self.get_plugins)
plugins = []
for name, attr in data.items():
- print("get_current_plugins: name %s" % name)
p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
plugins.append(p)
return plugins
@@ -358,7 +388,7 @@ class Editor:
'''CSV spec'''
return load_plugins_from_csv(config, plugin_file)
- def generate_nix(self, plugins, outfile: str):
+ def generate_nix(self, _plugins, _outfile: str):
'''Returns nothing for now, writes directly to outfile'''
raise NotImplementedError()
@@ -395,34 +425,28 @@ class Editor:
return rewrite_input(*args, **kwargs)
def create_parser(self):
- parser = argparse.ArgumentParser(
+ common = argparse.ArgumentParser(
+ add_help=False,
description=(f"""
Updates nix derivations for {self.name} plugins.\n
By default from {self.default_in} to {self.default_out}"""
)
)
- parser.add_argument(
- "--add",
- dest="add_plugins",
- default=[],
- action="append",
- help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo",
- )
- parser.add_argument(
+ common.add_argument(
"--input-names",
"-i",
dest="input_file",
default=self.default_in,
help="A list of plugins in the form owner/repo",
)
- parser.add_argument(
+ common.add_argument(
"--out",
"-o",
dest="outfile",
default=self.default_out,
help="Filename to save generated nix code",
)
- parser.add_argument(
+ common.add_argument(
"--proc",
"-p",
dest="proc",
@@ -430,7 +454,7 @@ class Editor:
default=30,
help="Number of concurrent processes to spawn. Setting --github-token allows higher values.",
)
- parser.add_argument(
+ common.add_argument(
"--github-token",
"-t",
type=str,
@@ -438,16 +462,61 @@ class Editor:
help="""Allows to set --proc to higher values.
Uses GITHUB_API_TOKEN environment variables as the default value.""",
)
- parser.add_argument(
+ common.add_argument(
"--no-commit", "-n", action="store_true", default=False,
help="Whether to autocommit changes"
)
- parser.add_argument(
+ common.add_argument(
"--debug", "-d", choices=LOG_LEVELS.keys(),
default=logging.getLevelName(logging.WARN),
help="Adjust log level"
)
- return parser
+
+ main = argparse.ArgumentParser(
+ parents=[common],
+ description=(f"""
+ Updates nix derivations for {self.name} plugins.\n
+ By default from {self.default_in} to {self.default_out}"""
+ )
+ )
+
+ subparsers = main.add_subparsers(dest="command", required=False)
+ padd = subparsers.add_parser(
+ "add", parents=[],
+ description="Add new plugin",
+ add_help=False,
+ )
+ padd.set_defaults(func=self.add)
+ padd.add_argument(
+ "add_plugins",
+ default=None,
+ nargs="+",
+ help=f"Plugin to add to {self.attr_path} from Github in the form owner/repo",
+ )
+
+ pupdate = subparsers.add_parser(
+ "update",
+ description="Update all or a subset of existing plugins",
+ add_help=False,
+ )
+ pupdate.set_defaults(func=self.update)
+ return main
+
+ def run(self,):
+ '''
+ Convenience function
+ '''
+ parser = self.create_parser()
+ args = parser.parse_args()
+ command = args.command or "update"
+ log.setLevel(LOG_LEVELS[args.debug])
+ log.info("Chose to run command: %s", command)
+
+ if not args.no_commit:
+ self.nixpkgs_repo = git.Repo(self.root, search_parent_directories=True)
+
+ getattr(self, command)(args)
+
@@ -661,7 +730,6 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
def update_plugins(editor: Editor, args):
"""The main entry function of this module. All input arguments are grouped in the `Editor`."""
- log.setLevel(LOG_LEVELS[args.debug])
log.info("Start updating plugins")
fetch_config = FetchConfig(args.proc, args.github_token)
update = editor.get_update(args.input_file, args.outfile, fetch_config)
@@ -684,18 +752,3 @@ def update_plugins(editor: Editor, args):
[args.outfile, args.input_file, editor.deprecated],
)
- for plugin_line in args.add_plugins:
- pdesc = PluginDesc.load_from_string(fetch_config, plugin_line)
- append = [ pdesc ]
- editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=append)
- update()
- plugin, _ = prefetch_plugin(pdesc, )
- if autocommit:
- commit(
- editor.nixpkgs_repo,
- "{drv_name}: init at {version}".format(
- drv_name=editor.get_drv_name(plugin.normalized_name),
- version=plugin.version
- ),
- [args.outfile, args.input_file],
- )
diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
index f34aa53626..791cd8a1d8 100755
--- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
+++ b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages
@@ -26,7 +26,8 @@ log = logging.getLogger()
log.addHandler(logging.StreamHandler())
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore
-from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
+import pluginupdate
+from pluginupdate import update_plugins, FetchConfig, CleanEnvironment
PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
@@ -70,7 +71,7 @@ class LuaPlugin:
return self.name.replace(".", "-")
# rename Editor to LangUpdate/ EcosystemUpdater
-class LuaEditor(Editor):
+class LuaEditor(pluginupdate.Editor):
def get_current_plugins(self):
return []
@@ -87,6 +88,9 @@ class LuaEditor(Editor):
luaPackages.append(plugin)
return luaPackages
+ def update(self, args):
+ update_plugins(self, args)
+
def generate_nix(
self,
results: List[Tuple[LuaPlugin, str]],
@@ -203,11 +207,7 @@ def main():
default_out = ROOT.joinpath(GENERATED_NIXFILE)
)
- parser = editor.create_parser()
- args = parser.parse_args()
-
- update_plugins(editor, args)
-
+ editor.run()
if __name__ == "__main__":
diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 34f4576054..88dbdd4dfc 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -431,6 +431,7 @@ with lib.maintainers; {
lukego
nagy
uthar
+ hraban
];
githubTeams = [
"lisp"
diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md
index 9219396722..89d3295506 100644
--- a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md
@@ -94,6 +94,6 @@ environment.systemPackages = [ pkgs.appimage-run ];
Then instead of running the AppImage "as-is", run `appimage-run foo.appimage`.
To make other pre-built executables work on NixOS, you need to package them
-with Nix and special helpers like `autoPatchelfHook` or `buildFHSUserEnv`. See
+with Nix and special helpers like `autoPatchelfHook` or `buildFHSEnv`. See
the [Nixpkgs manual](https://nixos.org/nixpkgs/manual) for details. This
is complex and often doing a source build is easier.
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
index dce3b35900..e73be3773c 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -147,7 +147,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](#opt-services.rstudio-server.enable).
-- [rtsp-simple-server](https://github.com/aler9/rtsp-simple-server), ready-to-use RTSP / RTMP / HLS server and proxy that allows to read, publish and proxy video and audio streams. Available as [services.rtsp-simple-server](#opt-services.rtsp-simple-server.enable).
+- [mediamtx](https://github.com/aler9/mediamtx), ready-to-use RTSP / RTMP / HLS server and proxy that allows to read, publish and proxy video and audio streams. Available as [services.mediamtx](#opt-services.mediamtx.enable).
- [Snipe-IT](https://snipeitapp.com), a free open source IT asset/license management system. Available as [services.snipe-it](#opt-services.snipe-it.enable).
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
index 8c8a815196..c86e95caf3 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `libxcrypt`, the library providing the `crypt(3)` password hashing function, is now built without support for algorithms not flagged [`strong`](https://github.com/besser82/libxcrypt/blob/v4.4.33/lib/hashes.conf#L48). This affects the availability of password hashing algorithms used for system login (`login(1)`, `passwd(1)`), but also Apache2 Basic-Auth, Samba, OpenLDAP, Dovecot, and [many other packages](https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20libxcrypt&type=code).
+- `boot.bootspec.enable` (internal option) is now enabled by default because [RFC-0125](https://github.com/NixOS/rfcs/pull/125) was merged. This means you will have a bootspec document called `boot.json` generated for each system and specialisation in the top-level. This is useful to enable advanced boot usecases in NixOS such as SecureBoot.
+
## New Services {#sec-release-23.05-new-services}
@@ -40,6 +42,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [cups-pdf-to-pdf](https://github.com/alexivkin/CUPS-PDF-to-PDF), a pdf-generating cups backend based on [cups-pdf](https://www.cups-pdf.de/). Available as [services.printing.cups-pdf](#opt-services.printing.cups-pdf.enable).
+- [clash-verge](https://github.com/zzzgydi/clash-verge), A Clash GUI based on tauri. Available as [programs.clash-verge](#opt-programs.clash-verge.enable).
+
- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable).
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
@@ -61,6 +65,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [opensearch](https://opensearch.org), a search server alternative to Elasticsearch. Available as [services.opensearch](options.html#opt-services.opensearch.enable).
+- [monica](https://www.monicahq.com), an open source personal CRM. Available as [services.monica](options.html#opt-services.monica.enable).
+
- [authelia](https://www.authelia.com/), is an open-source authentication and authorization server. Available under [services.authelia](options.html#opt-services.authelia.enable).
- [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable).
@@ -71,6 +77,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).
+- [esphome](https://esphome.io), a dashboard to configure ESP8266/ESP32 devices for use with Home Automation systems. Available as [services.esphome](#opt-services.esphome.enable).
+
- [networkd-dispatcher](https://gitlab.com/craftyguy/networkd-dispatcher), a dispatcher service for systemd-networkd connection status changes. Available as [services.networkd-dispatcher](#opt-services.networkd-dispatcher.enable).
- [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable).
@@ -85,8 +93,12 @@ In addition to numerous new and upgraded packages, this release has the followin
- [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable).
+- [PufferPanel](https://pufferpanel.com), game server management panel designed to be easy to use. Available as [services.pufferpanel](#opt-services.pufferpanel.enable).
+
- [jellyseerr](https://github.com/Fallenbagel/jellyseerr), a web-based requests manager for Jellyfin, forked from Overseerr. Available as [services.jellyseerr](#opt-services.jellyseerr.enable).
+- [stargazer](https://sr.ht/~zethra/stargazer/), a fast and easy to use Gemini server. Available as [services.stargazer](#opt-services.stargazer.enable).
+
- [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable).
- [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable).
@@ -99,6 +111,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [trurl](https://github.com/curl/trurl), a command line tool for URL parsing and manipulation.
+- [wgautomesh](https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh), a simple utility to help connect wireguard nodes together in a full mesh topology. Available as [services.wgautomesh](options.html#opt-services.wgautomesh.enable).
+
- [woodpecker-agents](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-agents](#opt-services.woodpecker-agents.agents._name_.enable).
- [woodpecker-server](https://woodpecker-ci.org/), a simple CI engine with great extensibility. Available as [services.woodpecker-server](#opt-services.woodpecker-server.enable).
@@ -109,6 +123,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [hardware.ipu6](#opt-hardware.ipu6.enable) adds support for ipu6 based webcams on intel tiger lake and alder lake.
+- [ivpn](https://www.ivpn.net/), a secure, private VPN with fast WireGuard connections. Available as [services.ivpn](#opt-services.ivpn.enable).
+
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
@@ -123,6 +139,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes`
+- The `ssh` module does not read `/etc/ssh/ssh_known_hosts2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).
+
+- The openssh module does not read `~/.ssh/authorized_keys2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).
+
- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
@@ -131,7 +151,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative.
-- The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
+- The [services.kubo.settings](#opt-services.kubo.settings) option is now no longer stateful. If you changed any of the options in [services.kubo.settings](#opt-services.kubo.settings) in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update.
+
+- The Kubo HTTP API will no longer listen on localhost and will instead only listen on a Unix domain socket by default. Read the [services.kubo.settings.Addresses.API](#opt-services.kubo.settings.Addresses.API) option description for more information.
- The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`
@@ -170,8 +192,12 @@ In addition to numerous new and upgraded packages, this release has the followin
- Calling `makeSetupHook` without passing a `name` argument is deprecated.
+- Top-level buildPlatform,hostPlatform,targetPlatform have been deprecated, use stdenv.X instead.
+
- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.
+- `dokuwiki` has been updated from 2023-07-31a (Igor) to 2023-04-04 (Jack Jackrum), which has [completely removed](https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum) the options to embed HTML and PHP for security reasons. The [htmlok plugin](https://www.dokuwiki.org/plugin:htmlok) can be used to regain this functionality.
+
- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.
- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
@@ -211,6 +237,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts..quic = true;`.
+- The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
+
- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
- The `services.pipewire.config` options have been removed, as they have basically never worked correctly. All behavior defined by the default configuration can be overridden with drop-in files as necessary - see [below](#sec-release-23.05-migration-pipewire) for details.
@@ -230,6 +258,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required)
- Migration instructions: ["Before updating pnpm to v8 in your CI, regenerate your pnpm-lock.yaml. To upgrade your lockfile, run pnpm install and commit the changes. Existing dependencies will not be updated; however, due to configuration changes in pnpm v8, some missing peer dependencies may be added to the lockfile and some packages may get deduplicated. You can commit the new lockfile even before upgrading Node.js in the CI, as pnpm v7 already supports the new lockfile format."](https://github.com/pnpm/pnpm/releases/tag/v8.0.0)
+- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`.
+
## Other Notable Changes {#sec-release-23.05-notable-changes}
@@ -254,7 +284,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.openssh.ciphers` to `services.openssh.settings.Ciphers`
- `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`
-- `netbox` was updated to 3.4. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's [breaking changes](https://github.com/netbox-community/netbox/releases/tag/v3.4.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
+- `netbox` was updated to 3.5. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's breaking changes [for 3.4.0](https://github.com/netbox-community/netbox/releases/tag/v3.4.0) and [for 3.5.0](https://github.com/netbox-community/netbox/releases/tag/v3.5.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
- `services.netbox` now support RFC42-style options, through `services.netbox.settings`.
@@ -274,14 +304,17 @@ In addition to numerous new and upgraded packages, this release has the followin
replacement. It stores backups as volume dump files and thus better integrates
into contemporary backup solutions.
+- `services.maddy` now allows to configure users and their credentials using `services.maddy.ensureCredentials`.
+
- The `dnsmasq` service now takes configuration via the
`services.dnsmasq.settings` attribute set. The option
`services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
end of life.
-- The `dokuwiki` service now takes configuration via the `services.dokuwiki.sites..settings` attribute set, `extraConfig` is deprecated and will be removed.
- The `{aclUse,superUser,disableActions}` attributes have been renamed, `pluginsConfig` now also accepts an attribute set of booleans, passing plain PHP is deprecated.
- Same applies to `acl` which now also accepts structured settings.
+- The `dokuwiki` service is now configured via `services.dokuwiki.sites..settings` attribute set; `extraConfig` has been removed.
+ The `{aclUse,superUser,disableActions}` attributes have been renamed accordingly. `pluginsConfig` now only accepts an attribute set of booleans.
+ Passing plain PHP is no longer possible.
+ Same applies to `acl` which now also only accepts structured `settings`.
- The `zsh` package changes the way to set environment variables on NixOS systems where `programs.zsh.enable` equals `false`. It now sources `/etc/set-environment` when reading the system-level `zshenv` file. Before, it sourced `/etc/profile` when reading the system-level `zprofile` file.
@@ -332,6 +365,8 @@ In addition to numerous new and upgraded packages, this release has the followin
[headscale's example configuration](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
can be directly written as attribute-set in Nix within this option.
+- `services.kubo` now unmounts `ipfsMountDir` and `ipnsMountDir` even if it is killed unexpectedly when `autoMount` is enabled.
+
- `nixos/lib/make-disk-image.nix` can now mutate EFI variables, run user-provided EFI firmware or variable templates. This is now extensively documented in the NixOS manual.
- `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion.
@@ -388,6 +423,8 @@ 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.
+- The `rtsp-simple-server` package and corresponding NixOS module have been renamed to `mediamtx` to match 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; };`.
@@ -405,12 +442,16 @@ In addition to numerous new and upgraded packages, this release has the followin
- `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store.
+- `gitea` module options have been changed to be RFC042 conforming (i.e. some options were moved to be located under `services.gitea.settings`)
+
- `boot.initrd.luks.device.` has a new `tryEmptyPassphrase` option, this is useful for OEM's who need to install an encrypted disk with a future settable passphrase
- Lisp gained a [manual section](https://nixos.org/manual/nixpkgs/stable/#lisp), documenting a new and backwards incompatible interface. The previous interface will be removed in a future release.
- The `bind` module now allows the per-zone `allow-query` setting to be configured (previously it was hard-coded to `any`; it still defaults to `any` to retain compatibility).
+- `make-disk-image` handles `contents` arguments that are directories better, fixing a bug where it used to put them in a subdirectory of the intended `target`.
+
## Detailed migration information {#sec-release-23.05-migration}
### Pipewire configuration overrides {#sec-release-23.05-migration-pipewire}
diff --git a/third_party/nixpkgs/nixos/lib/make-disk-image.nix b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
index d641d1289f..db53bb98ee 100644
--- a/third_party/nixpkgs/nixos/lib/make-disk-image.nix
+++ b/third_party/nixpkgs/nixos/lib/make-disk-image.nix
@@ -402,11 +402,16 @@ let format' = format; in let
done
else
mkdir -p $root/$(dirname $target)
- if ! [ -e $root/$target ]; then
- rsync $rsync_flags $source $root/$target
- else
+ if [ -e $root/$target ]; then
echo "duplicate entry $target -> $source"
exit 1
+ elif [ -d $source ]; then
+ # Append a slash to the end of source to get rsync to copy the
+ # directory _to_ the target instead of _inside_ the target.
+ # (See `man rsync`'s note on a trailing slash.)
+ rsync $rsync_flags $source/ $root/$target
+ else
+ rsync $rsync_flags $source $root/$target
fi
fi
done
diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
index e44cce11f3..d1e9c8072e 100644
--- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix
+++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix
@@ -428,6 +428,8 @@ let
uidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) cfg.users) "uid";
gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.groups) "gid";
+ sdInitrdUidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) config.boot.initrd.systemd.users) "uid";
+ sdInitrdGidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) config.boot.initrd.systemd.groups) "gid";
spec = pkgs.writeText "users-groups.json" (builtins.toJSON {
inherit (cfg) mutableUsers;
@@ -534,6 +536,54 @@ in {
WARNING: enabling this can lock you out of your system. Enable this only if you know what are you doing.
'';
};
+
+ # systemd initrd
+ boot.initrd.systemd.users = mkOption {
+ visible = false;
+ description = ''
+ Users to include in initrd.
+ '';
+ default = {};
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ options.uid = mkOption {
+ visible = false;
+ type = types.int;
+ description = ''
+ ID of the user in initrd.
+ '';
+ defaultText = literalExpression "config.users.users.\${name}.uid";
+ default = cfg.users.${name}.uid;
+ };
+ options.group = mkOption {
+ visible = false;
+ type = types.singleLineStr;
+ description = ''
+ Group the user belongs to in initrd.
+ '';
+ defaultText = literalExpression "config.users.users.\${name}.group";
+ default = cfg.users.${name}.group;
+ };
+ }));
+ };
+
+ boot.initrd.systemd.groups = mkOption {
+ visible = false;
+ description = ''
+ Groups to include in initrd.
+ '';
+ default = {};
+ type = types.attrsOf (types.submodule ({ name, ... }: {
+ options.gid = mkOption {
+ visible = false;
+ type = types.int;
+ description = ''
+ ID of the group in initrd.
+ '';
+ defaultText = literalExpression "config.users.groups.\${name}.gid";
+ default = cfg.groups.${name}.gid;
+ };
+ }));
+ };
};
@@ -639,10 +689,52 @@ in {
"/etc/profiles/per-user/$USER"
];
+ # systemd initrd
+ boot.initrd.systemd = lib.mkIf config.boot.initrd.systemd.enable {
+ contents = {
+ "/etc/passwd".text = ''
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { uid, group }: let
+ g = config.boot.initrd.systemd.groups.${group};
+ in "${n}:x:${toString uid}:${toString g.gid}::/var/empty:") config.boot.initrd.systemd.users)}
+ '';
+ "/etc/group".text = ''
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { gid }: "${n}:x:${toString gid}:") config.boot.initrd.systemd.groups)}
+ '';
+ };
+
+ users = {
+ root = {};
+ nobody = {};
+ };
+
+ groups = {
+ root = {};
+ nogroup = {};
+ systemd-journal = {};
+ tty = {};
+ dialout = {};
+ kmem = {};
+ input = {};
+ video = {};
+ render = {};
+ sgx = {};
+ audio = {};
+ video = {};
+ lp = {};
+ disk = {};
+ cdrom = {};
+ tape = {};
+ kvm = {};
+ };
+ };
+
assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
message = "UIDs and GIDs must be unique!";
}
+ { assertion = !cfg.enforceIdUniqueness || (sdInitrdUidsAreUnique && sdInitrdGidsAreUnique);
+ message = "systemd initrd UIDs and GIDs must be unique!";
+ }
{ # If mutableUsers is false, to prevent users creating a
# configuration that locks them out of the system, ensure that
# there is at least one "privileged" account that has a
diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix
index 520db128ac..2a35afad2a 100644
--- a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix
+++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix
@@ -10,10 +10,7 @@ let
check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x);
};
- impanel =
- if cfg.panel != null
- then "--panel=${cfg.panel}"
- else "";
+ impanel = optionalString (cfg.panel != null) "--panel=${cfg.panel}";
ibusAutostart = pkgs.writeTextFile {
name = "autostart-ibus-daemon";
diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
index 8fa070b03d..ea17e2a705 100644
--- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -22,8 +22,8 @@ let
(option: ''
menuentry '${defaults.name} ${
# Name appended to menuentry defaults to params if no specific name given.
- option.name or (if option ? params then "(${option.params})" else "")
- }' ${if option ? class then " --class ${option.class}" else ""} {
+ option.name or (optionalString (option ? params) "(${option.params})")
+ }' ${optionalString (option ? class) " --class ${option.class}"} {
linux ${defaults.image} \''${isoboot} ${defaults.params} ${
option.params or ""
}
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
index 946e73dac5..c65898b261 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -85,12 +85,7 @@ sub debug {
# nixpkgs.system
-my ($status, @systemLines) = runCommand("@nixInstantiate@ --impure --eval --expr builtins.currentSystem");
-if ($status != 0 || join("", @systemLines) =~ /error/) {
- die "Failed to retrieve current system type from nix.\n";
-}
-chomp(my $system = @systemLines[0]);
-push @attrs, "nixpkgs.hostPlatform = lib.mkDefault $system;";
+push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@system@\";";
my $cpuinfo = read_file "/proc/cpuinfo";
@@ -200,7 +195,7 @@ sub pciCheck {
}
# In case this is a virtio scsi device, we need to explicitly make this available.
- if ($vendor eq "0x1af4" && $device eq "0x1004") {
+ if ($vendor eq "0x1af4" && ($device eq "0x1004" || $device eq "0x1048") ) {
push @initrdAvailableKernelModules, "virtio_scsi";
}
@@ -473,7 +468,7 @@ EOF
}
# Don't emit tmpfs entry for /tmp, because it most likely comes from the
- # boot.tmpOnTmpfs option in configuration.nix (managed declaratively).
+ # boot.tmp.useTmpfs option in configuration.nix (managed declaratively).
next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs");
# Emit the filesystem.
diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
index 08278d3943..902a9e7367 100644
--- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
+++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix
@@ -34,7 +34,7 @@ let
name = "nixos-generate-config";
src = ./nixos-generate-config.pl;
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
- nixInstantiate = "${pkgs.nix}/bin/nix-instantiate";
+ system = pkgs.stdenv.hostPlatform.system;
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index bac096efac..0899e702ba 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -149,6 +149,7 @@
./programs/cdemu.nix
./programs/cfs-zen-tweaks.nix
./programs/chromium.nix
+ ./programs/clash-verge.nix
./programs/cnping.nix
./programs/command-not-found/command-not-found.nix
./programs/criu.nix
@@ -170,6 +171,7 @@
./programs/fuse.nix
./programs/fzf.nix
./programs/gamemode.nix
+ ./programs/gamescope.nix
./programs/geary.nix
./programs/git.nix
./programs/gnome-disks.nix
@@ -514,6 +516,7 @@
./services/hardware/usbrelayd.nix
./services/hardware/vdr.nix
./services/hardware/keyd.nix
+ ./services/home-automation/esphome.nix
./services/home-automation/evcc.nix
./services/home-automation/home-assistant.nix
./services/home-automation/zigbee2mqtt.nix
@@ -668,6 +671,7 @@
./services/misc/polaris.nix
./services/misc/portunus.nix
./services/misc/prowlarr.nix
+ ./services/misc/pufferpanel.nix
./services/misc/pykms.nix
./services/misc/radarr.nix
./services/misc/readarr.nix
@@ -882,6 +886,7 @@
./services/networking/iscsi/initiator.nix
./services/networking/iscsi/root-initiator.nix
./services/networking/iscsi/target.nix
+ ./services/networking/ivpn.nix
./services/networking/iwd.nix
./services/networking/jibri/default.nix
./services/networking/jicofo.nix
@@ -1040,6 +1045,7 @@
./services/networking/wg-netmanager.nix
./services/networking/webhook.nix
./services/networking/wg-quick.nix
+ ./services/networking/wgautomesh.nix
./services/networking/wireguard.nix
./services/networking/wpa_supplicant.nix
./services/networking/wstunnel.nix
@@ -1130,7 +1136,7 @@
./services/video/epgstation/default.nix
./services/video/mirakurun.nix
./services/video/replay-sorcery.nix
- ./services/video/rtsp-simple-server.nix
+ ./services/video/mediamtx.nix
./services/video/unifi-video.nix
./services/video/v4l2-relayd.nix
./services/wayland/cage.nix
@@ -1165,7 +1171,6 @@
./services/web-apps/hledger-web.nix
./services/web-apps/icingaweb2/icingaweb2.nix
./services/web-apps/icingaweb2/module-monitoring.nix
- ./services/web-apps/ihatemoney
./services/web-apps/invidious.nix
./services/web-apps/invoiceplane.nix
./services/web-apps/isso.nix
@@ -1181,6 +1186,7 @@
./services/web-apps/mattermost.nix
./services/web-apps/mediawiki.nix
./services/web-apps/miniflux.nix
+ ./services/web-apps/monica.nix
./services/web-apps/moodle.nix
./services/web-apps/netbox.nix
./services/web-apps/nextcloud.nix
@@ -1238,6 +1244,7 @@
./services/web-servers/nginx/gitweb.nix
./services/web-servers/phpfpm/default.nix
./services/web-servers/pomerium.nix
+ ./services/web-servers/stargazer.nix
./services/web-servers/tomcat.nix
./services/web-servers/traefik.nix
./services/web-servers/trafficserver/default.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix
new file mode 100644
index 0000000000..29977be385
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+{
+ options.programs.clash-verge = {
+ enable = lib.mkEnableOption (lib.mdDoc ''
+ Clash Verge.
+ '');
+
+ autoStart = lib.mkEnableOption (lib.mdDoc ''
+ Clash Verge Auto Launch.
+ '');
+
+ tunMode = lib.mkEnableOption (lib.mdDoc ''
+ Clash Verge Tun Mode.
+ '');
+ };
+
+ config =
+ let
+ cfg = config.programs.clash-verge;
+ in
+ lib.mkIf cfg.enable {
+
+ environment.systemPackages = [
+ pkgs.clash-verge
+ (lib.mkIf cfg.autoStart (pkgs.makeAutostartItem {
+ name = "clash-verge";
+ package = pkgs.clash-verge;
+ }))
+ ];
+
+ security.wrappers.clash-verge = lib.mkIf cfg.tunMode {
+ owner = "root";
+ group = "root";
+ capabilities = "cap_net_bind_service,cap_net_admin=+ep";
+ source = "${lib.getExe pkgs.clash-verge}";
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ zendo ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/firefox.nix b/third_party/nixpkgs/nixos/modules/programs/firefox.nix
index 3a5105c57d..ead048134d 100644
--- a/third_party/nixpkgs/nixos/modules/programs/firefox.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/firefox.nix
@@ -201,6 +201,7 @@ in
nativeMessagingHosts = mapAttrs (_: v: mkEnableOption (mdDoc v)) {
browserpass = "Browserpass support";
bukubrow = "Bukubrow support";
+ euwebid = "Web eID support";
ff2mpv = "ff2mpv support";
fxCast = "fx_cast support";
gsconnect = "GSConnect support";
@@ -217,6 +218,8 @@ in
extraPrefs = cfg.autoConfig;
extraNativeMessagingHosts = with pkgs; optionals nmh.ff2mpv [
ff2mpv
+ ] ++ optionals nmh.euwebid [
+ web-eid-app
] ++ optionals nmh.gsconnect [
gnomeExtensions.gsconnect
] ++ optionals nmh.jabref [
@@ -230,6 +233,7 @@ in
nixpkgs.config.firefox = {
enableBrowserpass = nmh.browserpass;
enableBukubrow = nmh.bukubrow;
+ enableEUWebID = nmh.euwebid;
enableTridactylNative = nmh.tridactyl;
enableUgetIntegrator = nmh.ugetIntegrator;
enableFXCastBridge = nmh.fxCast;
diff --git a/third_party/nixpkgs/nixos/modules/programs/gamescope.nix b/third_party/nixpkgs/nixos/modules/programs/gamescope.nix
new file mode 100644
index 0000000000..c4424849a4
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/programs/gamescope.nix
@@ -0,0 +1,85 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+with lib; let
+ cfg = config.programs.gamescope;
+
+ gamescope =
+ let
+ wrapperArgs =
+ optional (cfg.args != [ ])
+ ''--add-flags "${toString cfg.args}"''
+ ++ builtins.attrValues (mapAttrs (var: val: "--set-default ${var} ${val}") cfg.env);
+ in
+ pkgs.runCommand "gamescope" { nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; } ''
+ mkdir -p $out/bin
+ makeWrapper ${cfg.package}/bin/gamescope $out/bin/gamescope --inherit-argv0 \
+ ${toString wrapperArgs}
+ '';
+in
+{
+ options.programs.gamescope = {
+ enable = mkEnableOption (mdDoc "gamescope");
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.gamescope;
+ defaultText = literalExpression "pkgs.gamescope";
+ description = mdDoc ''
+ The GameScope package to use.
+ '';
+ };
+
+ capSysNice = mkOption {
+ type = types.bool;
+ default = false;
+ description = mdDoc ''
+ Add cap_sys_nice capability to the GameScope
+ binary so that it may renice itself.
+ '';
+ };
+
+ args = mkOption {
+ type = types.listOf types.string;
+ default = [ ];
+ example = [ "--rt" "--prefer-vk-device 8086:9bc4" ];
+ description = mdDoc ''
+ Arguments passed to GameScope on startup.
+ '';
+ };
+
+ env = mkOption {
+ type = types.attrsOf types.string;
+ default = { };
+ example = literalExpression ''
+ # for Prime render offload on Nvidia laptops.
+ # Also requires `hardware.nvidia.prime.offload.enable`.
+ {
+ __NV_PRIME_RENDER_OFFLOAD = "1";
+ __VK_LAYER_NV_optimus = "NVIDIA_only";
+ __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+ }
+ '';
+ description = mdDoc ''
+ Default environment variables available to the GameScope process, overridable at runtime.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ security.wrappers = mkIf cfg.capSysNice {
+ gamescope = {
+ owner = "root";
+ group = "root";
+ source = "${gamescope}/bin/gamescope";
+ capabilities = "cap_sys_nice+pie";
+ };
+ };
+
+ environment.systemPackages = mkIf (!cfg.capSysNice) [ gamescope ];
+ };
+
+ meta.maintainers = with maintainers; [ nrdxp ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/programs/less.nix b/third_party/nixpkgs/nixos/modules/programs/less.nix
index a1134e7743..81c68307ae 100644
--- a/third_party/nixpkgs/nixos/modules/programs/less.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/less.nix
@@ -11,7 +11,7 @@ let
${concatStringsSep "\n"
(mapAttrsToList (command: action: "${command} ${action}") cfg.commands)
}
- ${if cfg.clearDefaultCommands then "#stop" else ""}
+ ${optionalString cfg.clearDefaultCommands "#stop"}
#line-edit
${concatStringsSep "\n"
diff --git a/third_party/nixpkgs/nixos/modules/programs/neovim.nix b/third_party/nixpkgs/nixos/modules/programs/neovim.nix
index 4562e5a2c2..3f0e9fc173 100644
--- a/third_party/nixpkgs/nixos/modules/programs/neovim.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/neovim.nix
@@ -4,12 +4,8 @@ with lib;
let
cfg = config.programs.neovim;
-
- runtime' = filter (f: f.enable) (attrValues cfg.runtime);
-
- runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime');
-
-in {
+in
+{
options.programs.neovim = {
enable = mkOption {
type = types.bool;
@@ -70,7 +66,7 @@ in {
configure = mkOption {
type = types.attrs;
- default = {};
+ default = { };
example = literalExpression ''
{
customRC = '''
@@ -105,7 +101,7 @@ in {
};
runtime = mkOption {
- default = {};
+ default = { };
example = literalExpression ''
{ "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; }
'';
@@ -115,14 +111,15 @@ in {
type = with types; attrsOf (submodule (
{ name, config, ... }:
- { options = {
+ {
+ options = {
enable = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
- Whether this /etc file should be generated. This
- option allows specific /etc files to be disabled.
+ Whether this runtime directory should be generated. This
+ option allows specific runtime files to be disabled.
'';
};
@@ -147,14 +144,9 @@ in {
};
- config = {
- target = mkDefault name;
- source = mkIf (config.text != null) (
- let name' = "neovim-runtime" + baseNameOf name;
- in mkDefault (pkgs.writeText name' config.text));
- };
-
- }));
+ config.target = mkDefault name;
+ }
+ ));
};
};
@@ -165,14 +157,17 @@ in {
];
environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
- programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
- inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby;
- configure = cfg.configure // {
+ environment.etc = listToAttrs (attrValues (mapAttrs
+ (name: value: {
+ name = "xdg/nvim/${name}";
+ value = value // {
+ target = "xdg/nvim/${value.target}";
+ };
+ })
+ cfg.runtime));
- customRC = (cfg.configure.customRC or "") + ''
- set runtimepath^=${runtime}/etc
- '';
- };
+ programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
+ inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby configure;
};
};
}
diff --git a/third_party/nixpkgs/nixos/modules/programs/regreet.nix b/third_party/nixpkgs/nixos/modules/programs/regreet.nix
index 89b93737f4..f6c750a45b 100644
--- a/third_party/nixpkgs/nixos/modules/programs/regreet.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/regreet.nix
@@ -50,7 +50,7 @@ in
config = lib.mkIf cfg.enable {
services.greetd = {
enable = lib.mkDefault true;
- settings.default_session.command = lib.mkDefault "${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}";
+ settings.default_session.command = lib.mkDefault "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.cage} -s -- ${lib.getExe cfg.package}";
};
environment.etc = {
diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix
index 1ec698820a..7c85d1e7c3 100644
--- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix
@@ -26,7 +26,7 @@ let
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
)) + "\n";
- knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" "/etc/ssh/ssh_known_hosts2" ]
+ knownHostsFiles = [ "/etc/ssh/ssh_known_hosts" ]
++ map pkgs.copyPathToStore cfg.knownHostsFiles;
in
@@ -232,9 +232,8 @@ in
description = lib.mdDoc ''
Files containing SSH host keys to set as global known hosts.
`/etc/ssh/ssh_known_hosts` (which is
- generated by {option}`programs.ssh.knownHosts`) and
- `/etc/ssh/ssh_known_hosts2` are always
- included.
+ generated by {option}`programs.ssh.knownHosts`) is
+ always included.
'';
example = literalExpression ''
[
diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix
index fc63f0f187..c63b31bde1 100644
--- a/third_party/nixpkgs/nixos/modules/programs/steam.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix
@@ -4,6 +4,24 @@ with lib;
let
cfg = config.programs.steam;
+ gamescopeCfg = config.programs.gamescope;
+
+ steam-gamescope = let
+ exports = builtins.attrValues (builtins.mapAttrs (n: v: "export ${n}=${v}") cfg.gamescopeSession.env);
+ in
+ pkgs.writeShellScriptBin "steam-gamescope" ''
+ ${builtins.concatStringsSep "\n" exports}
+ gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf
+ '';
+
+ gamescopeSessionFile =
+ (pkgs.writeTextDir "share/wayland-sessions/steam.desktop" ''
+ [Desktop Entry]
+ Name=Steam
+ Comment=A digital distribution platform
+ Exec=${steam-gamescope}/bin/steam-gamescope
+ Type=Application
+ '').overrideAttrs (_: { passthru.providedSessions = [ "steam" ]; });
in {
options.programs.steam = {
enable = mkEnableOption (lib.mdDoc "steam");
@@ -32,6 +50,12 @@ in {
then [ package ] ++ extraPackages
else [ package32 ] ++ extraPackages32;
in prevLibs ++ additionalLibs;
+ } // optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice)
+ {
+ buildFHSEnv = pkgs.buildFHSEnv.override {
+ # use the setuid wrapped bubblewrap
+ bubblewrap = "${config.security.wrapperDir}/..";
+ };
});
description = lib.mdDoc ''
The Steam package to use. Additional libraries are added from the system
@@ -57,6 +81,31 @@ in {
Open ports in the firewall for Source Dedicated Server.
'';
};
+
+ gamescopeSession = mkOption {
+ description = mdDoc "Run a GameScope driven Steam session from your display-manager";
+ default = {};
+ type = types.submodule {
+ options = {
+ enable = mkEnableOption (mdDoc "GameScope Session");
+ args = mkOption {
+ type = types.listOf types.string;
+ default = [ ];
+ description = mdDoc ''
+ Arguments to be passed to GameScope for the session.
+ '';
+ };
+
+ env = mkOption {
+ type = types.attrsOf types.string;
+ default = { };
+ description = mdDoc ''
+ Environmental variables to be passed to GameScope for the session.
+ '';
+ };
+ };
+ };
+ };
};
config = mkIf cfg.enable {
@@ -66,6 +115,19 @@ in {
driSupport32Bit = true;
};
+ security.wrappers = mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
+ # needed or steam fails
+ bwrap = {
+ owner = "root";
+ group = "root";
+ source = "${pkgs.bubblewrap}/bin/bwrap";
+ setuid = true;
+ };
+ };
+
+ programs.gamescope.enable = mkDefault cfg.gamescopeSession.enable;
+ services.xserver.displayManager.sessionPackages = mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ];
+
# optionally enable 32bit pulseaudio support if pulseaudio is enabled
hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
@@ -74,7 +136,7 @@ in {
environment.systemPackages = [
cfg.package
cfg.package.run
- ];
+ ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope;
networking.firewall = lib.mkMerge [
(mkIf cfg.remotePlay.openFirewall {
diff --git a/third_party/nixpkgs/nixos/modules/programs/tmux.nix b/third_party/nixpkgs/nixos/modules/programs/tmux.nix
index 4fb9175fb8..4f452f1d7f 100644
--- a/third_party/nixpkgs/nixos/modules/programs/tmux.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/tmux.nix
@@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
- inherit (lib) mkOption mkIf types;
+ inherit (lib) mkOption mkIf types optionalString;
cfg = config.programs.tmux;
@@ -17,17 +17,17 @@ let
set -g base-index ${toString cfg.baseIndex}
setw -g pane-base-index ${toString cfg.baseIndex}
- ${if cfg.newSession then "new-session" else ""}
+ ${optionalString cfg.newSession "new-session"}
- ${if cfg.reverseSplit then ''
+ ${optionalString cfg.reverseSplit ''
bind v split-window -h
bind s split-window -v
- '' else ""}
+ ''}
set -g status-keys ${cfg.keyMode}
set -g mode-keys ${cfg.keyMode}
- ${if cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize then ''
+ ${optionalString (cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize) ''
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
@@ -37,15 +37,15 @@ let
bind -r J resize-pane -D ${toString cfg.resizeAmount}
bind -r K resize-pane -U ${toString cfg.resizeAmount}
bind -r L resize-pane -R ${toString cfg.resizeAmount}
- '' else ""}
+ ''}
- ${if (cfg.shortcut != defaultShortcut) then ''
+ ${optionalString (cfg.shortcut != defaultShortcut) ''
# rebind main key: C-${cfg.shortcut}
unbind C-${defaultShortcut}
set -g prefix C-${cfg.shortcut}
bind ${cfg.shortcut} send-prefix
bind C-${cfg.shortcut} last-window
- '' else ""}
+ ''}
setw -g aggressive-resize ${boolToStr cfg.aggressiveResize}
setw -g clock-mode-style ${if cfg.clock24 then "24" else "12"}
@@ -160,7 +160,10 @@ in {
default = defaultTerminal;
example = "screen-256color";
type = types.str;
- description = lib.mdDoc "Set the $TERM variable.";
+ description = lib.mdDoc ''
+ Set the $TERM variable. Use tmux-direct if italics or 24bit true color
+ support is needed.
+ '';
};
secureSocket = mkOption {
diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
index 0b152e54cf..6bb21cb3ef 100644
--- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix
@@ -236,6 +236,9 @@ in
setopt ${concatStringsSep " " cfg.setOptions}
''}
+ # Alternative method of determining short and full hostname.
+ HOST=${config.networking.fqdnOrHostName}
+
# Setup command line history.
# Don't export these, otherwise other shells (bash) will try to use same HISTFILE.
SAVEHIST=${toString cfg.histSize}
diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix
index 158c793419..45a27029df 100644
--- a/third_party/nixpkgs/nixos/modules/rename.nix
+++ b/third_party/nixpkgs/nixos/modules/rename.nix
@@ -58,6 +58,7 @@ with lib;
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
(mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
+ (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer")
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
@@ -106,6 +107,7 @@ with lib;
(mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.")
(mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Plesae use fcitx5 instead")
diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix
index ef06362589..ea94b54312 100644
--- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix
+++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix
@@ -487,7 +487,7 @@ let
};
email = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
inherit (defaultAndText "email" null) default defaultText;
description = lib.mdDoc ''
Email address for account creation and correspondence from the CA.
@@ -555,7 +555,7 @@ let
};
credentialsFile = mkOption {
- type = types.path;
+ type = types.nullOr types.path;
inherit (defaultAndText "credentialsFile" null) default defaultText;
description = lib.mdDoc ''
Path to an EnvironmentFile for the cert's service containing any required and
@@ -781,11 +781,11 @@ in {
# FIXME Most of these custom warnings and filters for security.acme.certs.* are required
# because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible.
- warnings = filter (w: w != "") (mapAttrsToList (cert: data: if data.extraDomains != "_mkMergedOptionModule" then ''
+ warnings = filter (w: w != "") (mapAttrsToList (cert: data: optionalString (data.extraDomains != "_mkMergedOptionModule") ''
The option definition `security.acme.certs.${cert}.extraDomains` has changed
to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings.
Setting a custom webroot for extra domains is not possible, instead use separate certs.
- '' else "") cfg.certs);
+ '') cfg.certs);
assertions = let
certs = attrValues cfg.certs;
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix
index 2af42eeb37..dbab741bf6 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix
+++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix
@@ -275,9 +275,9 @@ in {
warnings =
# https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
- filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
+ filter (w: w != "") (mapAttrsToList (k: v: optionalString (v.type == "spotify") ''
services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
- '' else "") cfg.streams);
+ '') cfg.streams);
systemd.services.snapserver = {
after = [ "network.target" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix
index e7cd6ae4bb..5ee036e68c 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix
@@ -72,5 +72,8 @@ in
cfg.configurations;
systemd.packages = [ pkgs.borgmatic ];
+
+ # Workaround: https://github.com/NixOS/nixpkgs/issues/81138
+ systemd.timers.borgmatic.wantedBy = [ "timers.target" ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
index 289291c6bd..9fbc599cd4 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
@@ -20,7 +20,7 @@ let
'';
backupDatabaseScript = db: ''
dest="${cfg.location}/${db}.gz"
- if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
+ if ${mariadb}/bin/mysqldump ${optionalString cfg.singleTransaction "--single-transaction"} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
mv $dest.tmp $dest
echo "Backed up to $dest"
else
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
index ca796cf779..d19b98a3e4 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
@@ -300,7 +300,7 @@ in
filesFromTmpFile = "/run/restic-backups-${name}/includes";
backupPaths =
if (backup.dynamicFilesFrom == null)
- then if (backup.paths != null) then concatStringsSep " " backup.paths else ""
+ then optionalString (backup.paths != null) (concatStringsSep " " backup.paths)
else "--files-from ${filesFromTmpFile}";
pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [
(resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts))
diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix
index eca308dc36..d12516ca2f 100644
--- a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -196,9 +196,9 @@ in
--gcmode ${cfg.gcmode} \
--port ${toString cfg.port} \
--maxpeers ${toString cfg.maxpeers} \
- ${if cfg.http.enable then ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}'' else ""} \
+ ${optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \
${optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''} \
- ${if cfg.websocket.enable then ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}'' else ""} \
+ ${optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \
${optionalString (cfg.websocket.apis != null) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''} \
${optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
--authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 8e935d621b..eebacb3f3e 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -63,6 +63,7 @@ in
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "containerRuntime" ] "")
];
###### interface
@@ -134,12 +135,6 @@ in
};
};
- containerRuntime = mkOption {
- description = lib.mdDoc "Which container runtime type to use";
- type = enum ["docker" "remote"];
- default = "remote";
- };
-
containerRuntimeEndpoint = mkOption {
description = lib.mdDoc "Endpoint at which to find the container runtime api interface/socket";
type = str;
@@ -331,7 +326,6 @@ in
${optionalString (cfg.tlsKeyFile != null)
"--tls-private-key-file=${cfg.tlsKeyFile}"} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
- --container-runtime=${cfg.containerRuntime} \
--container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \
--cgroup-driver=systemd \
${cfg.extraOpts}
diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
index 5fb715f4d7..1879fef966 100644
--- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
+++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.boinc;
allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc";
- fhsEnv = pkgs.buildFHSUserEnv {
+ fhsEnv = pkgs.buildFHSEnv {
name = "boinc-fhs-env";
targetPkgs = pkgs': [ cfg.package ] ++ cfg.extraEnvPackages;
runScript = "/bin/boinc_client";
diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 3a1c6c1a37..d6a8c2a3f7 100644
--- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -242,7 +242,7 @@ in {
jobdir="${jenkinsCfg.home}/$jenkinsjobname"
rm -rf "$jobdir"
done
- '' + (if cfg.accessUser != "" then reloadScript else "");
+ '' + (optionalString (cfg.accessUser != "") reloadScript);
serviceConfig = {
Type = "oneshot";
User = jenkinsCfg.user;
diff --git a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix
index 8c64e3d9a5..74f56f5890 100644
--- a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix
+++ b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix
@@ -50,6 +50,6 @@ in {
};
};
- environment.systemPackages = [ cfg.package ];
+ environment.systemPackages = [ cfg.package pkgs.direnv ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
index e8c9688167..578364ec54 100644
--- a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
+++ b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.minetest-server;
- flag = val: name: if val != null then "--${name} ${toString val} " else "";
+ flag = val: name: optionalString (val != null) "--${name} ${toString val} ";
flags = [
(flag cfg.gameId "gameid")
(flag cfg.world "world")
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix
index df7c01ae54..fd2e03ef12 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix
@@ -37,7 +37,7 @@ in {
serviceConfig.ExecStart = [
""
- "${lib.getExe pkgs.auto-cpufreq} --config ${cfgFile}"
+ "${lib.getExe pkgs.auto-cpufreq} --daemon --config ${cfgFile}"
];
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
index d952613324..95c2a4fc5c 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
@@ -16,16 +16,6 @@ let
'';
- # networkd link files are used early by udev to set up interfaces early.
- # This must be done in stage 1 to avoid race conditions between udev and
- # network daemons.
- # TODO move this into the initrd-network module when it exists
- initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''
- mkdir -p $out
- ln -s ${udev}/lib/systemd/network/*.link $out/
- ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}
- '';
-
extraUdevRules = pkgs.writeTextFile {
name = "extra-udev-rules";
text = cfg.extraRules;
@@ -398,7 +388,6 @@ in
systemd = config.boot.initrd.systemd.package;
binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];
};
- "/etc/systemd/network".source = initrdLinkUnits;
};
# Insert initrd rules
boot.initrd.services.udev.packages = [
diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/esphome.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/esphome.nix
new file mode 100644
index 0000000000..d7dbb6f0b9
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/home-automation/esphome.nix
@@ -0,0 +1,136 @@
+{ config, lib, pkgs, ... }:
+
+let
+ inherit (lib)
+ literalExpression
+ maintainers
+ mkEnableOption
+ mkIf
+ mkOption
+ mdDoc
+ types
+ ;
+
+ cfg = config.services.esphome;
+
+ stateDir = "/var/lib/esphome";
+
+ esphomeParams =
+ if cfg.enableUnixSocket
+ then "--socket /run/esphome/esphome.sock"
+ else "--address ${cfg.address} --port ${toString cfg.port}";
+in
+{
+ meta.maintainers = with maintainers; [ oddlama ];
+
+ options.services.esphome = {
+ enable = mkEnableOption (mdDoc "esphome");
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.esphome;
+ defaultText = literalExpression "pkgs.esphome";
+ description = mdDoc "The package to use for the esphome command.";
+ };
+
+ enableUnixSocket = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc "Listen on a unix socket `/run/esphome/esphome.sock` instead of the TCP port.";
+ };
+
+ address = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = mdDoc "esphome address";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 6052;
+ description = mdDoc "esphome port";
+ };
+
+ openFirewall = mkOption {
+ default = false;
+ type = types.bool;
+ description = mdDoc "Whether to open the firewall for the specified port.";
+ };
+
+ allowedDevices = mkOption {
+ default = ["char-ttyS" "char-ttyUSB"];
+ example = ["/dev/serial/by-id/usb-Silicon_Labs_CP2102_USB_to_UART_Bridge_Controller_0001-if00-port0"];
+ description = lib.mdDoc ''
+ A list of device nodes to which {command}`esphome` has access to.
+ Refer to DeviceAllow in systemd.resource-control(5) for more information.
+ Beware that if a device is referred to by an absolute path instead of a device category,
+ it will only allow devices that already are plugged in when the service is started.
+ '';
+ type = types.listOf types.str;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall && !cfg.enableUnixSocket) [cfg.port];
+
+ systemd.services.esphome = {
+ description = "ESPHome dashboard";
+ after = ["network.target"];
+ wantedBy = ["multi-user.target"];
+ path = [cfg.package];
+
+ # platformio fails to determine the home directory when using DynamicUser
+ environment.PLATFORMIO_CORE_DIR = "${stateDir}/.platformio";
+
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/esphome dashboard ${esphomeParams} ${stateDir}";
+ DynamicUser = true;
+ User = "esphome";
+ Group = "esphome";
+ WorkingDirectory = stateDir;
+ StateDirectory = "esphome";
+ StateDirectoryMode = "0750";
+ Restart = "on-failure";
+ RuntimeDirectory = mkIf cfg.enableUnixSocket "esphome";
+ RuntimeDirectoryMode = "0750";
+
+ # Hardening
+ CapabilityBoundingSet = "";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ DevicePolicy = "closed";
+ DeviceAllow = map (d: "${d} rw") cfg.allowedDevices;
+ SupplementaryGroups = ["dialout"];
+ #NoNewPrivileges = true; # Implied by DynamicUser
+ PrivateUsers = true;
+ #PrivateTmp = true; # Implied by DynamicUser
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProcSubset = "pid";
+ ProtectSystem = "strict";
+ #RemoveIPC = true; # Implied by DynamicUser
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ "AF_NETLINK"
+ "AF_UNIX"
+ ];
+ RestrictNamespaces = false; # Required by platformio for chroot
+ RestrictRealtime = true;
+ #RestrictSUIDSGID = true; # Implied by DynamicUser
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "@mount" # Required by platformio for chroot
+ ];
+ UMask = "0077";
+ };
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix
index b056f96c36..342ac5ec6e 100644
--- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix
+++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix
@@ -83,9 +83,8 @@ let
};
mailOption =
- if foldr (n: a: a || (n.mail or false) != false) false (attrValues cfg.settings)
- then "--mail=${pkgs.mailutils}/bin/mail"
- else "";
+ optionalString (foldr (n: a: a || (n.mail or false) != false) false (attrValues cfg.settings))
+ "--mail=${pkgs.mailutils}/bin/mail";
in
{
imports = [
diff --git a/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix b/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix
index 4396940258..553973e255 100644
--- a/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix
@@ -7,7 +7,7 @@ let
cfg = config.services.syslogd;
syslogConf = pkgs.writeText "syslog.conf" ''
- ${if (cfg.tty != "") then "kern.warning;*.err;authpriv.none /dev/${cfg.tty}" else ""}
+ ${optionalString (cfg.tty != "") "kern.warning;*.err;authpriv.none /dev/${cfg.tty}"}
${cfg.defaultConfig}
${cfg.extraConfig}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix
index 1803ea85e4..a923373d18 100644
--- a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix
+++ b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix
@@ -26,13 +26,9 @@ in
};
config = mkIf cfg.enable {
+ # for cli usage
+ environment.systemPackages = [ pkgs.vector ];
- users.groups.vector = { };
- users.users.vector = {
- description = "Vector service user";
- group = "vector";
- isSystemUser = true;
- };
systemd.services.vector = {
description = "Vector event and log aggregator";
wantedBy = [ "multi-user.target" ];
@@ -52,8 +48,7 @@ in
in
{
ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}";
- User = "vector";
- Group = "vector";
+ DynamicUser = true;
Restart = "no";
StateDirectory = "vector";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix b/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix
index 5f3a9b5629..d0b525bcb0 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix
@@ -228,8 +228,8 @@ in {
default = [];
description = lib.mdDoc ''
List of IMAP accounts which get automatically created. Note that for
- a complete setup, user credentials for these accounts are required too
- and can be created using the command `maddyctl creds`.
+ a complete setup, user credentials for these accounts are required
+ and can be created using the `ensureCredentials` option.
This option does not delete accounts which are not (anymore) listed.
'';
example = [
@@ -238,6 +238,33 @@ in {
];
};
+ ensureCredentials = mkOption {
+ default = {};
+ description = lib.mdDoc ''
+ List of user accounts which get automatically created if they don't
+ exist yet. Note that for a complete setup, corresponding mail boxes
+ have to get created using the `ensureAccounts` option.
+ This option does not delete accounts which are not (anymore) listed.
+ '';
+ example = {
+ "user1@localhost".passwordFile = /secrets/user1-localhost;
+ "user2@localhost".passwordFile = /secrets/user2-localhost;
+ };
+ type = types.attrsOf (types.submodule {
+ options = {
+ passwordFile = mkOption {
+ type = types.path;
+ example = "/path/to/file";
+ default = null;
+ description = lib.mdDoc ''
+ Specifies the path to a file containing the
+ clear text password for the user.
+ '';
+ };
+ };
+ });
+ };
+
};
};
@@ -265,6 +292,13 @@ in {
fi
'') cfg.ensureAccounts}
''}
+ ${optionalString (cfg.ensureCredentials != {}) ''
+ ${concatStringsSep "\n" (mapAttrsToList (name: cfg: ''
+ if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then
+ ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${escapeShellArg cfg.passwordFile}) ${name}
+ fi
+ '') cfg.ensureCredentials)}
+ ''}
'';
serviceConfig = {
Type = "oneshot";
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
index 852340c05a..23c47aaca7 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix
@@ -234,7 +234,7 @@ let
headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks;
- aliases = let separator = if cfg.aliasMapType == "hash" then ":" else ""; in
+ aliases = let separator = optionalString (cfg.aliasMapType == "hash") ":"; in
optionalString (cfg.postmasterAlias != "") ''
postmaster${separator} ${cfg.postmasterAlias}
''
diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
index 7b6d822192..b9cf526b0b 100644
--- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
+++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix
@@ -7,7 +7,7 @@ let
fpm = config.services.phpfpm.pools.roundcube;
localDB = cfg.database.host == "localhost";
user = cfg.database.username;
- phpWithPspell = pkgs.php80.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
+ phpWithPspell = pkgs.php81.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);
in
{
options.services.roundcube = {
@@ -70,7 +70,12 @@ in
};
passwordFile = mkOption {
type = types.str;
- description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used.";
+ description = lib.mdDoc ''
+ Password file for the postgresql connection.
+ Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
+ but only one line, no comments and readable by user `nginx`.
+ Ignored if `database.host` is set to `localhost`, as peer authentication will be used.
+ '';
};
dbname = mkOption {
type = types.str;
@@ -123,7 +128,13 @@ in
environment.etc."roundcube/config.inc.php".text = ''
cfg.database.user == cfg.user;
+ { assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user;
message = "services.gitea.database.user must match services.gitea.user if the database is to be automatically provisioned";
}
];
@@ -389,26 +413,10 @@ in
ROOT = cfg.repositoryRoot;
};
- server = mkMerge [
- {
- DOMAIN = cfg.domain;
- STATIC_ROOT_PATH = toString cfg.staticRootPath;
- LFS_JWT_SECRET = "#lfsjwtsecret#";
- ROOT_URL = cfg.rootUrl;
- }
- (mkIf cfg.enableUnixSocket {
- PROTOCOL = "http+unix";
- HTTP_ADDR = "/run/gitea/gitea.sock";
- })
- (mkIf (!cfg.enableUnixSocket) {
- HTTP_ADDR = cfg.httpAddress;
- HTTP_PORT = cfg.httpPort;
- })
- (mkIf cfg.lfs.enable {
- LFS_START_SERVER = true;
- })
-
- ];
+ server = mkIf cfg.lfs.enable {
+ LFS_START_SERVER = true;
+ LFS_JWT_SECRET = "#lfsjwtsecret#";
+ };
session = {
COOKIE_NAME = lib.mkDefault "session";
@@ -428,7 +436,7 @@ in
JWT_SECRET = "#oauth2jwtsecret#";
};
- lfs = mkIf (cfg.lfs.enable) {
+ lfs = mkIf cfg.lfs.enable {
PATH = cfg.lfs.contentDir;
};
};
@@ -457,33 +465,35 @@ in
};
systemd.tmpfiles.rules = [
- "d '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -"
- "z '${cfg.dump.backupDir}' 0750 ${cfg.user} gitea - -"
- "Z '${cfg.dump.backupDir}' - ${cfg.user} gitea - -"
- "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -"
- "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} gitea - -"
- "Z '${cfg.lfs.contentDir}' - ${cfg.user} gitea - -"
- "d '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -"
- "z '${cfg.repositoryRoot}' 0750 ${cfg.user} gitea - -"
- "Z '${cfg.repositoryRoot}' - ${cfg.user} gitea - -"
- "d '${cfg.stateDir}' 0750 ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -"
- "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -"
- "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -"
- "Z '${cfg.stateDir}' - ${cfg.user} gitea - -"
+ "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.dump.backupDir}' - ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.repositoryRoot}' - ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
# If we have a folder or symlink with gitea locales, remove it
# And symlink the current gitea locales in place
"L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale"
+
+ ] ++ lib.optionals cfg.lfs.enable [
+ "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.lfs.contentDir}' - ${cfg.user} ${cfg.group} - -"
];
systemd.services.gitea = {
@@ -500,47 +510,52 @@ in
# lfs_jwt_secret.
# We have to consider this to stay compatible with older installations.
preStart = let
- runConfig = "${cfg.stateDir}/custom/conf/app.ini";
- secretKey = "${cfg.stateDir}/custom/conf/secret_key";
- oauth2JwtSecret = "${cfg.stateDir}/custom/conf/oauth2_jwt_secret";
- oldLfsJwtSecret = "${cfg.stateDir}/custom/conf/jwt_secret"; # old file for LFS_JWT_SECRET
- lfsJwtSecret = "${cfg.stateDir}/custom/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET
- internalToken = "${cfg.stateDir}/custom/conf/internal_token";
+ runConfig = "${cfg.customDir}/conf/app.ini";
+ secretKey = "${cfg.customDir}/conf/secret_key";
+ oauth2JwtSecret = "${cfg.customDir}/conf/oauth2_jwt_secret";
+ oldLfsJwtSecret = "${cfg.customDir}/conf/jwt_secret"; # old file for LFS_JWT_SECRET
+ lfsJwtSecret = "${cfg.customDir}/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET
+ internalToken = "${cfg.customDir}/conf/internal_token";
replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret";
in ''
- # copy custom configuration and generate a random secret key if needed
+ # copy custom configuration and generate random secrets if needed
${optionalString (!cfg.useWizard) ''
function gitea_setup {
- cp -f ${configFile} ${runConfig}
+ cp -f '${configFile}' '${runConfig}'
- if [ ! -s ${secretKey} ]; then
- ${exe} generate secret SECRET_KEY > ${secretKey}
+ if [ ! -s '${secretKey}' ]; then
+ ${exe} generate secret SECRET_KEY > '${secretKey}'
fi
# Migrate LFS_JWT_SECRET filename
- if [[ -s ${oldLfsJwtSecret} && ! -s ${lfsJwtSecret} ]]; then
- mv ${oldLfsJwtSecret} ${lfsJwtSecret}
+ if [[ -s '${oldLfsJwtSecret}' && ! -s '${lfsJwtSecret}' ]]; then
+ mv '${oldLfsJwtSecret}' '${lfsJwtSecret}'
fi
- if [ ! -s ${oauth2JwtSecret} ]; then
- ${exe} generate secret JWT_SECRET > ${oauth2JwtSecret}
+ if [ ! -s '${oauth2JwtSecret}' ]; then
+ ${exe} generate secret JWT_SECRET > '${oauth2JwtSecret}'
fi
- if [ ! -s ${lfsJwtSecret} ]; then
- ${exe} generate secret LFS_JWT_SECRET > ${lfsJwtSecret}
+ ${lib.optionalString cfg.lfs.enable ''
+ if [ ! -s '${lfsJwtSecret}' ]; then
+ ${exe} generate secret LFS_JWT_SECRET > '${lfsJwtSecret}'
fi
+ ''}
- if [ ! -s ${internalToken} ]; then
- ${exe} generate secret INTERNAL_TOKEN > ${internalToken}
+ if [ ! -s '${internalToken}' ]; then
+ ${exe} generate secret INTERNAL_TOKEN > '${internalToken}'
fi
chmod u+w '${runConfig}'
${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}'
${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}'
${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}'
- ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}'
+ ${lib.optionalString cfg.lfs.enable ''
+ ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}'
+ ''}
+
${lib.optionalString (cfg.mailerPasswordFile != null) ''
${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}'
''}
@@ -565,7 +580,7 @@ in
serviceConfig = {
Type = "simple";
User = cfg.user;
- Group = "gitea";
+ Group = cfg.group;
WorkingDirectory = cfg.stateDir;
ExecStart = "${exe} web --pid /run/gitea/gitea.pid";
Restart = "always";
@@ -573,7 +588,7 @@ in
RuntimeDirectory = "gitea";
RuntimeDirectoryMode = "0755";
# Access write directories
- ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ];
+ ReadWritePaths = [ cfg.customDir cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ];
UMask = "0027";
# Capabilities
CapabilityBoundingSet = "";
@@ -606,6 +621,7 @@ in
USER = cfg.user;
HOME = cfg.stateDir;
GITEA_WORK_DIR = cfg.stateDir;
+ GITEA_CUSTOM = cfg.customDir;
};
};
@@ -614,12 +630,14 @@ in
description = "Gitea Service";
home = cfg.stateDir;
useDefaultShell = true;
- group = "gitea";
+ group = cfg.group;
isSystemUser = true;
};
};
- users.groups.gitea = {};
+ users.groups = mkIf (cfg.group == "gitea") {
+ gitea = {};
+ };
warnings =
optional (cfg.database.password != "") "config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead." ++
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
index d278b571a6..12c67c5f5a 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix
@@ -1215,7 +1215,7 @@ in {
enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly
extraConfig = {
auth.token = {
- realm = "http${if cfg.https == true then "s" else ""}://${cfg.host}/jwt/auth";
+ realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth";
service = cfg.registry.serviceName;
issuer = cfg.registry.issuer;
rootcertbundle = cfg.registry.certFile;
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix
index 1a6b54854d..e75c352541 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix
@@ -3,7 +3,7 @@ with lib;
let
cfg = config.services.mbpfan;
- verbose = if cfg.verbose then "v" else "";
+ verbose = optionalString cfg.verbose "v";
settingsFormat = pkgs.formats.ini {};
settingsFile = settingsFormat.generate "mbpfan.ini" cfg.settings;
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/pufferpanel.nix b/third_party/nixpkgs/nixos/modules/services/misc/pufferpanel.nix
new file mode 100644
index 0000000000..78ec356469
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/pufferpanel.nix
@@ -0,0 +1,176 @@
+{ config, pkgs, lib, ... }:
+let
+ cfg = config.services.pufferpanel;
+in
+{
+ options.services.pufferpanel = {
+ enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to enable PufferPanel game management server.
+
+ Note that [PufferPanel templates] and binaries downloaded by PufferPanel
+ expect [FHS environment]. It is possible to set {option}`package` option
+ to use PufferPanel wrapper with FHS environment. For example, to use
+ `Download Game from Steam` and `Download Java` template operations:
+ ```Nix
+ { lib, pkgs, ... }: {
+ services.pufferpanel = {
+ enable = true;
+ extraPackages = with pkgs; [ bash curl gawk gnutar gzip ];
+ package = pkgs.buildFHSUserEnv {
+ name = "pufferpanel-fhs";
+ runScript = lib.getExe pkgs.pufferpanel;
+ targetPkgs = pkgs': with pkgs'; [ icu openssl zlib ];
+ };
+ };
+ }
+ ```
+
+ [PufferPanel templates]: https://github.com/PufferPanel/templates
+ [FHS environment]: https://wikipedia.org/wiki/Filesystem_Hierarchy_Standard
+ '';
+ };
+
+ package = lib.mkPackageOptionMD pkgs "pufferpanel" { };
+
+ extraGroups = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ example = [ "podman" ];
+ description = lib.mdDoc ''
+ Additional groups for the systemd service.
+ '';
+ };
+
+ extraPackages = lib.mkOption {
+ type = lib.types.listOf lib.types.package;
+ default = [ ];
+ example = lib.literalExpression "[ pkgs.jre ]";
+ description = lib.mdDoc ''
+ Packages to add to the PATH environment variable. Both the {file}`bin`
+ and {file}`sbin` subdirectories of each package are added.
+ '';
+ };
+
+ environment = lib.mkOption {
+ type = lib.types.attrsOf lib.types.str;
+ default = { };
+ example = lib.literalExpression ''
+ {
+ PUFFER_WEB_HOST = ":8080";
+ PUFFER_DAEMON_SFTP_HOST = ":5657";
+ PUFFER_DAEMON_CONSOLE_BUFFER = "1000";
+ PUFFER_DAEMON_CONSOLE_FORWARD = "true";
+ PUFFER_PANEL_REGISTRATIONENABLED = "false";
+ }
+ '';
+ description = lib.mdDoc ''
+ Environment variables to set for the service. Secrets should be
+ specified using {option}`environmentFile`.
+
+ Refer to the [PufferPanel source code][] for the list of available
+ configuration options. Variable name is an upper-cased configuration
+ entry name with underscores instead of dots, prefixed with `PUFFER_`.
+ For example, `panel.settings.companyName` entry can be set using
+ {env}`PUFFER_PANEL_SETTINGS_COMPANYNAME`.
+
+ When running with panel enabled (configured with `PUFFER_PANEL_ENABLE`
+ environment variable), it is recommended disable registration using
+ `PUFFER_PANEL_REGISTRATIONENABLED` environment variable (registration is
+ enabled by default). To create the initial administrator user, run
+ {command}`pufferpanel --workDir /var/lib/pufferpanel user add --admin`.
+
+ Some options override corresponding settings set via web interface (e.g.
+ `PUFFER_PANEL_REGISTRATIONENABLED`). Those options can be temporarily
+ toggled or set in settings but do not persist between restarts.
+
+ [PufferPanel source code]: https://github.com/PufferPanel/PufferPanel/blob/master/config/entries.go
+ '';
+ };
+
+ environmentFile = lib.mkOption {
+ type = lib.types.nullOr lib.types.path;
+ default = null;
+ description = lib.mdDoc ''
+ File to load environment variables from. Loaded variables override
+ values set in {option}`environment`.
+ '';
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ systemd.services.pufferpanel = {
+ description = "PufferPanel game management server";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ path = cfg.extraPackages;
+ environment = cfg.environment;
+
+ # Note that we export environment variables for service directories if the
+ # value is not set. An empty environment variable is considered to be set.
+ # E.g.
+ # export PUFFER_LOGS=${PUFFER_LOGS-$LOGS_DIRECTORY}
+ # would set PUFFER_LOGS to $LOGS_DIRECTORY if PUFFER_LOGS environment
+ # variable is not defined.
+ script = ''
+ ${lib.concatLines (lib.mapAttrsToList (name: value: ''
+ export ${name}="''${${name}-${value}}"
+ '') {
+ PUFFER_LOGS = "$LOGS_DIRECTORY";
+ PUFFER_DAEMON_DATA_CACHE = "$CACHE_DIRECTORY";
+ PUFFER_DAEMON_DATA_SERVERS = "$STATE_DIRECTORY/servers";
+ PUFFER_DAEMON_DATA_BINARIES = "$STATE_DIRECTORY/binaries";
+ })}
+ exec ${lib.getExe cfg.package} run --workDir "$STATE_DIRECTORY"
+ '';
+
+ serviceConfig = {
+ Type = "simple";
+ Restart = "always";
+
+ UMask = "0077";
+
+ SupplementaryGroups = cfg.extraGroups;
+
+ StateDirectory = "pufferpanel";
+ StateDirectoryMode = "0700";
+ CacheDirectory = "pufferpanel";
+ CacheDirectoryMode = "0700";
+ LogsDirectory = "pufferpanel";
+ LogsDirectoryMode = "0700";
+
+ EnvironmentFile = cfg.environmentFile;
+
+ # Command "pufferpanel shutdown --pid $MAINPID" sends SIGTERM (code 15)
+ # to the main process and waits for termination. This is essentially
+ # KillMode=mixed we are using here. See
+ # https://freedesktop.org/software/systemd/man/systemd.kill.html#KillMode=
+ KillMode = "mixed";
+
+ DynamicUser = true;
+ ProtectHome = true;
+ ProtectProc = "invisible";
+ ProtectClock = true;
+ ProtectHostname = true;
+ ProtectControlGroups = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ PrivateUsers = true;
+ PrivateDevices = true;
+ RestrictRealtime = true;
+ RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSUserEnv
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+ LockPersonality = true;
+ DeviceAllow = [ "" ];
+ DevicePolicy = "closed";
+ CapabilityBoundingSet = [ "" ];
+ };
+ };
+ };
+
+ meta.maintainers = [ lib.maintainers.tie ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
index 58a595b5c7..d881ea9136 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix
@@ -283,13 +283,13 @@ in
services.redmine.settings = {
production = {
- scm_subversion_command = if cfg.components.subversion then "${pkgs.subversion}/bin/svn" else "";
- scm_mercurial_command = if cfg.components.mercurial then "${pkgs.mercurial}/bin/hg" else "";
- scm_git_command = if cfg.components.git then "${pkgs.git}/bin/git" else "";
- scm_cvs_command = if cfg.components.cvs then "${pkgs.cvs}/bin/cvs" else "";
- scm_bazaar_command = if cfg.components.breezy then "${pkgs.breezy}/bin/bzr" else "";
- imagemagick_convert_command = if cfg.components.imagemagick then "${pkgs.imagemagick}/bin/convert" else "";
- gs_command = if cfg.components.ghostscript then "${pkgs.ghostscript}/bin/gs" else "";
+ scm_subversion_command = optionalString cfg.components.subversion "${pkgs.subversion}/bin/svn";
+ scm_mercurial_command = optionalString cfg.components.mercurial "${pkgs.mercurial}/bin/hg";
+ scm_git_command = optionalString cfg.components.git "${pkgs.git}/bin/git";
+ scm_cvs_command = optionalString cfg.components.cvs "${pkgs.cvs}/bin/cvs";
+ scm_bazaar_command = optionalString cfg.components.breezy "${pkgs.breezy}/bin/bzr";
+ imagemagick_convert_command = optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert";
+ gs_command = optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs";
minimagick_font_path = "${cfg.components.minimagick_font_path}";
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix b/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix
index f1a1ed4d29..99b25bdb8e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix
@@ -20,7 +20,7 @@ let
${optionalString (cfg.hostsAllowReg != []) "hosts_allow_reg = ${concatStringsSep "," cfg.hostsAllowReg}"}
${optionalString (cfg.hostsAllowSip != []) "hosts_allow_sip = ${concatStringsSep "," cfg.hostsAllowSip}"}
${optionalString (cfg.hostsDenySip != []) "hosts_deny_sip = ${concatStringsSep "," cfg.hostsDenySip}"}
- ${if (cfg.passwordFile != "") then "proxy_auth_pwfile = ${cfg.passwordFile}" else ""}
+ ${optionalString (cfg.passwordFile != "") "proxy_auth_pwfile = ${cfg.passwordFile}"}
${cfg.extraConfig}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix
index 270d888afb..b7761c34fe 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix
@@ -140,7 +140,7 @@ in
# We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part.
export HOSTNAME=$(< /proc/sys/kernel/hostname)
- exec ${cfg.package}/bin/agent -config.expand-env -config.file ${configFile}
+ exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile}
'';
serviceConfig = {
Restart = "always";
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
index 0c2de683ec..f67596f05a 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -58,10 +58,10 @@ in
};
};
serviceOpts = let
- collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
+ collectSettingsArgs = optionalString (cfg.collectdBinary.enable) ''
--collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
--collectd.security-level ${cfg.collectdBinary.securityLevel} \
- '' else "";
+ '';
in {
serviceConfig = {
ExecStart = ''
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
index 0c5648c141..50e1321a1e 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
@@ -4,12 +4,12 @@ with lib;
let
cfg = config.services.prometheus.exporters.smartctl;
- args = concatStrings [
- "--web.listen-address=\"${cfg.listenAddress}:${toString cfg.port}\" "
- "--smartctl.path=\"${pkgs.smartmontools}/bin/smartctl\" "
- "--smartctl.interval=\"${cfg.maxInterval}\" "
- "${concatMapStringsSep " " (device: "--smartctl.device=${device}") cfg.devices}"
- ];
+ args = lib.escapeShellArgs ([
+ "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}"
+ "--smartctl.path=${pkgs.smartmontools}/bin/smartctl"
+ "--smartctl.interval=${cfg.maxInterval}"
+ ] ++ map (device: "--smartctl.device=${device}") cfg.devices
+ ++ cfg.extraFlags);
in {
port = 9633;
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix
index 8f63fb3d5c..2537bb1b8d 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix
@@ -22,6 +22,18 @@ let
configFile = settingsFormat.generate "kubo-config.json" customizedConfig;
+ # Create a fake repo containing only the file "api".
+ # $IPFS_PATH will point to this directory instead of the real one.
+ # For some reason the Kubo CLI tools insist on reading the
+ # config file when it exists. But the Kubo daemon sets the file
+ # permissions such that only the ipfs user is allowed to read
+ # this file. This prevents normal users from talking to the daemon.
+ # To work around this terrible design, create a fake repo with no
+ # config file, only an api file and everything should work as expected.
+ fakeKuboRepo = pkgs.writeTextDir "api" ''
+ /unix/run/ipfs.sock
+ '';
+
kuboFlags = utils.escapeSystemdExecArgs (
optional cfg.autoMount "--mount" ++
optional cfg.enableGC "--enable-gc" ++
@@ -38,6 +50,22 @@ let
splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw);
+ multiaddrsToListenStreams = addrIn:
+ let
+ addrs = if builtins.typeOf addrIn == "list"
+ then addrIn else [ addrIn ];
+ unfilteredResult = map multiaddrToListenStream addrs;
+ in
+ builtins.filter (addr: addr != null) unfilteredResult;
+
+ multiaddrsToListenDatagrams = addrIn:
+ let
+ addrs = if builtins.typeOf addrIn == "list"
+ then addrIn else [ addrIn ];
+ unfilteredResult = map multiaddrToListenDatagram addrs;
+ in
+ builtins.filter (addr: addr != null) unfilteredResult;
+
multiaddrToListenStream = addrRaw:
let
addr = splitMulitaddr addrRaw;
@@ -62,11 +90,6 @@ let
then "[${s 1}]:${s 3}"
else null; # not valid for listen datagram, skip
- multiaddrsFunc = f: addrsRaw: if builtins.isString addrsRaw then let out = f addrsRaw; in lib.optional (out != null) out else lib.filter (x: x != null) (map f addrsRaw);
-
- multiaddrsToListenStream = multiaddrsFunc multiaddrToListenStream;
- multiaddrsToListenDatagram = multiaddrsFunc multiaddrToListenDatagram;
-
in
{
@@ -160,8 +183,13 @@ in
options = {
Addresses.API = mkOption {
type = types.oneOf [ types.str (types.listOf types.str) ];
- default = "/ip4/127.0.0.1/tcp/5001";
- description = lib.mdDoc "Where Kubo exposes its API to";
+ default = [ ];
+ description = lib.mdDoc ''
+ Multiaddr or array of multiaddrs describing the address to serve the local HTTP API on.
+ In addition to the multiaddrs listed here, the daemon will also listen on a Unix domain socket.
+ To allow the ipfs CLI tools to communicate with the daemon over that socket,
+ add your user to the correct group, e.g. `users.users.alice.extraGroups = [ config.services.kubo.group ];`
+ '';
};
Addresses.Gateway = mkOption {
@@ -171,7 +199,7 @@ in
};
Addresses.Swarm = mkOption {
- type = types.oneOf [ types.str (types.listOf types.str) ];
+ type = types.listOf types.str;
default = [
"/ip4/0.0.0.0/tcp/4001"
"/ip6/::/tcp/4001"
@@ -253,7 +281,7 @@ in
];
environment.systemPackages = [ cfg.package ];
- environment.variables.IPFS_PATH = cfg.dataDir;
+ environment.variables.IPFS_PATH = fakeKuboRepo;
# https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size
boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;
@@ -324,6 +352,10 @@ in
# change when the changes are applied. Whyyyyyy.....
ipfs --offline config replace -
'';
+ postStop = mkIf cfg.autoMount ''
+ # After an unclean shutdown the fuse mounts at cfg.ipnsMountDir and cfg.ipfsMountDir are locked
+ umount --quiet '${cfg.ipnsMountDir}' '${cfg.ipfsMountDir}' || true
+ '';
serviceConfig = {
ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ];
User = cfg.user;
@@ -339,27 +371,23 @@ in
wantedBy = [ "sockets.target" ];
socketConfig = {
ListenStream =
- let
- fromCfg = multiaddrsToListenStream cfg.settings.Addresses.Gateway;
- in
- [ "" ] ++ fromCfg;
+ [ "" ] ++ (multiaddrsToListenStreams cfg.settings.Addresses.Gateway);
ListenDatagram =
- let
- fromCfg = multiaddrsToListenDatagram cfg.settings.Addresses.Gateway;
- in
- [ "" ] ++ fromCfg;
+ [ "" ] ++ (multiaddrsToListenDatagrams cfg.settings.Addresses.Gateway);
};
};
systemd.sockets.ipfs-api = {
wantedBy = [ "sockets.target" ];
- # We also include "%t/ipfs.sock" because there is no way to put the "%t"
- # in the multiaddr.
- socketConfig.ListenStream =
- let
- fromCfg = multiaddrsToListenStream cfg.settings.Addresses.API;
- in
- [ "" "%t/ipfs.sock" ] ++ fromCfg;
+ socketConfig = {
+ # We also include "%t/ipfs.sock" because there is no way to put the "%t"
+ # in the multiaddr.
+ ListenStream =
+ [ "" "%t/ipfs.sock" ] ++ (multiaddrsToListenStreams cfg.settings.Addresses.API);
+ SocketMode = "0660";
+ SocketUser = cfg.user;
+ SocketGroup = cfg.group;
+ };
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix
index 80628f4dfa..e5e147a8dc 100644
--- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix
+++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/openafs/lib.nix
@@ -1,13 +1,13 @@
{ config, lib, ...}:
let
- inherit (lib) concatStringsSep mkOption types;
+ inherit (lib) concatStringsSep mkOption types optionalString;
in {
mkCellServDB = cellName: db: ''
>${cellName}
- '' + (concatStringsSep "\n" (map (dbm: if (dbm.ip != "" && dbm.dnsname != "") then dbm.ip + " #" + dbm.dnsname else "")
+ '' + (concatStringsSep "\n" (map (dbm: optionalString (dbm.ip != "" && dbm.dnsname != "") "${dbm.ip} #${dbm.dnsname}")
db))
+ "\n";
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix
index 11cfe3e7ec..dc861dbfd1 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix
@@ -4,6 +4,49 @@ with lib;
let
cfg = config.services.bird-lg;
+
+ stringOrConcat = sep: v: if builtins.isString v then v else concatStringsSep sep v;
+
+ frontend_args = let
+ fe = cfg.frontend;
+ in {
+ "--servers" = concatStringsSep "," fe.servers;
+ "--domain" = fe.domain;
+ "--listen" = fe.listenAddress;
+ "--proxy-port" = fe.proxyPort;
+ "--whois" = fe.whois;
+ "--dns-interface" = fe.dnsInterface;
+ "--bgpmap-info" = concatStringsSep "," cfg.frontend.bgpMapInfo;
+ "--title-brand" = fe.titleBrand;
+ "--navbar-brand" = fe.navbar.brand;
+ "--navbar-brand-url" = fe.navbar.brandURL;
+ "--navbar-all-servers" = fe.navbar.allServers;
+ "--navbar-all-url" = fe.navbar.allServersURL;
+ "--net-specific-mode" = fe.netSpecificMode;
+ "--protocol-filter" = concatStringsSep "," cfg.frontend.protocolFilter;
+ };
+
+ proxy_args = let
+ px = cfg.proxy;
+ in {
+ "--allowed" = concatStringsSep "," px.allowedIPs;
+ "--bird" = px.birdSocket;
+ "--listen" = px.listenAddress;
+ "--traceroute_bin" = px.traceroute.binary;
+ "--traceroute_flags" = concatStringsSep " " px.traceroute.flags;
+ "--traceroute_raw" = px.traceroute.rawOutput;
+ };
+
+ mkArgValue = value:
+ if isString value
+ then escapeShellArg value
+ else if isBool value
+ then boolToString value
+ else toString value;
+
+ filterNull = filterAttrs (_: v: v != "" && v != null && v != []);
+
+ argsAttrToList = args: mapAttrsToList (name: value: "${name} " + mkArgValue value ) (filterNull args);
in
{
options = {
@@ -44,14 +87,12 @@ in
domain = mkOption {
type = types.str;
- default = "";
example = "dn42.lantian.pub";
description = lib.mdDoc "Server name domain suffixes.";
};
servers = mkOption {
type = types.listOf types.str;
- default = [ ];
example = [ "gigsgigscloud" "hostdare" ];
description = lib.mdDoc "Server name prefixes.";
};
@@ -134,10 +175,14 @@ in
};
extraArgs = mkOption {
- type = types.lines;
- default = "";
+ type = with types; either lines (listOf str);
+ default = [ ];
description = lib.mdDoc ''
Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend).
+
+ :::{.note}
+ Passing lines (plain strings) is deprecated in favour of passing lists of strings.
+ :::
'';
};
};
@@ -160,8 +205,7 @@ in
birdSocket = mkOption {
type = types.str;
- default = "/run/bird.ctl";
- example = "/var/run/bird/bird.ctl";
+ default = "/var/run/bird/bird.ctl";
description = lib.mdDoc "Bird control socket path.";
};
@@ -173,6 +217,12 @@ in
description = lib.mdDoc "Traceroute's binary path.";
};
+ flags = mkOption {
+ type = with types; listOf str;
+ default = [ ];
+ description = lib.mdDoc "Flags for traceroute process";
+ };
+
rawOutput = mkOption {
type = types.bool;
default = false;
@@ -181,10 +231,14 @@ in
};
extraArgs = mkOption {
- type = types.lines;
- default = "";
+ type = with types; either lines (listOf str);
+ default = [ ];
description = lib.mdDoc ''
Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy).
+
+ :::{.note}
+ Passing lines (plain strings) is deprecated in favour of passing lists of strings.
+ :::
'';
};
};
@@ -194,6 +248,16 @@ in
###### implementation
config = {
+
+ warnings =
+ lib.optional (cfg.frontend.enable && builtins.isString cfg.frontend.extraArgs) ''
+ Passing strings to `services.bird-lg.frontend.extraOptions' is deprecated. Please pass a list of strings instead.
+ ''
+ ++ lib.optional (cfg.proxy.enable && builtins.isString cfg.proxy.extraArgs) ''
+ Passing strings to `services.bird-lg.proxy.extraOptions' is deprecated. Please pass a list of strings instead.
+ ''
+ ;
+
systemd.services = {
bird-lg-frontend = mkIf cfg.frontend.enable {
enable = true;
@@ -211,23 +275,8 @@ in
};
script = ''
${cfg.package}/bin/frontend \
- --servers ${concatStringsSep "," cfg.frontend.servers } \
- --domain ${cfg.frontend.domain} \
- --listen ${cfg.frontend.listenAddress} \
- --proxy-port ${toString cfg.frontend.proxyPort} \
- --whois ${cfg.frontend.whois} \
- --dns-interface ${cfg.frontend.dnsInterface} \
- --bgpmap-info ${concatStringsSep "," cfg.frontend.bgpMapInfo } \
- --title-brand ${cfg.frontend.titleBrand} \
- --navbar-brand ${cfg.frontend.navbar.brand} \
- --navbar-brand-url ${cfg.frontend.navbar.brandURL} \
- --navbar-all-servers ${cfg.frontend.navbar.allServers} \
- --navbar-all-url ${cfg.frontend.navbar.allServersURL} \
- --net-specific-mode ${cfg.frontend.netSpecificMode} \
- --protocol-filter ${concatStringsSep "," cfg.frontend.protocolFilter } \
- --name-filter ${cfg.frontend.nameFilter} \
- --time-out ${toString cfg.frontend.timeout} \
- ${cfg.frontend.extraArgs}
+ ${concatStringsSep " \\\n " (argsAttrToList frontend_args)} \
+ ${stringOrConcat " " cfg.frontend.extraArgs}
'';
};
@@ -247,12 +296,8 @@ in
};
script = ''
${cfg.package}/bin/proxy \
- --allowed ${concatStringsSep "," cfg.proxy.allowedIPs } \
- --bird ${cfg.proxy.birdSocket} \
- --listen ${cfg.proxy.listenAddress} \
- --traceroute_bin ${cfg.proxy.traceroute.binary}
- --traceroute_raw ${boolToString cfg.proxy.traceroute.rawOutput}
- ${cfg.proxy.extraArgs}
+ ${concatStringsSep " \\\n " (argsAttrToList proxy_args)} \
+ ${stringOrConcat " " cfg.proxy.extraArgs}
'';
};
};
@@ -266,4 +311,9 @@ in
};
};
};
+
+ meta.maintainers = with lib.maintainers; [
+ e1mo
+ tchekda
+ ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix
index f1c36138be..955463b903 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix
@@ -199,7 +199,7 @@ in
(filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
serviceConfig = {
- ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
+ ExecStart = "@${lib.getExe cfg.package} consul agent -config-dir /etc/consul.d"
+ concatMapStrings (n: " -config-file ${n}") configFiles;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
PermissionsStartOnly = true;
@@ -207,10 +207,10 @@ in
Restart = "on-failure";
TimeoutStartSec = "infinity";
} // (optionalAttrs (cfg.leaveOnStop) {
- ExecStop = "${cfg.package}/bin/consul leave";
+ ExecStop = "${lib.getExe cfg.package} leave";
});
- path = with pkgs; [ iproute2 gnugrep gawk consul ];
+ path = with pkgs; [ iproute2 gawk cfg.package ];
preStart = let
family = if cfg.forceAddrFamily == "ipv6" then
"-6"
@@ -269,7 +269,7 @@ in
serviceConfig = {
ExecStart = ''
- ${cfg.alerts.package}/bin/consul-alerts start \
+ ${lib.getExe cfg.alerts.package} start \
--alert-addr=${cfg.alerts.listenAddr} \
--consul-addr=${cfg.alerts.consulAddr} \
${optionalString cfg.alerts.watchChecks "--watch-checks"} \
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix
index 8c04542c47..b65bb5f548 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix
@@ -60,13 +60,12 @@ in {
serviceConfig = {
ExecStartPre = lib.optional (cfg.secretFile != null)
- (pkgs.writeShellScript "pre-start" ''
+ ("+" + pkgs.writeShellScript "pre-start" ''
umask 077
export $(xargs < ${cfg.secretFile})
${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile}
chown go-neb ${finalConfigFile}
'');
- PermissionsStartOnly = true;
RuntimeDirectory = "go-neb";
ExecStart = "${pkgs.go-neb}/bin/go-neb";
User = "go-neb";
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix
index 4434fedce1..895467cc67 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix
@@ -185,6 +185,10 @@ in
assertion = cfg.loginAll -> cfg.target == null;
message = "iSCSI target name is set while login on all portals is enabled.";
}
+ {
+ assertion = !config.boot.initrd.systemd.enable;
+ message = "systemd stage 1 does not support iscsi yet.";
+ }
];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ivpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/ivpn.nix
new file mode 100644
index 0000000000..6df630c1f1
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ivpn.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+let
+ cfg = config.services.ivpn;
+in
+with lib;
+{
+ options.services.ivpn = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ This option enables iVPN daemon.
+ This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ boot.kernelModules = [ "tun" ];
+
+ environment.systemPackages = with pkgs; [ ivpn ivpn-service ];
+
+ # iVPN writes to /etc/iproute2/rt_tables
+ networking.iproute2.enable = true;
+ networking.firewall.checkReversePath = "loose";
+
+ systemd.services.ivpn-service = {
+ description = "iVPN daemon";
+ wantedBy = [ "multi-user.target" ];
+ wants = [ "network.target" ];
+ after = [
+ "network-online.target"
+ "NetworkManager.service"
+ "systemd-resolved.service"
+ ];
+ path = [
+ # Needed for mount
+ "/run/wrappers"
+ ];
+ startLimitBurst = 5;
+ startLimitIntervalSec = 20;
+ serviceConfig = {
+ ExecStart = "${pkgs.ivpn-service}/bin/ivpn-service --logging";
+ Restart = "always";
+ RestartSec = 1;
+ };
+ };
+ };
+
+ meta.maintainers = with maintainers; [ ataraxiasjel ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix
index 98c58d2d5d..d221c95ae6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix
@@ -17,7 +17,7 @@ let
ttl ${toString proxy.ttl}
${render proxy.rules (ruleNetworkName: rule: ''
rule ${prefer rule.network ruleNetworkName} {
- ${rule.method}${if rule.method == "iface" then " ${rule.interface}" else ""}
+ ${rule.method}${optionalString (rule.method == "iface") " ${rule.interface}"}
}'')}
}'')}
'');
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netbird.nix b/third_party/nixpkgs/nixos/modules/services/networking/netbird.nix
index 5bd9e9ca61..647c0ce3e6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/netbird.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/netbird.nix
@@ -41,9 +41,10 @@ in {
documentation = [ "https://netbird.io/docs/" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [
+ openresolv
+ ];
serviceConfig = {
- AmbientCapabilities = [ "CAP_NET_ADMIN" ];
- DynamicUser = true;
Environment = [
"NB_CONFIG=/var/lib/netbird/config.json"
"NB_LOG_FILE=console"
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix
index e6344d7ff3..bf7ec19f02 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix
@@ -86,7 +86,7 @@ in
redis.createInstance = mkOption {
type = types.nullOr types.str;
- default = if versionAtLeast config.system.stateVersion "22.05" then "ntopng" else "";
+ default = optionalString (versionAtLeast config.system.stateVersion "22.05") "ntopng";
description = lib.mdDoc ''
Local Redis instance name. Set to `null` to disable
local Redis instance. Defaults to `""` for
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/peroxide.nix b/third_party/nixpkgs/nixos/modules/services/networking/peroxide.nix
index 6cac4bf2f8..885ee1d96c 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/peroxide.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/peroxide.nix
@@ -9,7 +9,7 @@ let
in
{
options.services.peroxide = {
- enable = mkEnableOption (lib.mdDoc "enable");
+ enable = mkEnableOption (lib.mdDoc "peroxide");
package = mkPackageOptionMD pkgs "peroxide" {
default = [ "peroxide" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
index c2c2a370cb..19ab3f1aa4 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
@@ -339,14 +339,9 @@ in
};
preStart = ''
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
- rm -f ${smokepingHome}/cropper
- ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper
- rm -f ${smokepingHome}/css
- ln -s ${cfg.package}/htdocs/css ${smokepingHome}/css
- rm -f ${smokepingHome}/js
- ln -s ${cfg.package}/htdocs/js ${smokepingHome}/js
- rm -f ${smokepingHome}/smokeping.fcgi
- ln -s ${cgiHome} ${smokepingHome}/smokeping.fcgi
+ ln -sf ${cfg.package}/htdocs/css ${smokepingHome}/css
+ ln -sf ${cfg.package}/htdocs/js ${smokepingHome}/js
+ ln -sf ${cgiHome} ${smokepingHome}/smokeping.fcgi
${cfg.package}/bin/smokeping --check --config=${configPath}
${cfg.package}/bin/smokeping --static --config=${configPath}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
index 7932bac9ca..af64969c2f 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix
@@ -169,11 +169,11 @@ in
else (concatStrings (map (i: "--interface=\"${i}\"")
interfaces))} \
-h "${hostKey}" \
- ${if !syslog then "--no-syslog" else ""} \
+ ${optionalString (!syslog) "--no-syslog" } \
${if passwordAuthentication then "--password" else "--no-password" } \
${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
${if rootLogin then "--root-login" else "--no-root-login" } \
- ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
+ ${optionalString (loginShell != null) "--login-shell=\"${loginShell}\"" } \
${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
index 5f225682b7..89ddf82152 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
@@ -474,10 +474,10 @@ in
mkdir -m 0755 -p "$(dirname '${k.path}')"
ssh-keygen \
-t "${k.type}" \
- ${if k ? bits then "-b ${toString k.bits}" else ""} \
- ${if k ? rounds then "-a ${toString k.rounds}" else ""} \
- ${if k ? comment then "-C '${k.comment}'" else ""} \
- ${if k ? openSSHFormat && k.openSSHFormat then "-o" else ""} \
+ ${optionalString (k ? bits) "-b ${toString k.bits}"} \
+ ${optionalString (k ? rounds) "-a ${toString k.rounds}"} \
+ ${optionalString (k ? comment) "-C '${k.comment}'"} \
+ ${optionalString (k ? openSSHFormat && k.openSSHFormat) "-o"} \
-f "${k.path}" \
-N ""
fi
@@ -536,7 +536,7 @@ in
# https://github.com/NixOS/nixpkgs/pull/10155
# https://github.com/NixOS/nixpkgs/pull/41745
services.openssh.authorizedKeysFiles =
- [ "%h/.ssh/authorized_keys" "%h/.ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
+ [ "%h/.ssh/authorized_keys" "/etc/ssh/authorized_keys.d/%u" ];
services.openssh.extraConfig = mkOrder 0
''
@@ -550,7 +550,7 @@ in
'') cfg.ports}
${concatMapStrings ({ port, addr, ... }: ''
- ListenAddress ${addr}${if port != null then ":" + toString port else ""}
+ ListenAddress ${addr}${optionalString (port != null) (":" + toString port)}
'') cfg.listenAddresses}
${optionalString cfgc.setXAuthLocation ''
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix
index 8b1398bfd4..e58526814d 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix
@@ -4,7 +4,7 @@ let
inherit (builtins) toFile;
inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList
- mkIf mkEnableOption mkOption types literalExpression;
+ mkIf mkEnableOption mkOption types literalExpression optionalString;
cfg = config.services.strongswan;
@@ -34,8 +34,8 @@ let
strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
charon {
- ${if managePlugins then "load_modular = no" else ""}
- ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
+ ${optionalString managePlugins "load_modular = no"}
+ ${optionalString managePlugins ("load = " + (concatStringsSep " " enabledPlugins))}
plugins {
stroke {
secrets_file = ${secretsFile}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix
index 4f592fb312..996e9b2253 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix
@@ -154,8 +154,8 @@ in
environment.systemPackages = [ pkgs.stunnel ];
environment.etc."stunnel.cfg".text = ''
- ${ if cfg.user != null then "setuid = ${cfg.user}" else "" }
- ${ if cfg.group != null then "setgid = ${cfg.group}" else "" }
+ ${ optionalString (cfg.user != null) "setuid = ${cfg.user}" }
+ ${ optionalString (cfg.group != null) "setgid = ${cfg.group}" }
debug = ${cfg.logLevel}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wgautomesh.nix b/third_party/nixpkgs/nixos/modules/services/networking/wgautomesh.nix
new file mode 100644
index 0000000000..93227a9b62
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wgautomesh.nix
@@ -0,0 +1,161 @@
+{ lib, config, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.wgautomesh;
+ settingsFormat = pkgs.formats.toml { };
+ configFile =
+ # Have to remove nulls manually as TOML generator will not just skip key
+ # if value is null
+ settingsFormat.generate "wgautomesh-config.toml"
+ (filterAttrs (k: v: v != null)
+ (mapAttrs
+ (k: v:
+ if k == "peers"
+ then map (e: filterAttrs (k: v: v != null) e) v
+ else v)
+ cfg.settings));
+ runtimeConfigFile =
+ if cfg.enableGossipEncryption
+ then "/run/wgautomesh/wgautomesh.toml"
+ else configFile;
+in
+{
+ options.services.wgautomesh = {
+ enable = mkEnableOption (mdDoc "the wgautomesh daemon");
+ logLevel = mkOption {
+ type = types.enum [ "trace" "debug" "info" "warn" "error" ];
+ default = "info";
+ description = mdDoc "wgautomesh log level.";
+ };
+ enableGossipEncryption = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Enable encryption of gossip traffic.";
+ };
+ gossipSecretFile = mkOption {
+ type = types.path;
+ description = mdDoc ''
+ File containing the shared secret key to use for gossip encryption.
+ Required if `enableGossipEncryption` is set.
+ '';
+ };
+ enablePersistence = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Enable persistence of Wireguard peer info between restarts.";
+ };
+ openFirewall = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Automatically open gossip port in firewall (recommended).";
+ };
+ settings = mkOption {
+ type = types.submodule {
+ freeformType = settingsFormat.type;
+ options = {
+
+ interface = mkOption {
+ type = types.str;
+ description = mdDoc ''
+ Wireguard interface to manage (it is NOT created by wgautomesh, you
+ should use another NixOS option to create it such as
+ `networking.wireguard.interfaces.wg0 = {...};`).
+ '';
+ example = "wg0";
+ };
+ gossip_port = mkOption {
+ type = types.port;
+ description = mdDoc ''
+ wgautomesh gossip port, this MUST be the same number on all nodes in
+ the wgautomesh network.
+ '';
+ default = 1666;
+ };
+ lan_discovery = mkOption {
+ type = types.bool;
+ default = true;
+ description = mdDoc "Enable discovery of peers on the same LAN using UDP broadcast.";
+ };
+ upnp_forward_external_port = mkOption {
+ type = types.nullOr types.port;
+ default = null;
+ description = mdDoc ''
+ Public port number to try to redirect to this machine's Wireguard
+ daemon using UPnP IGD.
+ '';
+ };
+ peers = mkOption {
+ type = types.listOf (types.submodule {
+ options = {
+ pubkey = mkOption {
+ type = types.str;
+ description = mdDoc "Wireguard public key of this peer.";
+ };
+ address = mkOption {
+ type = types.str;
+ description = mdDoc ''
+ Wireguard address of this peer (a single IP address, multliple
+ addresses or address ranges are not supported).
+ '';
+ example = "10.0.0.42";
+ };
+ endpoint = mkOption {
+ type = types.nullOr types.str;
+ description = mdDoc ''
+ Bootstrap endpoint for connecting to this Wireguard peer if no
+ other address is known or none are working.
+ '';
+ default = null;
+ example = "wgnode.mydomain.example:51820";
+ };
+ };
+ });
+ default = [ ];
+ description = mdDoc "wgautomesh peer list.";
+ };
+ };
+
+ };
+ default = { };
+ description = mdDoc "Configuration for wgautomesh.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.wgautomesh.settings = {
+ gossip_secret_file = mkIf cfg.enableGossipEncryption "$CREDENTIALS_DIRECTORY/gossip_secret";
+ persist_file = mkIf cfg.enablePersistence "/var/lib/wgautomesh/state";
+ };
+
+ systemd.services.wgautomesh = {
+ path = [ pkgs.wireguard-tools ];
+ environment = { RUST_LOG = "wgautomesh=${cfg.logLevel}"; };
+ description = "wgautomesh";
+ serviceConfig = {
+ Type = "simple";
+
+ ExecStart = "${getExe pkgs.wgautomesh} ${runtimeConfigFile}";
+ Restart = "always";
+ RestartSec = "30";
+ LoadCredential = mkIf cfg.enableGossipEncryption [ "gossip_secret:${cfg.gossipSecretFile}" ];
+
+ ExecStartPre = mkIf cfg.enableGossipEncryption [
+ ''${pkgs.envsubst}/bin/envsubst \
+ -i ${configFile} \
+ -o ${runtimeConfigFile}''
+ ];
+
+ DynamicUser = true;
+ StateDirectory = "wgautomesh";
+ StateDirectoryMode = "0700";
+ RuntimeDirectory = "wgautomesh";
+ AmbientCapabilities = "CAP_NET_ADMIN";
+ CapabilityBoundingSet = "CAP_NET_ADMIN";
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+ networking.firewall.allowedUDPPorts =
+ mkIf cfg.openFirewall [ cfg.settings.gossip_port ];
+ };
+}
+
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix
index 440b617f60..067d5df487 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix
@@ -294,7 +294,7 @@ let
DynamicUser = true;
SupplementaryGroups = optional (serverCfg.useACMEHost != null) certConfig.group;
PrivateTmp = true;
- AmbientCapabilities = optional (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
+ AmbientCapabilities = optionals (serverCfg.listen.port < 1024) [ "CAP_NET_BIND_SERVICE" ];
NoNewPrivileges = true;
RestrictNamespaces = "uts ipc pid user cgroup";
ProtectSystem = "strict";
@@ -340,7 +340,7 @@ let
EnvironmentFile = optional (clientCfg.environmentFile != null) clientCfg.environmentFile;
DynamicUser = true;
PrivateTmp = true;
- AmbientCapabilities = (optional (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optional ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);
+ AmbientCapabilities = (optionals (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optionals ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);
NoNewPrivileges = true;
RestrictNamespaces = "uts ipc pid user cgroup";
ProtectSystem = "strict";
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix b/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix
index b9120f37ba..fb3de7077e 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix
@@ -27,7 +27,7 @@ let
${optionalString srv.unlisted "type = UNLISTED"}
${optionalString (srv.flags != "") "flags = ${srv.flags}"}
socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"}
- ${if srv.port != 0 then "port = ${toString srv.port}" else ""}
+ ${optionalString (srv.port != 0) "port = ${toString srv.port}"}
wait = ${if srv.protocol == "udp" then "yes" else "no"}
user = ${srv.user}
server = ${srv.server}
diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix
index 9ac89e0576..f6a23fb900 100644
--- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix
@@ -317,6 +317,7 @@ in
environment.etc.cups.source = "/var/lib/cups";
services.dbus.packages = [ cups.out ] ++ optional polkitEnabled cups-pk-helper;
+ services.udev.packages = cfg.drivers;
# Allow asswordless printer admin for members of wheel group
security.polkit.extraConfig = mkIf polkitEnabled ''
diff --git a/third_party/nixpkgs/nixos/modules/services/search/qdrant.nix b/third_party/nixpkgs/nixos/modules/services/search/qdrant.nix
index a843c44dbb..e1f7365d95 100644
--- a/third_party/nixpkgs/nixos/modules/services/search/qdrant.nix
+++ b/third_party/nixpkgs/nixos/modules/services/search/qdrant.nix
@@ -100,6 +100,7 @@ in {
after = [ "network.target" ];
serviceConfig = {
+ LimitNOFILE=65536;
ExecStart = "${pkgs.qdrant}/bin/qdrant --config-path ${configFile}";
DynamicUser = true;
Restart = "on-failure";
diff --git a/third_party/nixpkgs/nixos/modules/services/security/authelia.nix b/third_party/nixpkgs/nixos/modules/services/security/authelia.nix
index 143c441c7e..28c5fd0a1d 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/authelia.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/authelia.nix
@@ -336,7 +336,7 @@ in
ProtectProc = "noaccess";
ProtectSystem = "strict";
- RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix
index ead24d1470..93962d40ce 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix
@@ -78,6 +78,13 @@ in
'';
};
+ bantime = mkOption {
+ default = null;
+ type = types.nullOr types.str;
+ example = "10m";
+ description = lib.mdDoc "Number of seconds that a host is banned.";
+ };
+
maxretry = mkOption {
default = 3;
type = types.ints.unsigned;
@@ -202,6 +209,20 @@ in
'';
};
+ extraSettings = mkOption {
+ type = with types; attrsOf (oneOf [ bool ints.positive str ]);
+ default = {};
+ description = lib.mdDoc ''
+ Extra default configuration for all jails (i.e. `[DEFAULT]`). See
+ for an overview.
+ '';
+ example = literalExpression ''
+ {
+ findtime = "15m";
+ }
+ '';
+ };
+
jails = mkOption {
default = { };
example = literalExpression ''
@@ -320,11 +341,18 @@ in
''}
# Miscellaneous options
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
+ ${optionalString (cfg.bantime != null) ''
+ bantime = ${cfg.bantime}
+ ''}
maxretry = ${toString cfg.maxretry}
backend = systemd
# Actions
banaction = ${cfg.banaction}
banaction_allports = ${cfg.banaction-allports}
+ ${optionalString (cfg.extraSettings != {}) ''
+ # Extra settings
+ ${generators.toKeyValue {} cfg.extraSettings}
+ ''}
'';
# Block SSH if there are too many failing connection attempts.
# Benefits from verbose sshd logging to observe failed login attempts,
diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
index 5583c39368..2f19decb5c 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix
@@ -7,6 +7,18 @@ let
serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings);
clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings);
unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings);
+ certPaths = builtins.map builtins.dirOf [ cfg.serverSettings.tls_chain cfg.serverSettings.tls_key ];
+
+ # Merge bind mount paths and remove paths where a prefix is already mounted.
+ # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is alread in the mount
+ # paths, no new bind mount is added. Adding subpaths caused problems on ofborg.
+ hasPrefixInList = list: newPath: lib.any (path: lib.hasPrefix (builtins.toString path) (builtins.toString newPath)) list;
+ mergePaths = lib.foldl' (merged: newPath: let
+ # If the new path is a prefix to some existing path, we need to filter it out
+ filteredPaths = lib.filter (p: !lib.hasPrefix (builtins.toString newPath) (builtins.toString p)) merged;
+ # If a prefix of the new path is already in the list, do not add it
+ filteredNew = if hasPrefixInList filteredPaths newPath then [] else [ newPath ];
+ in filteredPaths ++ filteredNew) [];
defaultServiceConfig = {
BindReadOnlyPaths = [
@@ -16,7 +28,7 @@ let
"-/etc/hosts"
"-/etc/localtime"
];
- CapabilityBoundingSet = "";
+ CapabilityBoundingSet = [];
# ProtectClock= adds DeviceAllow=char-rtc r
DeviceAllow = "";
# Implies ProtectSystem=strict, which re-mounts all paths
@@ -216,22 +228,28 @@ in
description = "kanidm identity management daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- serviceConfig = defaultServiceConfig // {
- StateDirectory = "kanidm";
- StateDirectoryMode = "0700";
- ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
- User = "kanidm";
- Group = "kanidm";
+ serviceConfig = lib.mkMerge [
+ # Merge paths and ignore existing prefixes needs to sidestep mkMerge
+ (defaultServiceConfig // {
+ BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ certPaths);
+ })
+ {
+ StateDirectory = "kanidm";
+ StateDirectoryMode = "0700";
+ ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
+ User = "kanidm";
+ Group = "kanidm";
- AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
- CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
- # This would otherwise override the CAP_NET_BIND_SERVICE capability.
- PrivateUsers = false;
- # Port needs to be exposed to the host network
- PrivateNetwork = false;
- RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
- TemporaryFileSystem = "/:ro";
- };
+ AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+ CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+ # This would otherwise override the CAP_NET_BIND_SERVICE capability.
+ PrivateUsers = lib.mkForce false;
+ # Port needs to be exposed to the host network
+ PrivateNetwork = lib.mkForce false;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+ TemporaryFileSystem = "/:ro";
+ }
+ ];
environment.RUST_LOG = "info";
};
@@ -240,34 +258,32 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
restartTriggers = [ unixConfigFile clientConfigFile ];
- serviceConfig = defaultServiceConfig // {
- CacheDirectory = "kanidm-unixd";
- CacheDirectoryMode = "0700";
- RuntimeDirectory = "kanidm-unixd";
- ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
- User = "kanidm-unixd";
- Group = "kanidm-unixd";
+ serviceConfig = lib.mkMerge [
+ defaultServiceConfig
+ {
+ CacheDirectory = "kanidm-unixd";
+ CacheDirectoryMode = "0700";
+ RuntimeDirectory = "kanidm-unixd";
+ ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
+ User = "kanidm-unixd";
+ Group = "kanidm-unixd";
- BindReadOnlyPaths = [
- "/nix/store"
- "-/etc/resolv.conf"
- "-/etc/nsswitch.conf"
- "-/etc/hosts"
- "-/etc/localtime"
- "-/etc/kanidm"
- "-/etc/static/kanidm"
- "-/etc/ssl"
- "-/etc/static/ssl"
- ];
- BindPaths = [
- # To create the socket
- "/run/kanidm-unixd:/var/run/kanidm-unixd"
- ];
- # Needs to connect to kanidmd
- PrivateNetwork = false;
- RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
- TemporaryFileSystem = "/:ro";
- };
+ BindReadOnlyPaths = [
+ "-/etc/kanidm"
+ "-/etc/static/kanidm"
+ "-/etc/ssl"
+ "-/etc/static/ssl"
+ ];
+ BindPaths = [
+ # To create the socket
+ "/run/kanidm-unixd:/var/run/kanidm-unixd"
+ ];
+ # Needs to connect to kanidmd
+ PrivateNetwork = lib.mkForce false;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+ TemporaryFileSystem = "/:ro";
+ }
+ ];
environment.RUST_LOG = "info";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix
index e3f8e75ca2..12547acabf 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix
@@ -72,15 +72,14 @@ let
} // (getProviderOptions cfg cfg.provider) // cfg.extraConfig;
mapConfig = key: attr:
- if attr != null && attr != [] then (
+ optionalString (attr != null && attr != []) (
if isDerivation attr then mapConfig key (toString attr) else
if (builtins.typeOf attr) == "set" then concatStringsSep " "
(mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else
if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else
if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else
if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else
- "--${key}=${toString attr}")
- else "";
+ "--${key}=${toString attr}");
configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig);
in
diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix
index 11769d4e30..06494ddb63 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix
@@ -72,7 +72,7 @@ in {
EnvironmentFile = cfg.credentialsFile;
ExecStart = ''
${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \
- deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""}
+ deploy agent ${cfg.name} ${optionalString (cfg.profile != null) cfg.profile}
'';
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix
index 85e9509bcc..89157b460b 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-watch-store.nix
@@ -62,7 +62,13 @@ in
after = [ "network-online.target" ];
path = [ config.nix.package ];
wantedBy = [ "multi-user.target" ];
+ unitConfig = {
+ # allow to restart indefinitely
+ StartLimitIntervalSec = 0;
+ };
serviceConfig = {
+ # don't put too much stress on the machine when restarting
+ RestartSec = 1;
# we don't want to kill children processes as those are deployments
KillMode = "process";
Restart = "on-failure";
diff --git a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix
index d75070dea4..82506596bc 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix
@@ -10,6 +10,7 @@ let cfg = config.services.cloud-init;
openssh
shadow
util-linux
+ busybox
] ++ optional cfg.btrfs.enable btrfs-progs
++ optional cfg.ext4.enable e2fsprogs
;
diff --git a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix
index c677088101..9d8a62ec78 100644
--- a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix
+++ b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix
@@ -14,13 +14,17 @@ let
serviceDirectories = cfg.packages;
};
- inherit (lib) mkOption mkIf mkMerge types;
+ inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
in
{
options = {
+ boot.initrd.systemd.dbus = {
+ enable = mkEnableOption (lib.mdDoc "dbus in stage 1") // { visible = false; };
+ };
+
services.dbus = {
enable = mkOption {
@@ -111,6 +115,21 @@ in
];
}
+ (mkIf config.boot.initrd.systemd.dbus.enable {
+ boot.initrd.systemd = {
+ users.messagebus = { };
+ groups.messagebus = { };
+ contents."/etc/dbus-1".source = pkgs.makeDBusConf {
+ inherit (cfg) apparmor;
+ suidHelper = "/bin/false";
+ serviceDirectories = [ pkgs.dbus ];
+ };
+ packages = [ pkgs.dbus ];
+ storePaths = [ "${pkgs.dbus}/bin/dbus-daemon" ];
+ targets.sockets.wants = [ "dbus.socket" ];
+ };
+ })
+
(mkIf (cfg.implementation == "dbus") {
environment.systemPackages = [
pkgs.dbus
diff --git a/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix b/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix
similarity index 58%
rename from third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix
rename to third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix
index 2dd62edab7..18a9e3d5fe 100644
--- a/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix
+++ b/third_party/nixpkgs/nixos/modules/services/video/mediamtx.nix
@@ -3,19 +3,19 @@
with lib;
let
- cfg = config.services.rtsp-simple-server;
- package = pkgs.rtsp-simple-server;
+ cfg = config.services.mediamtx;
+ package = pkgs.mediamtx;
format = pkgs.formats.yaml {};
in
{
options = {
- services.rtsp-simple-server = {
- enable = mkEnableOption (lib.mdDoc "RTSP Simple Server");
+ services.mediamtx = {
+ enable = mkEnableOption (lib.mdDoc "MediaMTX");
settings = mkOption {
description = lib.mdDoc ''
- Settings for rtsp-simple-server.
- Read more at
+ Settings for MediaMTX.
+ Read more at
'';
type = format.type;
@@ -25,7 +25,7 @@ in
"stdout"
];
# we set this so when the user uses it, it just works (see LogsDirectory below). but it's not used by default.
- logFile = "/var/log/rtsp-simple-server/rtsp-simple-server.log";
+ logFile = "/var/log/mediamtx/mediamtx.log";
};
example = {
@@ -40,20 +40,20 @@ in
env = mkOption {
type = with types; attrsOf anything;
- description = lib.mdDoc "Extra environment variables for RTSP Simple Server";
+ description = lib.mdDoc "Extra environment variables for MediaMTX";
default = {};
example = {
- RTSP_CONFKEY = "mykey";
+ MTX_CONFKEY = "mykey";
};
};
};
};
config = mkIf (cfg.enable) {
- # NOTE: rtsp-simple-server watches this file and automatically reloads if it changes
- environment.etc."rtsp-simple-server.yaml".source = format.generate "rtsp-simple-server.yaml" cfg.settings;
+ # NOTE: mediamtx watches this file and automatically reloads if it changes
+ environment.etc."mediamtx.yaml".source = format.generate "mediamtx.yaml" cfg.settings;
- systemd.services.rtsp-simple-server = {
+ systemd.services.mediamtx = {
environment = cfg.env;
after = [ "network.target" ];
@@ -65,15 +65,15 @@ in
serviceConfig = {
DynamicUser = true;
- User = "rtsp-simple-server";
- Group = "rtsp-simple-server";
+ User = "mediamtx";
+ Group = "mediamtx";
- LogsDirectory = "rtsp-simple-server";
+ LogsDirectory = "mediamtx";
# user likely may want to stream cameras, can't hurt to add video group
SupplementaryGroups = "video";
- ExecStart = "${package}/bin/rtsp-simple-server /etc/rtsp-simple-server.yaml";
+ ExecStart = "${package}/bin/mediamtx /etc/mediamtx.yaml";
};
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
index 151fb812dd..f80eb6b4c7 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
@@ -651,6 +651,9 @@ in
preload_link_header = false;
redirect_avatar_requests = false;
pg_force_readonly_mode = false;
+ dns_query_timeout_secs = null;
+ regex_timeout_seconds = 2;
+ allow_impersonation = true;
};
services.redis.servers.discourse =
@@ -1025,8 +1028,8 @@ in
services.postfix = lib.mkIf cfg.mail.incoming.enable {
enable = true;
- sslCert = if cfg.sslCertificate != null then cfg.sslCertificate else "";
- sslKey = if cfg.sslCertificateKey != null then cfg.sslCertificateKey else "";
+ sslCert = lib.optionalString (cfg.sslCertificate != null) cfg.sslCertificate;
+ sslKey = lib.optionalString (cfg.sslCertificateKey != null) cfg.sslCertificateKey;
origin = cfg.hostname;
relayDomains = [ cfg.hostname ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
index c85109b147..3a66763b58 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix
@@ -3,6 +3,8 @@
with lib;
let
+ inherit (lib.options) showOption showFiles;
+
cfg = config.services.dokuwiki;
eachSite = cfg.sites;
user = "dokuwiki";
@@ -63,7 +65,6 @@ let
conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c);
in writePhpFile "local-${hostName}.php" ''
${concatStringsSep "\n" (conf_gen cfg.mergedConfig)}
- ${toString cfg.extraConfig}
'';
dokuwikiPluginsLocalConfig = hostName: cfg: let
@@ -90,13 +91,13 @@ let
page = mkOption {
type = types.str;
- description = "Page or namespace to restrict";
+ description = lib.mdDoc "Page or namespace to restrict";
example = "start";
};
actor = mkOption {
type = types.str;
- description = "User or group to restrict";
+ description = lib.mdDoc "User or group to restrict";
example = "@external";
};
@@ -112,38 +113,69 @@ let
in mkOption {
type = types.enum ((attrValues available) ++ (attrNames available));
apply = x: if isInt x then x else available.${x};
- description = ''
+ description = lib.mdDoc ''
Permission level to restrict the actor(s) to.
See for explanation
'';
example = "read";
};
-
};
};
- siteOpts = { config, lib, name, ... }:
+ # The current implementations of `doRename`, `mkRenamedOptionModule` do not provide the full options path when used with submodules.
+ # They would only show `settings.useacl' instead of `services.dokuwiki.sites."site1.local".settings.useacl'
+ # The partial re-implementation of these functions is done to help users in debugging by showing the full path.
+ mkRenamed = from: to: { config, options, name, ... }: let
+ pathPrefix = [ "services" "dokuwiki" "sites" name ];
+ fromPath = pathPrefix ++ from;
+ fromOpt = getAttrFromPath from options;
+ toOp = getAttrsFromPath to config;
+ toPath = pathPrefix ++ to;
+ in {
+ options = setAttrByPath from (mkOption {
+ visible = false;
+ description = lib.mdDoc "Alias of {option}${showOption toPath}";
+ apply = x: builtins.trace "Obsolete option `${showOption fromPath}' is used. It was renamed to ${showOption toPath}" toOp;
+ });
+ config = mkMerge [
+ {
+ warnings = optional fromOpt.isDefined
+ "The option `${showOption fromPath}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption toPath}'.";
+ }
+ (lib.modules.mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt)
+ ];
+ };
+
+ siteOpts = { options, config, lib, name, ... }:
{
imports = [
- # NOTE: These will sadly not print the absolute argument path but only the name. Related to #96006
- (mkRenamedOptionModule [ "aclUse" ] [ "settings" "useacl" ] )
- (mkRenamedOptionModule [ "superUser" ] [ "settings" "superuser" ] )
- (mkRenamedOptionModule [ "disableActions" ] [ "settings" "disableactions" ] )
- ({ config, options, name, ...}: {
- config.warnings =
- (optional (isString config.pluginsConfig) ''
- Passing plain strings to services.dokuwiki.sites.${name}.pluginsConfig has been deprecated and will not be continue to be supported in the future.
- Please pass structured settings instead.
- '')
- ++ (optional (isString config.acl) ''
- Passing a plain string to services.dokuwiki.sites.${name}.acl has been deprecated and will not continue to be supported in the future.
- Please pass structured settings instead.
- '')
- ++ (optional (config.extraConfig != null) ''
- services.dokuwiki.sites.${name}.extraConfig is deprecated and will be removed in the future.
- Please pass structured settings to services.dokuwiki.sites.${name}.settings instead.
- '')
- ;
+ (mkRenamed [ "aclUse" ] [ "settings" "useacl" ])
+ (mkRenamed [ "superUser" ] [ "settings" "superuser" ])
+ (mkRenamed [ "disableActions" ] [ "settings" "disableactions" ])
+ ({ config, options, ... }: let
+ showPath = suffix: lib.options.showOption ([ "services" "dokuwiki" "sites" name ] ++ suffix);
+ replaceExtraConfig = "Please use `${showPath ["settings"]}' to pass structured settings instead.";
+ ecOpt = options.extraConfig;
+ ecPath = showPath [ "extraConfig" ];
+ in {
+ options.extraConfig = mkOption {
+ visible = false;
+ apply = x: throw "The option ${ecPath} can no longer be used since it's been removed.\n${replaceExtraConfig}";
+ };
+ config.assertions = [
+ {
+ assertion = !ecOpt.isDefined;
+ message = "The option definition `${ecPath}' in ${showFiles ecOpt.files} no longer has any effect; please remove it.\n${replaceExtraConfig}";
+ }
+ {
+ assertion = config.mergedConfig.useacl -> (config.acl != null || config.aclFile != null);
+ message = "Either ${showPath [ "acl" ]} or ${showPath [ "aclFile" ]} is mandatory if ${showPath [ "settings" "useacl" ]} is true";
+ }
+ {
+ assertion = config.usersFile != null -> config.mergedConfig.useacl != false;
+ message = "${showPath [ "settings" "useacl" ]} is required when ${showPath [ "usersFile" ]} is set (Currently defiend as `${config.usersFile}' in ${showFiles options.usersFile.files}).";
+ }
+ ];
})
];
@@ -164,7 +196,7 @@ let
};
acl = mkOption {
- type = with types; nullOr (oneOf [ lines (listOf (submodule aclOpts)) ]);
+ type = with types; nullOr (listOf (submodule aclOpts));
default = null;
example = literalExpression ''
[
@@ -203,7 +235,7 @@ let
};
pluginsConfig = mkOption {
- type = with types; oneOf [lines (attrsOf bool)];
+ type = with types; attrsOf bool;
default = {
authad = false;
authldap = false;
@@ -370,36 +402,21 @@ let
'';
};
- extraConfig = mkOption {
- # This Option is deprecated and only kept until sometime before 23.05 for compatibility reasons
- # FIXME (@e1mo): Actually remember removing this before 23.05.
- visible = false;
- type = types.nullOr types.lines;
- default = null;
- example = ''
- $conf['title'] = 'My Wiki';
- $conf['userewrite'] = 1;
- '';
- description = lib.mdDoc ''
- DokuWiki configuration. Refer to
-
- for details on supported values.
-
- **Note**: Please pass Structured settings via
- `services.dokuwiki.sites.${name}.settings` instead.
- '';
- };
-
# Required for the mkRenamedOptionModule
# TODO: Remove me once https://github.com/NixOS/nixpkgs/issues/96006 is fixed
- # or the aclUse, ... options are removed.
+ # or we don't have any more notes about the removal of extraConfig, ...
warnings = mkOption {
type = types.listOf types.unspecified;
default = [ ];
visible = false;
internal = true;
};
-
+ assertions = mkOption {
+ type = types.listOf types.unspecified;
+ default = [ ];
+ visible = false;
+ internal = true;
+ };
};
};
in
@@ -435,16 +452,7 @@ in
warnings = flatten (mapAttrsToList (_: cfg: cfg.warnings) eachSite);
- assertions = flatten (mapAttrsToList (hostName: cfg:
- [{
- assertion = cfg.mergedConfig.useacl -> (cfg.acl != null || cfg.aclFile != null);
- message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if settings.useacl is true";
- }
- {
- assertion = cfg.usersFile != null -> cfg.mergedConfig.useacl != false;
- message = "services.dokuwiki.sites.${hostName}.settings.useacl must must be true if usersFile is not null";
- }
- ]) eachSite);
+ assertions = flatten (mapAttrsToList (_: cfg: cfg.assertions) eachSite);
services.phpfpm.pools = mapAttrs' (hostName: cfg: (
nameValuePair "dokuwiki-${hostName}" {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix
deleted file mode 100644
index a61aa445f8..0000000000
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix
+++ /dev/null
@@ -1,153 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-let
- cfg = config.services.ihatemoney;
- user = "ihatemoney";
- group = "ihatemoney";
- db = "ihatemoney";
- python3 = config.services.uwsgi.package.python3;
- pkg = python3.pkgs.ihatemoney;
- toBool = x: if x then "True" else "False";
- configFile = pkgs.writeText "ihatemoney.cfg" ''
- from secrets import token_hex
- # load a persistent secret key
- SECRET_KEY_FILE = "/var/lib/ihatemoney/secret_key"
- SECRET_KEY = ""
- try:
- with open(SECRET_KEY_FILE) as f:
- SECRET_KEY = f.read()
- except FileNotFoundError:
- pass
- if not SECRET_KEY:
- print("ihatemoney: generating a new secret key")
- SECRET_KEY = token_hex(50)
- with open(SECRET_KEY_FILE, "w") as f:
- f.write(SECRET_KEY)
- del token_hex
- del SECRET_KEY_FILE
-
- # "normal" configuration
- DEBUG = False
- SQLALCHEMY_DATABASE_URI = '${
- if cfg.backend == "sqlite"
- then "sqlite:////var/lib/ihatemoney/ihatemoney.sqlite"
- else "postgresql:///${db}"}'
- SQLALCHEMY_TRACK_MODIFICATIONS = False
- MAIL_DEFAULT_SENDER = (r"${cfg.defaultSender.name}", r"${cfg.defaultSender.email}")
- ACTIVATE_DEMO_PROJECT = ${toBool cfg.enableDemoProject}
- ADMIN_PASSWORD = r"${toString cfg.adminHashedPassword /*toString null == ""*/}"
- ALLOW_PUBLIC_PROJECT_CREATION = ${toBool cfg.enablePublicProjectCreation}
- ACTIVATE_ADMIN_DASHBOARD = ${toBool cfg.enableAdminDashboard}
- SESSION_COOKIE_SECURE = ${toBool cfg.secureCookie}
- ENABLE_CAPTCHA = ${toBool cfg.enableCaptcha}
- LEGAL_LINK = r"${toString cfg.legalLink}"
-
- ${cfg.extraConfig}
- '';
-in
- {
- options.services.ihatemoney = {
- enable = mkEnableOption (lib.mdDoc "ihatemoney webapp. Note that this will set uwsgi to emperor mode");
- backend = mkOption {
- type = types.enum [ "sqlite" "postgresql" ];
- default = "sqlite";
- description = lib.mdDoc ''
- The database engine to use for ihatemoney.
- If `postgresql` is selected, then a database called
- `${db}` will be created. If you disable this option,
- it will however not be removed.
- '';
- };
- adminHashedPassword = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = lib.mdDoc "The hashed password of the administrator. To obtain it, run `ihatemoney generate_password_hash`";
- };
- uwsgiConfig = mkOption {
- type = types.attrs;
- example = {
- http = ":8000";
- };
- description = lib.mdDoc "Additional configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen.";
- };
- defaultSender = {
- name = mkOption {
- type = types.str;
- default = "Budget manager";
- description = lib.mdDoc "The display name of the sender of ihatemoney emails";
- };
- email = mkOption {
- type = types.str;
- default = "ihatemoney@${config.networking.hostName}";
- defaultText = literalExpression ''"ihatemoney@''${config.networking.hostName}"'';
- description = lib.mdDoc "The email of the sender of ihatemoney emails";
- };
- };
- secureCookie = mkOption {
- type = types.bool;
- default = true;
- description = lib.mdDoc "Use secure cookies. Disable this when ihatemoney is served via http instead of https";
- };
- enableDemoProject = mkEnableOption (lib.mdDoc "access to the demo project in ihatemoney");
- enablePublicProjectCreation = mkEnableOption (lib.mdDoc "permission to create projects in ihatemoney by anyone");
- enableAdminDashboard = mkEnableOption (lib.mdDoc "ihatemoney admin dashboard");
- enableCaptcha = mkEnableOption (lib.mdDoc "a simplistic captcha for some forms");
- legalLink = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = lib.mdDoc "The URL to a page explaining legal statements about your service, eg. GDPR-related information.";
- };
- extraConfig = mkOption {
- type = types.str;
- default = "";
- description = lib.mdDoc "Extra configuration appended to ihatemoney's configuration file. It is a python file, so pay attention to indentation.";
- };
- };
- config = mkIf cfg.enable {
- services.postgresql = mkIf (cfg.backend == "postgresql") {
- enable = true;
- ensureDatabases = [ db ];
- ensureUsers = [ {
- name = user;
- ensurePermissions = {
- "DATABASE ${db}" = "ALL PRIVILEGES";
- };
- } ];
- };
- systemd.services.postgresql = mkIf (cfg.backend == "postgresql") {
- wantedBy = [ "uwsgi.service" ];
- before = [ "uwsgi.service" ];
- };
- systemd.tmpfiles.rules = [
- "d /var/lib/ihatemoney 770 ${user} ${group}"
- ];
- users = {
- users.${user} = {
- isSystemUser = true;
- inherit group;
- };
- groups.${group} = {};
- };
- services.uwsgi = {
- enable = true;
- plugins = [ "python3" ];
- instance = {
- type = "emperor";
- vassals.ihatemoney = {
- type = "normal";
- strict = true;
- immediate-uid = user;
- immediate-gid = group;
- # apparently flask uses threads: https://github.com/spiral-project/ihatemoney/commit/c7815e48781b6d3a457eaff1808d179402558f8c
- enable-threads = true;
- module = "wsgi:application";
- chdir = "${pkg}/${pkg.pythonModule.sitePackages}/ihatemoney";
- env = [ "IHATEMONEY_SETTINGS_FILE_PATH=${configFile}" ];
- pythonPackages = self: [ self.ihatemoney ];
- } // cfg.uwsgiConfig;
- };
- };
- };
- }
-
-
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix
index af0fb38121..f48afd98a6 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix
@@ -156,8 +156,8 @@ in
};
documentation = [
- "https://join-lemmy.org/docs/en/administration/from_scratch.html"
- "https://join-lemmy.org/docs"
+ "https://join-lemmy.org/docs/en/admins/from_scratch.html"
+ "https://join-lemmy.org/docs/en/"
];
wantedBy = [ "multi-user.target" ];
@@ -185,8 +185,8 @@ in
};
documentation = [
- "https://join-lemmy.org/docs/en/administration/from_scratch.html"
- "https://join-lemmy.org/docs"
+ "https://join-lemmy.org/docs/en/admins/from_scratch.html"
+ "https://join-lemmy.org/docs/en/"
];
wantedBy = [ "multi-user.target" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
index 3e1286dc47..cf5329be48 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
@@ -587,6 +587,13 @@ in {
is enabled.
'';
}
+ {
+ assertion = 1 == builtins.length
+ (lib.mapAttrsToList
+ (_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ])
+ cfg.sidekiqProcesses);
+ message = "There must be one and only one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
+ }
];
environment.systemPackages = [ mastodonTootctl ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/monica.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/monica.nix
new file mode 100644
index 0000000000..442044fedb
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/monica.nix
@@ -0,0 +1,468 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+with lib; let
+ cfg = config.services.monica;
+ monica = pkgs.monica.override {
+ dataDir = cfg.dataDir;
+ };
+ db = cfg.database;
+ mail = cfg.mail;
+
+ user = cfg.user;
+ group = cfg.group;
+
+ # shell script for local administration
+ artisan = pkgs.writeScriptBin "monica" ''
+ #! ${pkgs.runtimeShell}
+ cd ${monica}
+ sudo() {
+ if [[ "$USER" != ${user} ]]; then
+ exec /run/wrappers/bin/sudo -u ${user} "$@"
+ else
+ exec "$@"
+ fi
+ }
+ sudo ${pkgs.php}/bin/php artisan "$@"
+ '';
+
+ tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;
+in {
+ options.services.monica = {
+ enable = mkEnableOption (lib.mdDoc "monica");
+
+ user = mkOption {
+ default = "monica";
+ description = lib.mdDoc "User monica runs as.";
+ type = types.str;
+ };
+
+ group = mkOption {
+ default = "monica";
+ description = lib.mdDoc "Group monica runs as.";
+ type = types.str;
+ };
+
+ appKeyFile = mkOption {
+ description = lib.mdDoc ''
+ A file containing the Laravel APP_KEY - a 32 character long,
+ base64 encoded key used for encryption where needed. Can be
+ generated with head -c 32 /dev/urandom | base64
.
+ '';
+ example = "/run/keys/monica-appkey";
+ type = types.path;
+ };
+
+ hostname = lib.mkOption {
+ type = lib.types.str;
+ default =
+ if config.networking.domain != null
+ then config.networking.fqdn
+ else config.networking.hostName;
+ defaultText = lib.literalExpression "config.networking.fqdn";
+ example = "monica.example.com";
+ description = lib.mdDoc ''
+ The hostname to serve monica on.
+ '';
+ };
+
+ appURL = mkOption {
+ description = lib.mdDoc ''
+ The root URL that you want to host monica on. All URLs in monica will be generated using this value.
+ If you change this in the future you may need to run a command to update stored URLs in the database.
+ Command example: php artisan monica:update-url https://old.example.com https://new.example.com
+ '';
+ default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostname}";
+ defaultText = ''http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostname}'';
+ example = "https://example.com";
+ type = types.str;
+ };
+
+ dataDir = mkOption {
+ description = lib.mdDoc "monica data directory";
+ default = "/var/lib/monica";
+ type = types.path;
+ };
+
+ database = {
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = lib.mdDoc "Database host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 3306;
+ description = lib.mdDoc "Database host port.";
+ };
+ name = mkOption {
+ type = types.str;
+ default = "monica";
+ description = lib.mdDoc "Database name.";
+ };
+ user = mkOption {
+ type = types.str;
+ default = user;
+ defaultText = lib.literalExpression "user";
+ description = lib.mdDoc "Database username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/monica-dbpassword";
+ description = lib.mdDoc ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ createLocally = mkOption {
+ type = types.bool;
+ default = true;
+ description = lib.mdDoc "Create the database and database user locally.";
+ };
+ };
+
+ mail = {
+ driver = mkOption {
+ type = types.enum ["smtp" "sendmail"];
+ default = "smtp";
+ description = lib.mdDoc "Mail driver to use.";
+ };
+ host = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = lib.mdDoc "Mail host address.";
+ };
+ port = mkOption {
+ type = types.port;
+ default = 1025;
+ description = lib.mdDoc "Mail host port.";
+ };
+ fromName = mkOption {
+ type = types.str;
+ default = "monica";
+ description = lib.mdDoc "Mail \"from\" name.";
+ };
+ from = mkOption {
+ type = types.str;
+ default = "mail@monica.com";
+ description = lib.mdDoc "Mail \"from\" email.";
+ };
+ user = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "monica";
+ description = lib.mdDoc "Mail username.";
+ };
+ passwordFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ example = "/run/keys/monica-mailpassword";
+ description = lib.mdDoc ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+ encryption = mkOption {
+ type = with types; nullOr (enum ["tls"]);
+ default = null;
+ description = lib.mdDoc "SMTP encryption mechanism to use.";
+ };
+ };
+
+ maxUploadSize = mkOption {
+ type = types.str;
+ default = "18M";
+ example = "1G";
+ description = lib.mdDoc "The maximum size for uploads (e.g. images).";
+ };
+
+ poolConfig = mkOption {
+ type = with types; attrsOf (oneOf [str int bool]);
+ default = {
+ "pm" = "dynamic";
+ "pm.max_children" = 32;
+ "pm.start_servers" = 2;
+ "pm.min_spare_servers" = 2;
+ "pm.max_spare_servers" = 4;
+ "pm.max_requests" = 500;
+ };
+ description = lib.mdDoc ''
+ Options for the monica PHP pool. See the documentation on php-fpm.conf
+ for details on configuration directives.
+ '';
+ };
+
+ nginx = mkOption {
+ type = types.submodule (
+ recursiveUpdate
+ (import ../web-servers/nginx/vhost-options.nix {inherit config lib;}) {}
+ );
+ default = {};
+ example = ''
+ {
+ serverAliases = [
+ "monica.''${config.networking.domain}"
+ ];
+ # To enable encryption and let let's encrypt take care of certificate
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
+ description = lib.mdDoc ''
+ With this option, you can customize the nginx virtualHost settings.
+ '';
+ };
+
+ config = mkOption {
+ type = with types;
+ attrsOf
+ (nullOr
+ (either
+ (oneOf [
+ bool
+ int
+ port
+ path
+ str
+ ])
+ (submodule {
+ options = {
+ _secret = mkOption {
+ type = nullOr str;
+ description = lib.mdDoc ''
+ The path to a file containing the value the
+ option should be set to in the final
+ configuration file.
+ '';
+ };
+ };
+ })));
+ default = {};
+ example = ''
+ {
+ ALLOWED_IFRAME_HOSTS = "https://example.com";
+ WKHTMLTOPDF = "/home/user/bins/wkhtmltopdf";
+ AUTH_METHOD = "oidc";
+ OIDC_NAME = "MyLogin";
+ OIDC_DISPLAY_NAME_CLAIMS = "name";
+ OIDC_CLIENT_ID = "monica";
+ OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"};
+ OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm";
+ OIDC_ISSUER_DISCOVER = true;
+ }
+ '';
+ description = lib.mdDoc ''
+ monica configuration options to set in the
+ .env file.
+
+ Refer to
+ for details on supported values.
+
+ Settings containing secret data should be set to an attribute
+ set containing the attribute _secret - a
+ string pointing to a file containing the value the option
+ should be set to. See the example to get a better picture of
+ this: in the resulting .env file, the
+ OIDC_CLIENT_SECRET key will be set to the
+ contents of the /run/keys/oidc_secret
+ file.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = db.createLocally -> db.user == user;
+ message = "services.monica.database.user must be set to ${user} if services.monica.database.createLocally is set true.";
+ }
+ {
+ assertion = db.createLocally -> db.passwordFile == null;
+ message = "services.monica.database.passwordFile cannot be specified if services.monica.database.createLocally is set to true.";
+ }
+ ];
+
+ services.monica.config = {
+ APP_ENV = "production";
+ APP_KEY._secret = cfg.appKeyFile;
+ APP_URL = cfg.appURL;
+ DB_HOST = db.host;
+ DB_PORT = db.port;
+ DB_DATABASE = db.name;
+ DB_USERNAME = db.user;
+ MAIL_DRIVER = mail.driver;
+ MAIL_FROM_NAME = mail.fromName;
+ MAIL_FROM = mail.from;
+ MAIL_HOST = mail.host;
+ MAIL_PORT = mail.port;
+ MAIL_USERNAME = mail.user;
+ MAIL_ENCRYPTION = mail.encryption;
+ DB_PASSWORD._secret = db.passwordFile;
+ MAIL_PASSWORD._secret = mail.passwordFile;
+ APP_SERVICES_CACHE = "/run/monica/cache/services.php";
+ APP_PACKAGES_CACHE = "/run/monica/cache/packages.php";
+ APP_CONFIG_CACHE = "/run/monica/cache/config.php";
+ APP_ROUTES_CACHE = "/run/monica/cache/routes-v7.php";
+ APP_EVENTS_CACHE = "/run/monica/cache/events.php";
+ SESSION_SECURE_COOKIE = tlsEnabled;
+ };
+
+ environment.systemPackages = [artisan];
+
+ services.mysql = mkIf db.createLocally {
+ enable = true;
+ package = mkDefault pkgs.mariadb;
+ ensureDatabases = [db.name];
+ ensureUsers = [
+ {
+ name = db.user;
+ ensurePermissions = {"${db.name}.*" = "ALL PRIVILEGES";};
+ }
+ ];
+ };
+
+ services.phpfpm.pools.monica = {
+ inherit user group;
+ phpOptions = ''
+ log_errors = on
+ post_max_size = ${cfg.maxUploadSize}
+ upload_max_filesize = ${cfg.maxUploadSize}
+ '';
+ settings = {
+ "listen.mode" = "0660";
+ "listen.owner" = user;
+ "listen.group" = group;
+ } // cfg.poolConfig;
+ };
+
+ services.nginx = {
+ enable = mkDefault true;
+ recommendedTlsSettings = true;
+ recommendedOptimisation = true;
+ recommendedGzipSettings = true;
+ recommendedBrotliSettings = true;
+ recommendedProxySettings = true;
+ virtualHosts.${cfg.hostname} = mkMerge [
+ cfg.nginx
+ {
+ root = mkForce "${monica}/public";
+ locations = {
+ "/" = {
+ index = "index.php";
+ tryFiles = "$uri $uri/ /index.php?$query_string";
+ };
+ "~ \.php$".extraConfig = ''
+ fastcgi_pass unix:${config.services.phpfpm.pools."monica".socket};
+ '';
+ "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {
+ extraConfig = "expires 365d;";
+ };
+ };
+ }
+ ];
+ };
+
+ systemd.services.monica-setup = {
+ description = "Preperation tasks for monica";
+ before = ["phpfpm-monica.service"];
+ after = optional db.createLocally "mysql.service";
+ wantedBy = ["multi-user.target"];
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ User = user;
+ UMask = 077;
+ WorkingDirectory = "${monica}";
+ RuntimeDirectory = "monica/cache";
+ RuntimeDirectoryMode = 0700;
+ };
+ path = [pkgs.replace-secret];
+ script = let
+ isSecret = v: isAttrs v && v ? _secret && isString v._secret;
+ monicaEnvVars = lib.generators.toKeyValue {
+ mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {
+ mkValueString = v:
+ with builtins;
+ if isInt v
+ then toString v
+ else if isString v
+ then v
+ else if true == v
+ then "true"
+ else if false == v
+ then "false"
+ else if isSecret v
+ then hashString "sha256" v._secret
+ else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}";
+ };
+ };
+ secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config);
+ mkSecretReplacement = file: ''
+ replace-secret ${escapeShellArgs [(builtins.hashString "sha256" file) file "${cfg.dataDir}/.env"]}
+ '';
+ secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths;
+ filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [{} null])) cfg.config;
+ monicaEnv = pkgs.writeText "monica.env" (monicaEnvVars filteredConfig);
+ in ''
+ # error handling
+ set -euo pipefail
+
+ # create .env file
+ install -T -m 0600 -o ${user} ${monicaEnv} "${cfg.dataDir}/.env"
+ ${secretReplacements}
+ if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then
+ sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env"
+ fi
+
+ # migrate & seed db
+ ${pkgs.php}/bin/php artisan key:generate --force
+ ${pkgs.php}/bin/php artisan setup:production -v --force
+ '';
+ };
+
+ systemd.services.monica-scheduler = {
+ description = "Background tasks for monica";
+ startAt = "minutely";
+ after = ["monica-setup.service"];
+ serviceConfig = {
+ Type = "oneshot";
+ User = user;
+ WorkingDirectory = "${monica}";
+ ExecStart = "${pkgs.php}/bin/php ${monica}/artisan schedule:run -v";
+ };
+ };
+
+ systemd.tmpfiles.rules = [
+ "d ${cfg.dataDir} 0710 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/app 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/fonts 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/cache 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/sessions 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -"
+ "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -"
+ ];
+
+ users = {
+ users = mkIf (user == "monica") {
+ monica = {
+ inherit group;
+ isSystemUser = true;
+ };
+ "${config.services.nginx.user}".extraGroups = [group];
+ };
+ groups = mkIf (group == "monica") {
+ monica = {};
+ };
+ };
+ };
+}
+
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix
index 5f8d9c5b15..b617e9a593 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/moodle.nix
@@ -56,7 +56,7 @@ let
mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
- phpExt = pkgs.php80.buildEnv {
+ phpExt = pkgs.php81.buildEnv {
extensions = { all, ... }: with all; [ iconv mbstring curl openssl tokenizer soap ctype zip gd simplexml dom intl sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo filter opcache exif sodium ];
extraConfig = "max_input_vars = 5000";
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md
index 7ef3cca281..15c1f2da27 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.md
@@ -132,7 +132,9 @@ Auto updates for Nextcloud apps can be enabled using
Nextcloud supports [server-side encryption (SSE)](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html).
This is not an end-to-end encryption, but can be used to encrypt files that will be persisted
to external storage such as S3. Please note that this won't work anymore when using OpenSSL 3
- for PHP's openssl extension because this is implemented using the legacy cipher RC4.
+ for PHP's openssl extension and **Nextcloud 25 or older** because this is implemented using the
+ legacy cipher RC4. For Nextcloud26 this isn't relevant anymore, because Nextcloud has an RC4 implementation
+ written in native PHP and thus doesn't need `ext-openssl` for that anymore.
If [](#opt-system.stateVersion) is *above* `22.05`,
this is disabled by default. To turn it on again and for further information please refer to
[](#opt-services.nextcloud.enableBrokenCiphersForSSE).
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
index 76a0172747..2824b7ee24 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix
@@ -204,7 +204,7 @@ in {
package = mkOption {
type = types.package;
description = lib.mdDoc "Which package to use for the Nextcloud instance.";
- relatedPackages = [ "nextcloud24" "nextcloud25" "nextcloud26" ];
+ relatedPackages = [ "nextcloud25" "nextcloud26" ];
};
phpPackage = mkOption {
type = types.package;
@@ -712,6 +712,10 @@ in {
See on how to achieve this.
For more context, here is the implementing pull request: https://github.com/NixOS/nixpkgs/pull/198470
+ '')
+ ++ (optional (cfg.enableBrokenCiphersForSSE && versionAtLeast cfg.package.version "26") ''
+ Nextcloud26 supports RC4 without requiring legacy OpenSSL, so
+ `services.nextcloud.enableBrokenCiphersForSSE` can be set to `false`.
'');
services.nextcloud.package = with pkgs;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix
index 7e418f2869..65b3b70c48 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix
@@ -429,7 +429,7 @@ in {
environment = env;
- path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ];
+ path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];
script = ''
#!/bin/sh
@@ -859,7 +859,7 @@ in {
home = cfg.package;
};
})
- (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])
+ (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
index f64254d625..893dfa10ac 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix
@@ -9,6 +9,8 @@ in {
options.services.plausible = {
enable = mkEnableOption (lib.mdDoc "plausible");
+ package = mkPackageOptionMD pkgs "plausible" { };
+
releaseCookiePath = mkOption {
type = with types; either str path;
description = lib.mdDoc ''
@@ -180,12 +182,12 @@ in {
services.epmd.enable = true;
- environment.systemPackages = [ pkgs.plausible ];
+ environment.systemPackages = [ cfg.package ];
systemd.services = mkMerge [
{
plausible = {
- inherit (pkgs.plausible.meta) description;
+ inherit (cfg.package.meta) description;
documentation = [ "https://plausible.io/docs/self-hosting" ];
wantedBy = [ "multi-user.target" ];
after = optional cfg.database.clickhouse.setup "clickhouse.service"
@@ -233,7 +235,7 @@ in {
SMTP_USER_NAME = cfg.mail.smtp.user;
});
- path = [ pkgs.plausible ]
+ path = [ cfg.package ]
++ optional cfg.database.postgres.setup config.services.postgresql.package;
script = ''
export CONFIG_DIR=$CREDENTIALS_DIRECTORY
@@ -241,10 +243,10 @@ in {
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
# setup
- ${pkgs.plausible}/createdb.sh
- ${pkgs.plausible}/migrate.sh
+ ${cfg.package}/createdb.sh
+ ${cfg.package}/migrate.sh
${optionalString cfg.adminUser.activate ''
- if ! ${pkgs.plausible}/init-admin.sh | grep 'already exists'; then
+ if ! ${cfg.package}/init-admin.sh | grep 'already exists'; then
psql -d plausible <<< "UPDATE users SET email_verified=true;"
fi
''}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix
index b0210c8a5d..2268200253 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix
@@ -133,7 +133,7 @@ in {
WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
DynamicUser = true;
PrivateTmp = true;
- ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server";
+ ExecStart = "${pkgs.nodejs_16}/bin/node ${pkgs.wiki-js}/server";
};
};
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
index f9c91fb35d..3a57ef3830 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -54,7 +54,7 @@ in {
serviceConfig = {
ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} ${
- if (cfg.socketType != "unix") then "-s ${cfg.socketType}:${cfg.socketAddress}" else ""
+ optionalString (cfg.socketType != "unix") "-s ${cfg.socketType}:${cfg.socketAddress}"
}";
} // (if cfg.user != null && cfg.group != null then {
User = cfg.user;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix
index 811afe8e0a..0438e12e7d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -64,7 +64,7 @@ let
];
maybeModuleString = moduleName:
- if elem moduleName cfg.enableModules then ''"${moduleName}"'' else "";
+ optionalString (elem moduleName cfg.enableModules) ''"${moduleName}"'';
modulesIncludeString = concatStringsSep ",\n"
(filter (x: x != "") (map maybeModuleString allKnownModules));
@@ -106,15 +106,15 @@ let
static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
index-file.names = ( "index.html" )
- ${if cfg.mod_userdir then ''
+ ${optionalString cfg.mod_userdir ''
userdir.path = "public_html"
- '' else ""}
+ ''}
- ${if cfg.mod_status then ''
+ ${optionalString cfg.mod_status ''
status.status-url = "/server-status"
status.statistics-url = "/server-statistics"
status.config-url = "/server-config"
- '' else ""}
+ ''}
${cfg.extraConfig}
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
index 3d19186e1a..f36fe2a4f4 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix
@@ -256,8 +256,6 @@ let
${proxyCachePathConfig}
- ${vhosts}
-
${optionalString cfg.statusPage ''
server {
listen ${toString cfg.defaultHTTPListenPort};
@@ -275,6 +273,8 @@ let
}
''}
+ ${vhosts}
+
${cfg.appendHttpConfig}
}''}
@@ -318,7 +318,7 @@ let
listenString = { addr, port, ssl, extraParameters ? [], ... }:
# UDP listener for QUIC transport protocol.
- (if ssl && vhost.quic then "
+ (optionalString (ssl && vhost.quic) ("
listen ${addr}:${toString port} quic "
+ optionalString vhost.default "default_server "
+ optionalString vhost.reuseport "reuseport "
@@ -326,7 +326,7 @@ let
let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ];
isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters);
in filter isCompatibleParameter extraParameters))
- + ";" else "")
+ + ";"))
+ "
listen ${addr}:${toString port} "
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix
new file mode 100644
index 0000000000..85783a500d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/stargazer.nix
@@ -0,0 +1,198 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.stargazer;
+ routesFormat = pkgs.formats.ini { };
+ globalFile = pkgs.writeText "global.ini" ''
+ listen = ${concatStringsSep " " cfg.listen}
+ connection-logging = ${boolToString cfg.connectionLogging}
+ log-ip = ${boolToString cfg.ipLog}
+ log-ip-partial = ${boolToString cfg.ipLogPartial}
+ request-timeout = ${toString cfg.requestTimeout}
+ response-timeout = ${toString cfg.responseTimeout}
+
+ [:tls]
+ store = ${toString cfg.store}
+ organization = ${cfg.certOrg}
+ gen-certs = ${boolToString cfg.genCerts}
+ regen-certs = ${boolToString cfg.regenCerts}
+ ${optionalString (cfg.certLifetime != "") "cert-lifetime = ${cfg.certLifetime}"}
+
+ '';
+ routesFile = routesFormat.generate "router.ini" cfg.routes;
+ configFile = pkgs.runCommand "config.ini" { } ''
+ cat ${globalFile} ${routesFile} > $out
+ '';
+in
+{
+ options.services.stargazer = {
+ enable = mkEnableOption (lib.mdDoc "Stargazer Gemini server");
+
+ listen = lib.mkOption {
+ type = types.listOf types.str;
+ default = [ "0.0.0.0" ] ++ optional config.networking.enableIPv6 "[::0]";
+ defaultText = literalExpression ''[ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]"'';
+ example = literalExpression ''[ "10.0.0.12" "[2002:a00:1::]" ]'';
+ description = lib.mdDoc ''
+ Address and port to listen on.
+ '';
+ };
+
+ connectionLogging = lib.mkOption {
+ type = types.bool;
+ default = true;
+ description = lib.mdDoc "Whether or not to log connections to stdout.";
+ };
+
+ ipLog = lib.mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc "Log client IP addresses in the connection log.";
+ };
+
+ ipLogPartial = lib.mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc "Log partial client IP addresses in the connection log.";
+ };
+
+ requestTimeout = lib.mkOption {
+ type = types.int;
+ default = 5;
+ description = lib.mdDoc ''
+ Number of seconds to wait for the client to send a complete
+ request. Set to 0 to disable.
+ '';
+ };
+
+ responseTimeout = lib.mkOption {
+ type = types.int;
+ default = 0;
+ description = lib.mdDoc ''
+ Number of seconds to wait for the client to send a complete
+ request and for stargazer to finish sending the response.
+ Set to 0 to disable.
+ '';
+ };
+
+ store = lib.mkOption {
+ type = types.path;
+ default = /var/lib/gemini/certs;
+ description = lib.mdDoc ''
+ Path to the certificate store on disk. This should be a
+ persistent directory writable by Stargazer.
+ '';
+ };
+
+ certOrg = lib.mkOption {
+ type = types.str;
+ default = "stargazer";
+ description = lib.mdDoc ''
+ The name of the organization responsible for the X.509
+ certificate's /O name.
+ '';
+ };
+
+ genCerts = lib.mkOption {
+ type = types.bool;
+ default = true;
+ description = lib.mdDoc ''
+ Set to false to disable automatic certificate generation.
+ Use if you want to provide your own certs.
+ '';
+ };
+
+ regenCerts = lib.mkOption {
+ type = types.bool;
+ default = true;
+ description = lib.mdDoc ''
+ Set to false to turn off automatic regeneration of expired certificates.
+ Use if you want to provide your own certs.
+ '';
+ };
+
+ certLifetime = lib.mkOption {
+ type = types.str;
+ default = "";
+ description = lib.mdDoc ''
+ How long certs generated by Stargazer should live for.
+ Certs live forever by default.
+ '';
+ example = literalExpression "\"1y\"";
+ };
+
+ routes = lib.mkOption {
+ type = routesFormat.type;
+ default = { };
+ description = lib.mdDoc ''
+ Routes that Stargazer should server.
+
+ [Refer to upstream docs](https://git.sr.ht/~zethra/stargazer/tree/main/item/doc/stargazer.ini.5.txt)
+ '';
+ example = literalExpression ''
+ {
+ "example.com" = {
+ root = "/srv/gemini/example.com";
+ };
+ "example.com:/man" = {
+ root = "/cgi-bin";
+ cgi = true;
+ };
+ "other.org~(.*)" = {
+ redirect = "gemini://example.com";
+ rewrite = "\1";
+ };
+ }
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "stargazer";
+ description = lib.mdDoc "User account under which stargazer runs.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "stargazer";
+ description = lib.mdDoc "Group account under which stargazer runs.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.stargazer = {
+ description = "Stargazer gemini server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.stargazer}/bin/stargazer ${configFile}";
+ Restart = "always";
+ # User and group
+ User = cfg.user;
+ Group = cfg.group;
+ };
+ };
+
+ # Create default cert store
+ system.activationScripts.makeStargazerCertDir =
+ optionalAttrs (cfg.store == /var/lib/gemini/certs) ''
+ mkdir -p /var/lib/gemini/certs
+ chown -R ${cfg.user}:${cfg.group} /var/lib/gemini/certs
+ '';
+
+ users.users = optionalAttrs (cfg.user == "stargazer") {
+ stargazer = {
+ group = cfg.group;
+ isSystemUser = true;
+ };
+ };
+
+ users.groups = optionalAttrs (cfg.group == "stargazer") {
+ stargazer = { };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ gaykitty ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix
index d8bfee547c..4d2c36287b 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix
@@ -234,11 +234,11 @@ in
ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
done
- ${if cfg.extraConfigFiles != [] then ''
+ ${optionalString (cfg.extraConfigFiles != []) ''
for i in ${toString cfg.extraConfigFiles}; do
ln -sfn $i ${cfg.baseDir}/conf/`basename $i`
done
- '' else ""}
+ ''}
# Create a modified catalina.properties file
# Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
@@ -345,7 +345,7 @@ in
# Symlink all the given web applications files or paths into the webapps/ directory
# of this virtual host
- for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"; do
+ for i in "${optionalString (virtualHost ? webapps) (toString virtualHost.webapps)}"; do
if [ -f $i ]; then
# If the given web application is a file, symlink it into the webapps/ directory
ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix
index 6e6d5ef3fa..2eff81750d 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix
@@ -12,10 +12,37 @@ let
inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;
inherit nixos-background-dark nixos-background-light;
};
+
+ nixos-background-info = pkgs.writeTextFile {
+ name = "nixos-background-info";
+ text = ''
+
+
+
+
+ Nineish
+ ${nixos-background-light.gnomeFilePath}
+ zoom
+ solid
+ #d1dcf8
+ #e3ebfe
+
+
+ Nineish Dark Gray
+ ${nixos-background-dark.gnomeFilePath}
+ zoom
+ solid
+ #151515
+ #262626
+
+
+ '';
+ destination = "/share/gnome-background-properties/nixos.xml";
+ };
in {
options = {
services.xserver.desktopManager.budgie = {
- enable = mkEnableOption (mdDoc "Budgie desktop");
+ enable = mkEnableOption (mdDoc "the Budgie desktop");
sessionPath = mkOption {
description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";
@@ -35,6 +62,12 @@ in {
type = with types; listOf path;
default = [];
};
+
+ extraPlugins = mkOption {
+ description = mdDoc "Extra plugins for the Budgie desktop";
+ type = with types; listOf package;
+ default = [];
+ };
};
environment.budgie.excludePackages = mkOption {
@@ -76,16 +109,19 @@ in {
# Budgie Desktop.
budgie.budgie-backgrounds
budgie.budgie-control-center
- budgie.budgie-desktop
+ (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; })
budgie.budgie-desktop-view
budgie.budgie-screensaver
# Required by the Budgie Desktop session.
- (gnome.gnome-session.override {gnomeShellSupport = false;})
+ (gnome.gnome-session.override { gnomeShellSupport = false; })
# Required by Budgie Menu.
gnome-menus
+ # Required by Budgie Control Center.
+ gnome.zenity
+
# Provides `gsettings`.
glib
@@ -106,6 +142,7 @@ in {
# Desktop themes.
qogir-theme
qogir-icon-theme
+ nixos-background-info
# Default settings.
nixos-gsettings-overrides
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 4d0296c825..ab4d75b101 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -288,7 +288,7 @@ in
elementary-music
elementary-photos
elementary-screenshot
- # elementary-tasks
+ elementary-tasks
elementary-terminal
elementary-videos
epiphany
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 73a864bb95..38f932ffb4 100644
--- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -429,7 +429,8 @@ in
dolphin-plugins
ffmpegthumbs
kdegraphics-thumbnailers
- pkgs.kio-admin
+ kde-inotify-survey
+ kio-admin
kio-extras
];
optionalPackages = [
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.cue b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.cue
index 9f857a1b1c..1f7b4afa87 100644
--- a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.cue
+++ b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.cue
@@ -1,4 +1,6 @@
-#V1: {
+import "struct"
+
+#BootspecV1: {
system: string
init: string
initrd?: string
@@ -7,12 +9,23 @@
kernelParams: [...string]
label: string
toplevel: string
- specialisation?: {
- [=~"^"]: #V1
- }
- extensions?: {...}
}
-Document: {
- v1: #V1
+// A restricted document does not allow any official specialisation
+// information in it to avoid "recursive specialisations".
+#RestrictedDocument: struct.MinFields(1) & {
+ "org.nixos.bootspec.v1": #BootspecV1
+ [=~"^"]: #BootspecExtension
+}
+
+// Specialisations are a hashmap of strings
+#BootspecSpecialisationV1: [string]: #RestrictedDocument
+
+// Bootspec extensions are defined by the extension author.
+#BootspecExtension: {...}
+
+// A "full" document allows official specialisation information
+// in the top-level with a reserved namespaced key.
+Document: #RestrictedDocument & {
+ "org.nixos.specialisation.v1"?: #BootspecSpecialisationV1
}
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix
index 1055ed1dda..677bd562d1 100644
--- a/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix
+++ b/third_party/nixpkgs/nixos/modules/system/activation/bootspec.nix
@@ -16,20 +16,20 @@ let
filename = "boot.json";
json =
pkgs.writeText filename
- (builtins.toJSON
+ (builtins.toJSON
+ # Merge extensions first to not let them shadow NixOS bootspec data.
+ (cfg.extensions //
{
- v1 = {
+ "org.nixos.bootspec.v1" = {
system = config.boot.kernelPackages.stdenv.hostPlatform.system;
kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}";
kernelParams = config.boot.kernelParams;
label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})";
-
- inherit (cfg) extensions;
} // lib.optionalAttrs config.boot.initrd.enable {
initrd = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
initrdSecrets = "${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets";
};
- });
+ }));
generator =
let
@@ -42,8 +42,8 @@ let
toplevelInjector = lib.escapeShellArgs [
"${pkgs.jq}/bin/jq"
''
- .v1.toplevel = $toplevel |
- .v1.init = $init
+ ."org.nixos.bootspec.v1".toplevel = $toplevel |
+ ."org.nixos.bootspec.v1".init = $init
''
"--sort-keys"
"--arg" "toplevel" "${placeholder "out"}"
@@ -62,14 +62,10 @@ let
lib.escapeShellArgs [
"${pkgs.jq}/bin/jq"
"--sort-keys"
- ".v1.specialisation = ($ARGS.named | map_values(. | first | .v1))"
+ ''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))''
] + " ${lib.concatStringsSep " " specialisationLoader}";
in
- ''
- mkdir -p $out/bootspec
-
- ${toplevelInjector} | ${specialisationInjector} > $out/${filename}
- '';
+ "${toplevelInjector} | ${specialisationInjector} > $out/${filename}";
validator = pkgs.writeCueValidator ./bootspec.cue {
document = "Document"; # Universal validator for any version as long the schema is correctly set.
@@ -79,10 +75,17 @@ let
in
{
options.boot.bootspec = {
- enable = lib.mkEnableOption (lib.mdDoc "Enable generation of RFC-0125 bootspec in $system/bootspec, e.g. /run/current-system/bootspec");
+ enable = lib.mkEnableOption (lib.mdDoc "the generation of RFC-0125 bootspec in $system/boot.json, e.g. /run/current-system/boot.json")
+ // { default = true; internal = true; };
+ enableValidation = lib.mkEnableOption (lib.mdDoc ''the validation of bootspec documents for each build.
+ This will introduce Go in the build-time closure as we are relying on [Cuelang](https://cuelang.org/) for schema validation.
+ Enable this option if you want to ascertain that your documents are correct.
+ ''
+ );
extensions = lib.mkOption {
- type = lib.types.attrsOf lib.types.attrs; # : { ...namespace-specific fields }
+ # NOTE(RaitoBezarius): this is not enough to validate: extensions."osRelease" = drv; those are picked up by cue validation.
+ type = lib.types.attrsOf lib.types.anything; # : { ...namespace-specific fields }
default = { };
description = lib.mdDoc ''
User-defined data that extends the bootspec document.
@@ -112,15 +115,4 @@ in
default = schemas.v1.filename;
};
};
-
- config = lib.mkIf (cfg.enable) {
- warnings = [
- ''RFC-0125 is not merged yet, this is a feature preview of bootspec.
- The schema is not definitive and features are not guaranteed to be stable until RFC-0125 is merged.
- See:
- - https://github.com/NixOS/nixpkgs/pull/172237 to track merge status in nixpkgs.
- - https://github.com/NixOS/rfcs/pull/125 to track RFC status.
- ''
- ];
- };
}
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix
index 74ab7070fd..f2e7413547 100644
--- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix
+++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix
@@ -82,7 +82,8 @@ let
${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) ''
${config.boot.bootspec.writer}
- ${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"
+ ${optionalString config.boot.bootspec.enableValidation
+ ''${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"''}
''}
${config.system.extraSystemBuilderCmds}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix
index cceb02c1a7..b003d983d2 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix
@@ -125,6 +125,10 @@ let
magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
};
+ loongarch64-linux = {
+ magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01'';
+ mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+ };
wasm32-wasi = {
magicOrExtension = ''\x00asm'';
mask = ''\xff\xff\xff\xff'';
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix b/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix
index 034b2b9906..a2764187a5 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/grow-partition.nix
@@ -17,6 +17,11 @@ with lib;
config = mkIf config.boot.growPartition {
+ assertions = [{
+ assertion = !config.boot.initrd.systemd.enable;
+ message = "systemd stage 1 does not support 'boot.growPartition' yet.";
+ }];
+
boot.initrd.extraUtilsCommands = ''
copy_bin_and_libs ${pkgs.gawk}/bin/gawk
copy_bin_and_libs ${pkgs.gnused}/bin/sed
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix
index a1017c3e24..e8bbf1d040 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix
@@ -67,11 +67,15 @@ in
boot.initrd.network.flushBeforeStage2 = mkOption {
type = types.bool;
- default = true;
+ default = !config.boot.initrd.systemd.enable;
+ defaultText = "!config.boot.initrd.systemd.enable";
description = lib.mdDoc ''
Whether to clear the configuration of the interfaces that were set up in
the initrd right before stage 2 takes over. Stage 2 will do the regular network
configuration based on the NixOS networking options.
+
+ The default is false when systemd is enabled in initrd,
+ because the systemd-networkd documentation suggests it.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix
index cbc61d55d6..2530240628 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix
@@ -51,7 +51,7 @@ in
# Add openvpn and ip binaries to the initrd
# The shared libraries are required for DNS resolution
- boot.initrd.extraUtilsCommands = ''
+ boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn
copy_bin_and_libs ${pkgs.iproute2}/bin/ip
@@ -59,18 +59,33 @@ in
cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib
'';
+ boot.initrd.systemd.storePaths = [
+ "${pkgs.openvpn}/bin/openvpn"
+ "${pkgs.iproute2}/bin/ip"
+ "${pkgs.glibc}/lib/libresolv.so.2"
+ "${pkgs.glibc}/lib/libnss_dns.so.2"
+ ];
+
boot.initrd.secrets = {
"/etc/initrd.ovpn" = cfg.configuration;
};
# openvpn --version would exit with 1 instead of 0
- boot.initrd.extraUtilsCommandsTest = ''
+ boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
$out/bin/openvpn --show-gateway
'';
- boot.initrd.network.postCommands = ''
+ boot.initrd.network.postCommands = mkIf (!config.boot.initrd.systemd.enable) ''
openvpn /etc/initrd.ovpn &
'';
+
+ boot.initrd.systemd.services.openvpn = {
+ wantedBy = [ "initrd.target" ];
+ path = [ pkgs.iproute2 ];
+ after = [ "network.target" "initrd-nixos-copy-secrets.service" ];
+ serviceConfig.ExecStart = "${pkgs.openvpn}/bin/openvpn /etc/initrd.ovpn";
+ serviceConfig.Type = "notify";
+ };
};
}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix
index 125f75d667..60c5ff62ff 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix
@@ -5,6 +5,10 @@ with lib;
let
cfg = config.boot.initrd.network.ssh;
+ shell = if cfg.shell == null then "/bin/ash" else cfg.shell;
+ inherit (config.programs.ssh) package;
+
+ enabled = let initrd = config.boot.initrd; in (initrd.network.enable || initrd.systemd.network.enable) && cfg.enable;
in
@@ -33,8 +37,9 @@ in
};
shell = mkOption {
- type = types.str;
- default = "/bin/ash";
+ type = types.nullOr types.str;
+ default = null;
+ defaultText = ''"/bin/ash"'';
description = lib.mdDoc ''
Login shell of the remote user. Can be used to limit actions user can do.
'';
@@ -119,9 +124,11 @@ in
sshdCfg = config.services.openssh;
sshdConfig = ''
+ UsePAM no
Port ${toString cfg.port}
PasswordAuthentication no
+ AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u
ChallengeResponseAuthentication no
${flip concatMapStrings cfg.hostKeys (path: ''
@@ -142,7 +149,7 @@ in
${cfg.extraConfig}
'';
- in mkIf (config.boot.initrd.network.enable && cfg.enable) {
+ in mkIf enabled {
assertions = [
{
assertion = cfg.authorizedKeys != [];
@@ -157,14 +164,19 @@ in
for instructions.
'';
}
+
+ {
+ assertion = config.boot.initrd.systemd.enable -> cfg.shell == null;
+ message = "systemd stage 1 does not support boot.initrd.network.ssh.shell";
+ }
];
- boot.initrd.extraUtilsCommands = ''
- copy_bin_and_libs ${pkgs.openssh}/bin/sshd
+ boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
+ copy_bin_and_libs ${package}/bin/sshd
cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
'';
- boot.initrd.extraUtilsCommandsTest = ''
+ boot.initrd.extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
# sshd requires a host key to check config, so we pass in the test's
tmpkey="$(mktemp initrd-ssh-testkey.XXXXXXXXXX)"
cp "${../../../tests/initrd-network-ssh/ssh_host_ed25519_key}" "$tmpkey"
@@ -176,9 +188,9 @@ in
rm "$tmpkey"
'';
- boot.initrd.network.postCommands = ''
- echo '${cfg.shell}' > /etc/shells
- echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+ boot.initrd.network.postCommands = mkIf (!config.boot.initrd.systemd.enable) ''
+ echo '${shell}' > /etc/shells
+ echo 'root:x:0:0:root:/root:${shell}' > /etc/passwd
echo 'sshd:x:1:1:sshd:/var/empty:/bin/nologin' >> /etc/passwd
echo 'passwd: files' > /etc/nsswitch.conf
@@ -204,7 +216,7 @@ in
/bin/sshd -e
'';
- boot.initrd.postMountCommands = ''
+ boot.initrd.postMountCommands = mkIf (!config.boot.initrd.systemd.enable) ''
# Stop sshd cleanly before stage 2.
#
# If you want to keep it around to debug post-mount SSH issues,
@@ -217,6 +229,38 @@ in
boot.initrd.secrets = listToAttrs
(map (path: nameValuePair (initrdKeyPath path) path) cfg.hostKeys);
+
+ # Systemd initrd stuff
+ boot.initrd.systemd = mkIf config.boot.initrd.systemd.enable {
+ users.sshd = { uid = 1; group = "sshd"; };
+ groups.sshd = { gid = 1; };
+
+ contents."/etc/ssh/authorized_keys.d/root".text =
+ concatStringsSep "\n" config.boot.initrd.network.ssh.authorizedKeys;
+ contents."/etc/ssh/sshd_config".text = sshdConfig;
+ storePaths = ["${package}/bin/sshd"];
+
+ services.sshd = {
+ description = "SSH Daemon";
+ wantedBy = ["initrd.target"];
+ after = ["network.target" "initrd-nixos-copy-secrets.service"];
+
+ # Keys from Nix store are world-readable, which sshd doesn't
+ # like. If this were a real nix store and not the initrd, we
+ # neither would nor could do this
+ preStart = flip concatMapStrings cfg.hostKeys (path: ''
+ /bin/chmod 0600 "${initrdKeyPath path}"
+ '');
+ unitConfig.DefaultDependencies = false;
+ serviceConfig = {
+ ExecStart = "${package}/bin/sshd -D -f /etc/ssh/sshd_config";
+ Type = "simple";
+ KillMode = "process";
+ Restart = "on-failure";
+ };
+ };
+ };
+
};
}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix
index 121d7e88e7..5c0a07fb51 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix
@@ -33,7 +33,7 @@ let
then realGrub.override { efiSupport = cfg.efiSupport; }
else null;
- f = x: if x == null then "" else "" + x;
+ f = x: optionalString (x != null) ("" + x);
grubConfig = args:
let
@@ -52,7 +52,7 @@ let
fullName = lib.getName realGrub;
fullVersion = lib.getVersion realGrub;
grubEfi = f grubEfi;
- grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
+ grubTargetEfi = optionalString (cfg.efiSupport && (cfg.version == 2)) (f (grubEfi.grubTarget or ""));
bootPath = args.path;
storePath = config.boot.loader.grub.storePath;
bootloaderId = if args.efiBootloaderId == null then "${config.system.nixos.distroName}${efiSysMountPoint'}" else args.efiBootloaderId;
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index c924519972..a040518a5a 100755
--- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -302,8 +302,12 @@ def main() -> None:
if is_default:
write_loader_conf(*gen)
except OSError as e:
- profile = f"profile '{gen.profile}'" if gen.profile else "default profile"
- print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
+ # See https://github.com/NixOS/nixpkgs/issues/114552
+ if e.errno == errno.EINVAL:
+ profile = f"profile '{gen.profile}'" if gen.profile else "default profile"
+ print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
+ else:
+ raise e
for root, _, files in os.walk('@efiSysMountPoint@/efi/nixos/.extra-files', topdown=False):
relative_root = root.removeprefix("@efiSysMountPoint@/efi/nixos/.extra-files").removeprefix("/")
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 757dc080d4..8a3e89e588 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -20,7 +20,7 @@ let
nix = config.nix.package.out;
- timeout = if config.boot.loader.timeout != null then config.boot.loader.timeout else "";
+ timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout;
editor = if cfg.editor then "True" else "False";
@@ -32,9 +32,9 @@ let
inherit (config.system.nixos) distroName;
- memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else "";
+ memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86-efi;
- netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else "";
+ netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi;
copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''
empty_file=$(${pkgs.coreutils}/bin/mktemp)
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix
index 8954c90812..b8f36538e7 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix
@@ -1024,13 +1024,12 @@ in
copy_bin_and_libs ${pkgs.gnupg}/libexec/scdaemon
${concatMapStringsSep "\n" (x:
- if x.gpgCard != null then
+ optionalString (x.gpgCard != null)
''
mkdir -p $out/secrets/gpg-keys/${x.device}
cp -a ${x.gpgCard.encryptedPass} $out/secrets/gpg-keys/${x.device}/cryptkey.gpg
cp -a ${x.gpgCard.publicKey} $out/secrets/gpg-keys/${x.device}/pubkey.asc
''
- else ""
) (attrValues luks.devices)
}
''}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
index 05a667a09e..e6b96433e8 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
@@ -6,8 +6,6 @@ with lib;
let
- cfg = config.systemd.network;
-
check = {
global = {
@@ -2941,16 +2939,14 @@ let
+ def.extraConfig;
};
- unitFiles = listToAttrs (map (name: {
- name = "systemd/network/${name}";
+ mkUnitFiles = prefix: cfg: listToAttrs (map (name: {
+ name = "${prefix}systemd/network/${name}";
value.source = "${cfg.units.${name}.unit}/${name}";
}) (attrNames cfg.units));
-in
-{
- options = {
+ commonOptions = visible: {
- systemd.network.enable = mkOption {
+ enable = mkOption {
default = false;
type = types.bool;
description = lib.mdDoc ''
@@ -2958,31 +2954,35 @@ in
'';
};
- systemd.network.links = mkOption {
+ links = mkOption {
default = {};
+ inherit visible;
type = with types; attrsOf (submodule [ { options = linkOptions; } ]);
description = lib.mdDoc "Definition of systemd network links.";
};
- systemd.network.netdevs = mkOption {
+ netdevs = mkOption {
default = {};
+ inherit visible;
type = with types; attrsOf (submodule [ { options = netdevOptions; } ]);
description = lib.mdDoc "Definition of systemd network devices.";
};
- systemd.network.networks = mkOption {
+ networks = mkOption {
default = {};
+ inherit visible;
type = with types; attrsOf (submodule [ { options = networkOptions; } networkConfig ]);
description = lib.mdDoc "Definition of systemd networks.";
};
- systemd.network.config = mkOption {
+ config = mkOption {
default = {};
+ inherit visible;
type = with types; submodule [ { options = networkdOptions; } networkdConfig ];
description = lib.mdDoc "Definition of global systemd network config.";
};
- systemd.network.units = mkOption {
+ units = mkOption {
description = lib.mdDoc "Definition of networkd units.";
default = {};
internal = true;
@@ -2995,7 +2995,7 @@ in
}));
};
- systemd.network.wait-online = {
+ wait-online = {
enable = mkOption {
type = types.bool;
default = true;
@@ -3051,12 +3051,11 @@ in
};
- config = mkMerge [
+ commonConfig = config: let cfg = config.systemd.network; in mkMerge [
# .link units are honored by udev, no matter if systemd-networkd is enabled or not.
{
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links;
- environment.etc = unitFiles;
systemd.network.wait-online.extraArgs =
[ "--timeout=${toString cfg.wait-online.timeout}" ]
@@ -3066,14 +3065,6 @@ in
(mkIf config.systemd.network.enable {
- users.users.systemd-network.group = "systemd-network";
-
- systemd.additionalUpstreamSystemUnits = [
- "systemd-networkd-wait-online.service"
- "systemd-networkd.service"
- "systemd-networkd.socket"
- ];
-
systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
@@ -3082,14 +3073,6 @@ in
# networkd.
systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ];
- systemd.services.systemd-networkd = {
- wantedBy = [ "multi-user.target" ];
- aliases = [ "dbus-org.freedesktop.network1.service" ];
- restartTriggers = map (x: x.source) (attrValues unitFiles) ++ [
- config.environment.etc."systemd/networkd.conf".source
- ];
- };
-
systemd.services.systemd-networkd-wait-online = {
inherit (cfg.wait-online) enable;
wantedBy = [ "network-online.target" ];
@@ -3111,8 +3094,37 @@ in
};
};
+ })
+ ];
+
+ stage2Config = let
+ cfg = config.systemd.network;
+ unitFiles = mkUnitFiles "" cfg;
+ in mkMerge [
+ (commonConfig config)
+
+ { environment.etc = unitFiles; }
+
+ (mkIf config.systemd.network.enable {
+
+ users.users.systemd-network.group = "systemd-network";
+
+ systemd.additionalUpstreamSystemUnits = [
+ "systemd-networkd-wait-online.service"
+ "systemd-networkd.service"
+ "systemd-networkd.socket"
+ ];
+
environment.etc."systemd/networkd.conf" = renderConfig cfg.config;
+ systemd.services.systemd-networkd = {
+ wantedBy = [ "multi-user.target" ];
+ restartTriggers = map (x: x.source) (attrValues unitFiles) ++ [
+ config.environment.etc."systemd/networkd.conf".source
+ ];
+ aliases = [ "dbus-org.freedesktop.network1.service" ];
+ };
+
networking.iproute2 = mkIf (cfg.config.addRouteTablesToIPRoute2 && cfg.config.routeTables != { }) {
enable = mkDefault true;
rttablesExtraConfig = ''
@@ -3123,6 +3135,117 @@ in
};
services.resolved.enable = mkDefault true;
+
+ })
+ ];
+
+ stage1Config = let
+ cfg = config.boot.initrd.systemd.network;
+ in mkMerge [
+ (commonConfig config.boot.initrd)
+
+ {
+ systemd.network.enable = mkDefault config.boot.initrd.network.enable;
+ systemd.contents = mkUnitFiles "/etc/" cfg;
+
+ # Networkd link files are used early by udev to set up interfaces early.
+ # This must be done in stage 1 to avoid race conditions between udev and
+ # network daemons.
+ systemd.network.units = lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units;
+ systemd.storePaths = ["${config.boot.initrd.systemd.package}/lib/systemd/network/99-default.link"];
+ }
+
+ (mkIf cfg.enable {
+
+ systemd.package = pkgs.systemdStage1Network;
+
+ # For networkctl
+ systemd.dbus.enable = mkDefault true;
+
+ systemd.additionalUpstreamUnits = [
+ "systemd-networkd-wait-online.service"
+ "systemd-networkd.service"
+ "systemd-networkd.socket"
+ "systemd-network-generator.service"
+ "network-online.target"
+ "network-pre.target"
+ "network.target"
+ "nss-lookup.target"
+ "nss-user-lookup.target"
+ "remote-fs-pre.target"
+ "remote-fs.target"
+ ];
+ systemd.users.systemd-network = {};
+ systemd.groups.systemd-network = {};
+
+ systemd.contents."/etc/systemd/networkd.conf" = renderConfig cfg.config;
+
+ systemd.services.systemd-networkd.wantedBy = [ "initrd.target" ];
+ systemd.services.systemd-network-generator.wantedBy = [ "sysinit.target" ];
+
+ systemd.storePaths = [
+ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-networkd"
+ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-networkd-wait-online"
+ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-network-generator"
+ ];
+ kernelModules = [ "af_packet" ];
+
+ systemd.services.nixos-flush-networkd = mkIf config.boot.initrd.network.flushBeforeStage2 {
+ description = "Flush Network Configuration";
+ wantedBy = ["initrd.target"];
+ after = ["systemd-networkd.service" "dbus.socket" "dbus.service"];
+ before = ["shutdown.target" "initrd-switch-root.target"];
+ conflicts = ["shutdown.target" "initrd-switch-root.target"];
+ unitConfig.DefaultDependencies = false;
+ serviceConfig = {
+ # This service does nothing when starting, but brings down
+ # interfaces when switching root. This is the easiest way to
+ # ensure proper ordering while stopping. See systemd.unit(5)
+ # section on Before= and After=. The important part is that
+ # we are stopped before units we need, like dbus.service,
+ # and that we are stopped before starting units like
+ # initrd-switch-root.target
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "/bin/true";
+ };
+ # systemd-networkd doesn't bring down interfaces on its own
+ # when it exits (see: systemd-networkd(8)), so we have to do
+ # it ourselves. The networkctl command doesn't have a way to
+ # bring all interfaces down, so we have to iterate over the
+ # list and filter out unmanaged interfaces to bring them down
+ # individually.
+ preStop = ''
+ networkctl list --full --no-legend | while read _idx link _type _operational setup _; do
+ [ "$setup" = unmanaged ] && continue
+ networkctl down "$link"
+ done
+ '';
+ };
+
+ })
+ ];
+
+in
+
+{
+ options = {
+ systemd.network = commonOptions true;
+ boot.initrd.systemd.network = commonOptions "shallow";
+ };
+
+ config = mkMerge [
+ stage2Config
+ (mkIf config.boot.initrd.systemd.enable {
+ assertions = [{
+ assertion = config.boot.initrd.network.udhcpc.extraArgs == [];
+ message = ''
+ boot.initrd.network.udhcpc.extraArgs is not supported when
+ boot.initrd.systemd.enable is enabled
+ '';
+ }];
+
+ boot.initrd = stage1Config;
})
];
}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
index d26ea7597c..1229f63575 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
@@ -445,7 +445,8 @@ let
) config.boot.initrd.secrets)
}
- (cd "$tmp" && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \
+ # mindepth 1 so that we don't change the mode of /
+ (cd "$tmp" && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \
${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
'';
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd-secrets.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd-secrets.nix
index bc65880719..7b59c0cbe7 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd-secrets.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd-secrets.nix
@@ -19,13 +19,13 @@
# drop this service, we'd mount the /run tmpfs over the secret, making it
# invisible in stage 2.
script = ''
- for secret in $(cd /.initrd-secrets; find . -type f); do
+ for secret in $(cd /.initrd-secrets; find . -type f -o -type l); do
mkdir -p "$(dirname "/$secret")"
cp "/.initrd-secrets/$secret" "/$secret"
done
'';
- unitConfig = {
+ serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
index ffe96f3ad9..c9c219d0a0 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
@@ -1,4 +1,4 @@
-{ lib, config, utils, pkgs, ... }:
+{ lib, options, config, utils, pkgs, ... }:
with lib;
@@ -72,15 +72,6 @@ let
"systemd-tmpfiles-setup.service"
"timers.target"
"umount.target"
-
- # TODO: Networking
- # "network-online.target"
- # "network-pre.target"
- # "network.target"
- # "nss-lookup.target"
- # "nss-user-lookup.target"
- # "remote-fs-pre.target"
- # "remote-fs.target"
] ++ cfg.additionalUpstreamUnits;
upstreamWants = [
@@ -135,18 +126,20 @@ in {
options.boot.initrd.systemd = {
enable = mkEnableOption (lib.mdDoc "systemd in initrd") // {
description = lib.mdDoc ''
- Whether to enable systemd in initrd.
+ Whether to enable systemd in initrd. The unit options such as
+ {option}`boot.initrd.systemd.services` are the same as their
+ stage 2 counterparts such as {option}`systemd.services`,
+ except that `restartTriggers` and `reloadTriggers` are not
+ supported.
- Note: This is in very early development and is highly
- experimental. Most of the features NixOS supports in initrd are
- not yet supported by the intrd generated with this option.
+ Note: This is experimental. Some of the `boot.initrd` options
+ are not supported when this is enabled, and the options under
+ `boot.initrd.systemd` are subject to change.
'';
};
- package = (mkPackageOptionMD pkgs "systemd" {
+ package = mkPackageOptionMD pkgs "systemd" {
default = "systemdStage1";
- }) // {
- visible = false;
};
extraConfig = mkOption {
@@ -176,7 +169,6 @@ in {
"/etc/hostname".text = "mymachine";
}
'';
- visible = false;
default = {};
type = utils.systemdUtils.types.initrdContents;
};
@@ -226,7 +218,6 @@ in {
emergencyAccess = mkOption {
type = with types; oneOf [ bool (nullOr (passwdEntry str)) ];
- visible = false;
description = lib.mdDoc ''
Set to true for unauthenticated emergency access, and false for
no emergency access.
@@ -240,7 +231,6 @@ in {
initrdBin = mkOption {
type = types.listOf types.package;
default = [];
- visible = false;
description = lib.mdDoc ''
Packages to include in /bin for the stage 1 emergency shell.
'';
@@ -249,7 +239,6 @@ in {
additionalUpstreamUnits = mkOption {
default = [ ];
type = types.listOf types.str;
- visible = false;
example = [ "debug-shell.service" "systemd-quotacheck.service" ];
description = lib.mdDoc ''
Additional units shipped with systemd that shall be enabled.
@@ -260,7 +249,6 @@ in {
default = [ ];
type = types.listOf types.str;
example = [ "systemd-backlight@.service" ];
- visible = false;
description = lib.mdDoc ''
A list of units to skip when generating system systemd configuration directory. This has
priority over upstream units, {option}`boot.initrd.systemd.units`, and
@@ -273,13 +261,12 @@ in {
units = mkOption {
description = lib.mdDoc "Definition of systemd units.";
default = {};
- visible = false;
+ visible = "shallow";
type = systemdUtils.types.units;
};
packages = mkOption {
default = [];
- visible = false;
type = types.listOf types.package;
example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]";
description = lib.mdDoc "Packages providing systemd units and hooks.";
@@ -287,7 +274,7 @@ in {
targets = mkOption {
default = {};
- visible = false;
+ visible = "shallow";
type = systemdUtils.types.initrdTargets;
description = lib.mdDoc "Definition of systemd target units.";
};
@@ -295,35 +282,35 @@ in {
services = mkOption {
default = {};
type = systemdUtils.types.initrdServices;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc "Definition of systemd service units.";
};
sockets = mkOption {
default = {};
type = systemdUtils.types.initrdSockets;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc "Definition of systemd socket units.";
};
timers = mkOption {
default = {};
type = systemdUtils.types.initrdTimers;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc "Definition of systemd timer units.";
};
paths = mkOption {
default = {};
type = systemdUtils.types.initrdPaths;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc "Definition of systemd path units.";
};
mounts = mkOption {
default = [];
type = systemdUtils.types.initrdMounts;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc ''
Definition of systemd mount units.
This is a list instead of an attrSet, because systemd mandates the names to be derived from
@@ -334,7 +321,7 @@ in {
automounts = mkOption {
default = [];
type = systemdUtils.types.automounts;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc ''
Definition of systemd automount units.
This is a list instead of an attrSet, because systemd mandates the names to be derived from
@@ -345,7 +332,7 @@ in {
slices = mkOption {
default = {};
type = systemdUtils.types.slices;
- visible = false;
+ visible = "shallow";
description = lib.mdDoc "Definition of slice configurations.";
};
};
@@ -378,7 +365,7 @@ in {
"/etc/systemd/system.conf".text = ''
[Manager]
- DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
+ DefaultEnvironment=PATH=/bin:/sbin
${cfg.extraConfig}
ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)}
'';
@@ -388,8 +375,10 @@ in {
"/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
- "/etc/passwd".source = "${pkgs.fakeNss}/etc/passwd";
- "/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then "!" else cfg.emergencyAccess}:::::::";
+ # We can use either ! or * to lock the root account in the
+ # console, but some software like OpenSSH won't even allow you
+ # to log in with an SSH key if you use ! so we use * instead
+ "/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then optionalString (!cfg.emergencyAccess) "*" else cfg.emergencyAccess}:::::::";
"/bin".source = "${initrdBinEnv}/bin";
"/sbin".source = "${initrdBinEnv}/sbin";
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix b/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix
index 1f9431710a..fd16cd3fba 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix
@@ -3,62 +3,67 @@
with lib;
let
- cfg = config.boot;
+ cfg = config.boot.tmp;
in
{
-
- ###### interface
+ imports = [
+ (mkRenamedOptionModule [ "boot" "cleanTmpDir" ] [ "boot" "tmp" "cleanOnBoot" ])
+ (mkRenamedOptionModule [ "boot" "tmpOnTmpfs" ] [ "boot" "tmp" "useTmpfs" ])
+ (mkRenamedOptionModule [ "boot" "tmpOnTmpfsSize" ] [ "boot" "tmp" "tmpfsSize" ])
+ ];
options = {
+ boot.tmp = {
+ cleanOnBoot = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to delete all files in {file}`/tmp` during boot.
+ '';
+ };
- boot.cleanTmpDir = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to delete all files in {file}`/tmp` during boot.
- '';
+ tmpfsSize = mkOption {
+ type = types.oneOf [ types.str types.types.ints.positive ];
+ default = "50%";
+ description = lib.mdDoc ''
+ Size of tmpfs in percentage.
+ Percentage is defined by systemd.
+ '';
+ };
+
+ useTmpfs = mkOption {
+ type = types.bool;
+ default = false;
+ description = lib.mdDoc ''
+ Whether to mount a tmpfs on {file}`/tmp` during boot.
+
+ ::: {.note}
+ Large Nix builds can fail if the mounted tmpfs is not large enough.
+ In such a case either increase the tmpfsSize or disable this option.
+ :::
+ '';
+ };
};
-
- boot.tmpOnTmpfs = mkOption {
- type = types.bool;
- default = false;
- description = lib.mdDoc ''
- Whether to mount a tmpfs on {file}`/tmp` during boot.
- '';
- };
-
- boot.tmpOnTmpfsSize = mkOption {
- type = types.oneOf [ types.str types.types.ints.positive ];
- default = "50%";
- description = lib.mdDoc ''
- Size of tmpfs in percentage.
- Percentage is defined by systemd.
- '';
- };
-
};
- ###### implementation
-
config = {
-
# When changing remember to update /tmp mount in virtualisation/qemu-vm.nix
- systemd.mounts = mkIf cfg.tmpOnTmpfs [
+ systemd.mounts = mkIf cfg.useTmpfs [
{
what = "tmpfs";
where = "/tmp";
type = "tmpfs";
- mountConfig.Options = concatStringsSep "," [ "mode=1777"
- "strictatime"
- "rw"
- "nosuid"
- "nodev"
- "size=${toString cfg.tmpOnTmpfsSize}" ];
+ mountConfig.Options = concatStringsSep "," [
+ "mode=1777"
+ "strictatime"
+ "rw"
+ "nosuid"
+ "nodev"
+ "size=${toString cfg.tmpfsSize}"
+ ];
}
];
- systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";
-
+ systemd.tmpfiles.rules = optional cfg.cleanOnBoot "D! /tmp 1777 root root";
};
-
}
diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
index 822f159347..326862f836 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
@@ -319,7 +319,7 @@ in
message = let
fs = head (filter notAutoResizable fileSystems);
in
- "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${if fs.fsType == "auto" then " fsType has to be explicitly set and" else ""} only the ext filesystems and f2fs support it.";
+ "Mountpoint '${fs.mountPoint}': 'autoResize = true' is not supported for 'fsType = \"${fs.fsType}\"':${optionalString (fs.fsType == "auto") " fsType has to be explicitly set and"} only the ext filesystems and f2fs support it.";
}
];
diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
index b24b29c32d..0fcd3c1021 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -28,11 +28,164 @@ let
# TODO: warn the user that any address configured on those interfaces will be useless
++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches);
+ domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
+ genericNetwork = override:
+ let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address
+ ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address;
+ makeGateway = gateway: {
+ routeConfig = {
+ Gateway = gateway;
+ GatewayOnLink = false;
+ };
+ };
+ in optionalAttrs (gateway != [ ]) {
+ routes = override (map makeGateway gateway);
+ } // optionalAttrs (domains != [ ]) {
+ domains = override domains;
+ };
+
+ genericDhcpNetworks = initrd: mkIf cfg.useDHCP {
+ networks."99-ethernet-default-dhcp" = {
+ # We want to match physical ethernet interfaces as commonly
+ # found on laptops, desktops and servers, to provide an
+ # "out-of-the-box" setup that works for common cases. This
+ # heuristic isn't perfect (it could match interfaces with
+ # custom names that _happen_ to start with en or eth), but
+ # should be good enough to make the common case easy and can
+ # be overridden on a case-by-case basis using
+ # higher-priority networks or by disabling useDHCP.
+
+ # Type=ether matches veth interfaces as well, and this is
+ # more likely to result in interfaces being configured to
+ # use DHCP when they shouldn't.
+
+ # When wait-online.anyInterface is enabled, RequiredForOnline really
+ # means "sufficient for online", so we can enable it.
+ # Otherwise, don't block the network coming online because of default networks.
+ matchConfig.Name = ["en*" "eth*"];
+ DHCP = "yes";
+ linkConfig.RequiredForOnline =
+ lib.mkDefault (if initrd
+ then config.boot.initrd.systemd.network.wait-online.anyInterface
+ else config.systemd.network.wait-online.anyInterface);
+ networkConfig.IPv6PrivacyExtensions = "kernel";
+ };
+ networks."99-wireless-client-dhcp" = {
+ # Like above, but this is much more likely to be correct.
+ matchConfig.WLANInterfaceType = "station";
+ DHCP = "yes";
+ linkConfig.RequiredForOnline =
+ lib.mkDefault config.systemd.network.wait-online.anyInterface;
+ networkConfig.IPv6PrivacyExtensions = "kernel";
+ # We also set the route metric to one more than the default
+ # of 1024, so that Ethernet is preferred if both are
+ # available.
+ dhcpV4Config.RouteMetric = 1025;
+ ipv6AcceptRAConfig.RouteMetric = 1025;
+ };
+ };
+
+
+ interfaceNetworks = mkMerge (forEach interfaces (i: {
+ netdevs = mkIf i.virtual ({
+ "40-${i.name}" = {
+ netdevConfig = {
+ Name = i.name;
+ Kind = i.virtualType;
+ };
+ "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) {
+ User = i.virtualOwner;
+ };
+ };
+ });
+ networks."40-${i.name}" = mkMerge [ (genericNetwork id) {
+ name = mkDefault i.name;
+ DHCP = mkForce (dhcpStr
+ (if i.useDHCP != null then i.useDHCP else false));
+ address = forEach (interfaceIps i)
+ (ip: "${ip.address}/${toString ip.prefixLength}");
+ routes = forEach (interfaceRoutes i)
+ (route: {
+ # Most of these route options have not been tested.
+ # Please fix or report any mistakes you may find.
+ routeConfig =
+ optionalAttrs (route.address != null && route.prefixLength != null) {
+ Destination = "${route.address}/${toString route.prefixLength}";
+ } //
+ optionalAttrs (route.options ? fastopen_no_cookie) {
+ FastOpenNoCookie = route.options.fastopen_no_cookie;
+ } //
+ optionalAttrs (route.via != null) {
+ Gateway = route.via;
+ } //
+ optionalAttrs (route.type != null) {
+ Type = route.type;
+ } //
+ optionalAttrs (route.options ? onlink) {
+ GatewayOnLink = true;
+ } //
+ optionalAttrs (route.options ? initrwnd) {
+ InitialAdvertisedReceiveWindow = route.options.initrwnd;
+ } //
+ optionalAttrs (route.options ? initcwnd) {
+ InitialCongestionWindow = route.options.initcwnd;
+ } //
+ optionalAttrs (route.options ? pref) {
+ IPv6Preference = route.options.pref;
+ } //
+ optionalAttrs (route.options ? mtu) {
+ MTUBytes = route.options.mtu;
+ } //
+ optionalAttrs (route.options ? metric) {
+ Metric = route.options.metric;
+ } //
+ optionalAttrs (route.options ? src) {
+ PreferredSource = route.options.src;
+ } //
+ optionalAttrs (route.options ? protocol) {
+ Protocol = route.options.protocol;
+ } //
+ optionalAttrs (route.options ? quickack) {
+ QuickAck = route.options.quickack;
+ } //
+ optionalAttrs (route.options ? scope) {
+ Scope = route.options.scope;
+ } //
+ optionalAttrs (route.options ? from) {
+ Source = route.options.from;
+ } //
+ optionalAttrs (route.options ? table) {
+ Table = route.options.table;
+ } //
+ optionalAttrs (route.options ? advmss) {
+ TCPAdvertisedMaximumSegmentSize = route.options.advmss;
+ } //
+ optionalAttrs (route.options ? ttl-propagate) {
+ TTLPropagate = route.options.ttl-propagate == "enabled";
+ };
+ });
+ networkConfig.IPv6PrivacyExtensions = "kernel";
+ linkConfig = optionalAttrs (i.macAddress != null) {
+ MACAddress = i.macAddress;
+ } // optionalAttrs (i.mtu != null) {
+ MTUBytes = toString i.mtu;
+ };
+ }];
+ }));
+
in
{
+ config = mkMerge [
- config = mkIf cfg.useNetworkd {
+ (mkIf config.boot.initrd.network.enable {
+ # Note this is if initrd.network.enable, not if
+ # initrd.systemd.network.enable. By setting the latter and not the
+ # former, the user retains full control over the configuration.
+ boot.initrd.systemd.network = mkMerge [(genericDhcpNetworks true) interfaceNetworks];
+ })
+
+ (mkIf cfg.useNetworkd {
assertions = [ {
assertion = cfg.defaultGatewayWindowSize == null;
@@ -54,149 +207,11 @@ in
networking.dhcpcd.enable = mkDefault false;
systemd.network =
- let
- domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
- genericNetwork = override:
- let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address
- ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address;
- makeGateway = gateway: {
- routeConfig = {
- Gateway = gateway;
- GatewayOnLink = false;
- };
- };
- in optionalAttrs (gateway != [ ]) {
- routes = override (map makeGateway gateway);
- } // optionalAttrs (domains != [ ]) {
- domains = override domains;
- };
- in mkMerge [ {
+ mkMerge [ {
enable = true;
}
- (mkIf cfg.useDHCP {
- networks."99-ethernet-default-dhcp" = lib.mkIf cfg.useDHCP {
- # We want to match physical ethernet interfaces as commonly
- # found on laptops, desktops and servers, to provide an
- # "out-of-the-box" setup that works for common cases. This
- # heuristic isn't perfect (it could match interfaces with
- # custom names that _happen_ to start with en or eth), but
- # should be good enough to make the common case easy and can
- # be overridden on a case-by-case basis using
- # higher-priority networks or by disabling useDHCP.
-
- # Type=ether matches veth interfaces as well, and this is
- # more likely to result in interfaces being configured to
- # use DHCP when they shouldn't.
-
- # When wait-online.anyInterface is enabled, RequiredForOnline really
- # means "sufficient for online", so we can enable it.
- # Otherwise, don't block the network coming online because of default networks.
- matchConfig.Name = ["en*" "eth*"];
- DHCP = "yes";
- linkConfig.RequiredForOnline =
- lib.mkDefault config.systemd.network.wait-online.anyInterface;
- networkConfig.IPv6PrivacyExtensions = "kernel";
- };
- networks."99-wireless-client-dhcp" = lib.mkIf cfg.useDHCP {
- # Like above, but this is much more likely to be correct.
- matchConfig.WLANInterfaceType = "station";
- DHCP = "yes";
- linkConfig.RequiredForOnline =
- lib.mkDefault config.systemd.network.wait-online.anyInterface;
- networkConfig.IPv6PrivacyExtensions = "kernel";
- # We also set the route metric to one more than the default
- # of 1024, so that Ethernet is preferred if both are
- # available.
- dhcpV4Config.RouteMetric = 1025;
- ipv6AcceptRAConfig.RouteMetric = 1025;
- };
- })
- (mkMerge (forEach interfaces (i: {
- netdevs = mkIf i.virtual ({
- "40-${i.name}" = {
- netdevConfig = {
- Name = i.name;
- Kind = i.virtualType;
- };
- "${i.virtualType}Config" = optionalAttrs (i.virtualOwner != null) {
- User = i.virtualOwner;
- };
- };
- });
- networks."40-${i.name}" = mkMerge [ (genericNetwork id) {
- name = mkDefault i.name;
- DHCP = mkForce (dhcpStr
- (if i.useDHCP != null then i.useDHCP else false));
- address = forEach (interfaceIps i)
- (ip: "${ip.address}/${toString ip.prefixLength}");
- routes = forEach (interfaceRoutes i)
- (route: {
- # Most of these route options have not been tested.
- # Please fix or report any mistakes you may find.
- routeConfig =
- optionalAttrs (route.address != null && route.prefixLength != null) {
- Destination = "${route.address}/${toString route.prefixLength}";
- } //
- optionalAttrs (route.options ? fastopen_no_cookie) {
- FastOpenNoCookie = route.options.fastopen_no_cookie;
- } //
- optionalAttrs (route.via != null) {
- Gateway = route.via;
- } //
- optionalAttrs (route.type != null) {
- Type = route.type;
- } //
- optionalAttrs (route.options ? onlink) {
- GatewayOnLink = true;
- } //
- optionalAttrs (route.options ? initrwnd) {
- InitialAdvertisedReceiveWindow = route.options.initrwnd;
- } //
- optionalAttrs (route.options ? initcwnd) {
- InitialCongestionWindow = route.options.initcwnd;
- } //
- optionalAttrs (route.options ? pref) {
- IPv6Preference = route.options.pref;
- } //
- optionalAttrs (route.options ? mtu) {
- MTUBytes = route.options.mtu;
- } //
- optionalAttrs (route.options ? metric) {
- Metric = route.options.metric;
- } //
- optionalAttrs (route.options ? src) {
- PreferredSource = route.options.src;
- } //
- optionalAttrs (route.options ? protocol) {
- Protocol = route.options.protocol;
- } //
- optionalAttrs (route.options ? quickack) {
- QuickAck = route.options.quickack;
- } //
- optionalAttrs (route.options ? scope) {
- Scope = route.options.scope;
- } //
- optionalAttrs (route.options ? from) {
- Source = route.options.from;
- } //
- optionalAttrs (route.options ? table) {
- Table = route.options.table;
- } //
- optionalAttrs (route.options ? advmss) {
- TCPAdvertisedMaximumSegmentSize = route.options.advmss;
- } //
- optionalAttrs (route.options ? ttl-propagate) {
- TTLPropagate = route.options.ttl-propagate == "enabled";
- };
- });
- networkConfig.IPv6PrivacyExtensions = "kernel";
- linkConfig = optionalAttrs (i.macAddress != null) {
- MACAddress = i.macAddress;
- } // optionalAttrs (i.mtu != null) {
- MTUBytes = toString i.mtu;
- };
- }];
- })))
+ (genericDhcpNetworks false)
+ interfaceNetworks
(mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: {
netdevs."40-${name}" = {
netdevConfig = {
@@ -437,6 +452,7 @@ in
bindsTo = [ "systemd-networkd.service" ];
};
};
- };
+ })
+ ];
}
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix
index 3503a6fff6..dacd700537 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix
@@ -4,7 +4,10 @@ with lib;
let
cfg = config.virtualisation.cri-o;
- crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });
+ crioPackage = pkgs.cri-o.override {
+ extraPackages = cfg.extraPackages
+ ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;
+ };
format = pkgs.formats.toml { };
@@ -19,7 +22,7 @@ in
enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)");
storageDriver = mkOption {
- type = types.enum [ "btrfs" "overlay" "vfs" ];
+ type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ];
default = "overlay";
description = lib.mdDoc "Storage driver to be used";
};
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix
index 6ef7de4b2b..b331b3be7e 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/multipass.nix
@@ -33,8 +33,8 @@ in
description = "Multipass orchestrates virtual Ubuntu instances.";
wantedBy = [ "multi-user.target" ];
- wants = [ "network.target" ];
- after = [ "network.target" ];
+ wants = [ "network-online.target" ];
+ after = [ "network-online.target" ];
environment = {
"XDG_DATA_HOME" = "/var/lib/multipass/data";
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
index 669981da59..d54e2ed3f3 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
@@ -170,11 +170,11 @@ let
--setenv HOST_PORT="$HOST_PORT" \
--setenv PATH="$PATH" \
${optionalString cfg.ephemeral "--ephemeral"} \
- ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then
- ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else ""
+ ${optionalString (cfg.additionalCapabilities != null && cfg.additionalCapabilities != [])
+ ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"''
} \
- ${if cfg.tmpfs != null && cfg.tmpfs != [] then
- ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else ""
+ ${optionalString (cfg.tmpfs != null && cfg.tmpfs != [])
+ ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}''
} \
${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
'';
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix
index 07a61bf208..dba8ce02b7 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix
@@ -87,7 +87,6 @@ in
bindsTo = [ "cups.service" ];
path = [ prl-tools ];
serviceConfig = {
- Type = "forking";
ExecStart = "${prl-tools}/bin/prlshprint";
WorkingDirectory = "${prl-tools}/bin";
};
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
index 6a4220fd26..c66a4f178e 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix
@@ -135,10 +135,11 @@ with lib;
cfgLine = name: value: ''
${name}: ${builtins.toString value}
'';
+ virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
cfgFile = fileName: properties: pkgs.writeTextDir fileName ''
# generated by NixOS
${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
- #qmdump#map:virtio0:drive-virtio0:local-lvm:raw:
+ #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
'';
inherit (cfg) partitionTableType;
supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
index a55a21a46a..5b515a29ae 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix
@@ -55,6 +55,11 @@ let
};
+ selectPartitionTableLayout = { useEFIBoot, useDefaultFilesystems }:
+ if useDefaultFilesystems then
+ if useEFIBoot then "efi" else "legacy"
+ else "none";
+
driveCmdline = idx: { file, driveExtraOpts, deviceExtraOpts, ... }:
let
drvId = "drive${toString idx}";
@@ -98,7 +103,6 @@ let
addDeviceNames =
imap1 (idx: drive: drive // { device = driveDeviceName idx; });
-
# Shell script to start the VM.
startVM =
''
@@ -111,8 +115,23 @@ let
NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE"
if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then
- ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
- ${toString config.virtualisation.diskSize}M
+ echo "Disk image do not exist, creating the virtualisation disk image..."
+ # If we are using a bootloader and default filesystems layout.
+ # We have to reuse the system image layout as a backing image format (CoW)
+ # So we can write on the top of it.
+
+ # If we are not using the default FS layout, potentially, we are interested into
+ # performing operations in postDeviceCommands or at early boot on the raw device.
+ # We can still boot through QEMU direct kernel boot feature.
+
+ # CoW prevent size to be attributed to an image.
+ # FIXME: raise this issue to upstream.
+ ${qemu}/bin/qemu-img create \
+ ${concatStringsSep " \\\n" ([ "-f qcow2" ]
+ ++ optional (cfg.useBootLoader && cfg.useDefaultFilesystems) "-F qcow2 -b ${systemImage}/nixos.qcow2"
+ ++ optional (!(cfg.useBootLoader && cfg.useDefaultFilesystems)) "-o size=${toString config.virtualisation.diskSize}M"
+ ++ [ "$NIX_DISK_IMAGE" ])}
+ echo "Virtualisation disk image created."
fi
# Create a directory for storing temporary data of the running VM.
@@ -152,19 +171,13 @@ let
${lib.optionalString cfg.useBootLoader
''
- if ${if !cfg.persistBootDevice then "true" else "! test -e $TMPDIR/disk.img"}; then
- # Create a writable copy/snapshot of the boot disk.
- # A writable boot disk can be booted from automatically.
- ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img"
- fi
-
- NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${cfg.efiVars}}")
+ NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")
${lib.optionalString cfg.useEFIBoot
''
# VM needs writable EFI vars
if ! test -e "$NIX_EFI_VARS"; then
- cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS"
+ cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"
chmod 0644 "$NIX_EFI_VARS"
fi
''}
@@ -200,95 +213,29 @@ let
regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.additionalPaths; };
-
- # Generate a hard disk image containing a /boot partition and GRUB
- # in the MBR. Used when the `useBootLoader' option is set.
- # Uses `runInLinuxVM` to create the image in a throwaway VM.
- # See note [Disk layout with `useBootLoader`].
- # FIXME: use nixos/lib/make-disk-image.nix.
- bootDisk =
- pkgs.vmTools.runInLinuxVM (
- pkgs.runCommand "nixos-boot-disk"
- { preVM =
- ''
- mkdir $out
- diskImage=$out/disk.img
- ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M"
- ${if cfg.useEFIBoot then ''
- efiVars=$out/efi-vars.fd
- cp ${cfg.efi.variables} $efiVars
- chmod 0644 $efiVars
- '' else ""}
- '';
- buildInputs = [ pkgs.util-linux ];
- QEMU_OPTS = "-nographic -serial stdio -monitor none"
- + lib.optionalString cfg.useEFIBoot (
- " -drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}"
- + " -drive if=pflash,format=raw,unit=1,file=$efiVars");
- }
- ''
- # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility
- ${pkgs.gptfdisk}/bin/sgdisk \
- --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \
- --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \
- --attributes=1:set:1 \
- --attributes=2:set:2 \
- --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C1 \
- --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \
- --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \
- --hybrid 2 \
- --recompute-chs /dev/vda
-
- ${optionalString (config.boot.loader.grub.device != "/dev/vda")
- # In this throwaway VM, we only have the /dev/vda disk, but the
- # actual VM described by `config` (used by `switch-to-configuration`
- # below) may set `boot.loader.grub.device` to a different device
- # that's nonexistent in the throwaway VM.
- # Create a symlink for that device, so that the `grub-install`
- # by `switch-to-configuration` will hit /dev/vda anyway.
- ''
- ln -s /dev/vda ${config.boot.loader.grub.device}
- ''
- }
-
- ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2
- export MTOOLS_SKIP_CHECK=1
- ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
-
- # Mount /boot; load necessary modules first.
- ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true
- ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true
- ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true
- ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true
- ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true
- mkdir /boot
- mount /dev/vda2 /boot
-
- ${optionalString config.boot.loader.efi.canTouchEfiVariables ''
- mount -t efivarfs efivarfs /sys/firmware/efi/efivars
- ''}
-
- # This is needed for GRUB 0.97, which doesn't know about virtio devices.
- mkdir /boot/grub
- echo '(hd0) /dev/vda' > /boot/grub/device.map
-
- # This is needed for systemd-boot to find ESP, and udev is not available here to create this
- mkdir -p /dev/block
- ln -s /dev/vda2 /dev/block/254:2
-
- # Set up system profile (normally done by nixos-rebuild / nix-env --set)
- mkdir -p /nix/var/nix/profiles
- ln -s ${config.system.build.toplevel} /nix/var/nix/profiles/system-1-link
- ln -s /nix/var/nix/profiles/system-1-link /nix/var/nix/profiles/system
-
- # Install bootloader
- touch /etc/NIXOS
- export NIXOS_INSTALL_BOOTLOADER=1
- ${config.system.build.toplevel}/bin/switch-to-configuration boot
-
- umount /boot
- '' # */
- );
+ # System image is akin to a complete NixOS install with
+ # a boot partition and root partition.
+ systemImage = import ../../lib/make-disk-image.nix {
+ inherit pkgs config lib;
+ additionalPaths = [ regInfo ];
+ format = "qcow2";
+ onlyNixStore = false;
+ partitionTableType = selectPartitionTableLayout { inherit (cfg) useDefaultFilesystems useEFIBoot; };
+ # Bootloader should be installed on the system image only if we are booting through bootloaders.
+ # Though, if a user is not using our default filesystems, it is possible to not have any ESP
+ # or a strange partition table that's incompatible with GRUB configuration.
+ # As a consequence, this may lead to disk image creation failures.
+ # To avoid this, we prefer to let the user find out about how to install the bootloader on its ESP/disk.
+ # Usually, this can be through building your own disk image.
+ # TODO: If a user is interested into a more fine grained heuristic for `installBootLoader`
+ # by examining the actual contents of `cfg.fileSystems`, please send a PR.
+ installBootLoader = cfg.useBootLoader && cfg.useDefaultFilesystems;
+ touchEFIVars = cfg.useEFIBoot;
+ diskSize = "auto";
+ additionalSpace = "0M";
+ copyChannel = false;
+ OVMF = cfg.efi.OVMF;
+ };
storeImage = import ../../lib/make-disk-image.nix {
inherit pkgs config lib;
@@ -297,17 +244,42 @@ let
onlyNixStore = true;
partitionTableType = "none";
installBootLoader = false;
+ touchEFIVars = false;
diskSize = "auto";
additionalSpace = "0M";
copyChannel = false;
};
+ bootConfiguration =
+ if cfg.useDefaultFilesystems
+ then
+ if cfg.useBootLoader
+ then
+ if cfg.useEFIBoot then "efi_bootloading_with_default_fs"
+ else "legacy_bootloading_with_default_fs"
+ else
+ "direct_boot_with_default_fs"
+ else
+ "custom";
+ suggestedRootDevice = {
+ "efi_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}2";
+ "legacy_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}1";
+ "direct_boot_with_default_fs" = cfg.bootLoaderDevice;
+ # This will enforce a NixOS module type checking error
+ # to ask explicitly the user to set a rootDevice.
+ # As it will look like `rootDevice = lib.mkDefault null;` after
+ # all "computations".
+ "custom" = null;
+ }.${bootConfiguration};
in
{
imports = [
../profiles/qemu-guest.nix
(mkRenamedOptionModule [ "virtualisation" "pathsInNixDB" ] [ "virtualisation" "additionalPaths" ])
+ (mkRemovedOptionModule [ "virtualisation" "bootDevice" ] "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues.")
+ (mkRemovedOptionModule [ "virtualisation" "efiVars" ] "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue")
+ (mkRemovedOptionModule [ "virtualisation" "persistBootDevice" ] "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`")
];
options = {
@@ -362,25 +334,48 @@ in
'';
};
- virtualisation.bootDevice =
+ virtualisation.bootLoaderDevice =
mkOption {
type = types.path;
+ default = lookupDriveDeviceName "root" cfg.qemu.drives;
+ defaultText = literalExpression ''lookupDriveDeviceName "root" cfg.qemu.drives'';
example = "/dev/vda";
description =
lib.mdDoc ''
- The disk to be used for the root filesystem.
+ The disk to be used for the boot filesystem.
+ By default, it is the same disk as the root filesystem.
+ '';
+ };
+
+ virtualisation.bootPartition =
+ mkOption {
+ type = types.nullOr types.path;
+ default = if cfg.useEFIBoot then "${cfg.bootLoaderDevice}1" else null;
+ defaultText = literalExpression ''if cfg.useEFIBoot then "''${cfg.bootLoaderDevice}1" else null'';
+ example = "/dev/vda1";
+ description =
+ lib.mdDoc ''
+ The boot partition to be used to mount /boot filesystem.
+ In legacy boots, this should be null.
+ By default, in EFI boot, it is the first partition of the boot device.
'';
};
- virtualisation.persistBootDevice =
+ virtualisation.rootDevice =
mkOption {
- type = types.bool;
- default = false;
+ type = types.nullOr types.path;
+ example = "/dev/vda2";
description =
lib.mdDoc ''
- If useBootLoader is specified, whether to recreate the boot device
- on each instantiaton or allow it to persist.
- '';
+ The disk or partition to be used for the root filesystem.
+ By default (read the source code for more details):
+
+ - under EFI with a bootloader: 2nd partition of the boot disk
+ - in legacy boot with a bootloader: 1st partition of the boot disk
+ - in direct boot (i.e. without a bootloader): whole disk
+
+ In case you are not using a default boot device or a default filesystem, you have to set explicitly your root device.
+ '';
};
virtualisation.emptyDiskImages =
@@ -579,12 +574,15 @@ in
virtualisation.writableStore =
mkOption {
type = types.bool;
- default = true; # FIXME
+ default = cfg.mountHostNixStore;
+ defaultText = literalExpression "cfg.mountHostNixStore";
description =
lib.mdDoc ''
If enabled, the Nix store in the VM is made writable by
layering an overlay filesystem on top of the host's Nix
store.
+
+ By default, this is enabled if you mount a host Nix store.
'';
};
@@ -718,6 +716,21 @@ in
For applications which do a lot of reads from the store,
this can drastically improve performance, but at the cost of
disk space and image build time.
+
+ As an alternative, you can use a bootloader which will provide you
+ with a full NixOS system image containing a Nix store and
+ avoid mounting the host nix store through
+ {option}`virtualisation.mountHostNixStore`.
+ '';
+ };
+
+ virtualisation.mountHostNixStore =
+ mkOption {
+ type = types.bool;
+ default = !cfg.useNixStoreImage && !cfg.useBootLoader;
+ defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader";
+ description = lib.mdDoc ''
+ Mount the host Nix store as a 9p mount.
'';
};
@@ -749,10 +762,22 @@ in
};
virtualisation.efi = {
+ OVMF = mkOption {
+ type = types.package;
+ default = (pkgs.OVMF.override {
+ secureBoot = cfg.useSecureBoot;
+ }).fd;
+ defaultText = ''(pkgs.OVMF.override {
+ secureBoot = cfg.useSecureBoot;
+ }).fd'';
+ description =
+ lib.mdDoc "OVMF firmware package, defaults to OVMF configured with secure boot if needed.";
+ };
+
firmware = mkOption {
type = types.path;
- default = pkgs.OVMF.firmware;
- defaultText = literalExpression "pkgs.OVMF.firmware";
+ default = cfg.efi.OVMF.firmware;
+ defaultText = literalExpression "cfg.efi.OVMF.firmware";
description =
lib.mdDoc ''
Firmware binary for EFI implementation, defaults to OVMF.
@@ -761,8 +786,8 @@ in
variables = mkOption {
type = types.path;
- default = pkgs.OVMF.variables;
- defaultText = literalExpression "pkgs.OVMF.variables";
+ default = cfg.efi.OVMF.variables;
+ defaultText = literalExpression "cfg.efi.OVMF.variables";
description =
lib.mdDoc ''
Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware.
@@ -786,18 +811,17 @@ in
'';
};
- virtualisation.efiVars =
+ virtualisation.useSecureBoot =
mkOption {
- type = types.str;
- default = "./${config.system.name}-efi-vars.fd";
- defaultText = literalExpression ''"./''${config.system.name}-efi-vars.fd"'';
+ type = types.bool;
+ default = false;
description =
lib.mdDoc ''
- Path to nvram image containing UEFI variables. The will be created
- on startup if it does not exist.
+ Enable Secure Boot support in the EFI firmware.
'';
};
+
virtualisation.bios =
mkOption {
type = types.nullOr types.package;
@@ -853,33 +877,18 @@ in
${opt.writableStore} = false;
'';
- # Note [Disk layout with `useBootLoader`]
- #
- # If `useBootLoader = true`, we configure 2 drives:
- # `/dev/?da` for the root disk, and `/dev/?db` for the boot disk
- # which has the `/boot` partition and the boot loader.
- # Concretely:
- #
- # * The second drive's image `disk.img` is created in `bootDisk = ...`
- # using a throwaway VM. Note that there the disk is always `/dev/vda`,
- # even though in the final VM it will be at `/dev/*b`.
- # * The disks are attached in `virtualisation.qemu.drives`.
- # Their order makes them appear as devices `a`, `b`, etc.
- # * `fileSystems."/boot"` is adjusted to be on device `b`.
- # * The disk.img is recreated each time the VM is booted unless
- # virtualisation.persistBootDevice is set.
-
- # If `useBootLoader`, GRUB goes to the second disk, see
- # note [Disk layout with `useBootLoader`].
- boot.loader.grub.device = mkVMOverride (
- if cfg.useBootLoader
- then driveDeviceName 2 # second disk
- else cfg.bootDevice
- );
+ # In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install
+ # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs.
+ # Otherwise, we set the proper bootloader device for this.
+ # FIXME: make a sense of this mess wrt to multiple ESP present in the system, probably use boot.efiSysMountpoint?
+ boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice);
boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";
+ virtualisation.rootDevice = mkDefault suggestedRootDevice;
boot.initrd.kernelModules = optionals (cfg.useNixStoreImage && !cfg.writableStore) [ "erofs" ];
+ boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false);
+
boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable)
''
# We need mke2fs in the initrd.
@@ -890,10 +899,10 @@ in
''
# If the disk image appears to be empty, run mke2fs to
# initialise.
- FSTYPE=$(blkid -o value -s TYPE ${cfg.bootDevice} || true)
- PARTTYPE=$(blkid -o value -s PTTYPE ${cfg.bootDevice} || true)
+ FSTYPE=$(blkid -o value -s TYPE ${cfg.rootDevice} || true)
+ PARTTYPE=$(blkid -o value -s PTTYPE ${cfg.rootDevice} || true)
if test -z "$FSTYPE" -a -z "$PARTTYPE"; then
- mke2fs -t ext4 ${cfg.bootDevice}
+ mke2fs -t ext4 ${cfg.rootDevice}
fi
'';
@@ -939,12 +948,10 @@ in
optional cfg.writableStore "overlay"
++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
- virtualisation.bootDevice = mkDefault (driveDeviceName 1);
-
virtualisation.additionalPaths = [ config.system.build.toplevel ];
virtualisation.sharedDirectories = {
- nix-store = mkIf (!cfg.useNixStoreImage) {
+ nix-store = mkIf cfg.mountHostNixStore {
source = builtins.storeDir;
target = "/nix/store";
};
@@ -997,7 +1004,7 @@ in
])
(mkIf cfg.useEFIBoot [
"-drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}"
- "-drive if=pflash,format=raw,unit=1,file=$NIX_EFI_VARS"
+ "-drive if=pflash,format=raw,unit=1,readonly=off,file=$NIX_EFI_VARS"
])
(mkIf (cfg.bios != null) [
"-bios ${cfg.bios}/bios.bin"
@@ -1013,23 +1020,14 @@ in
file = ''"$NIX_DISK_IMAGE"'';
driveExtraOpts.cache = "writeback";
driveExtraOpts.werror = "report";
+ deviceExtraOpts.bootindex = "1";
}])
(mkIf cfg.useNixStoreImage [{
name = "nix-store";
file = ''"$TMPDIR"/store.img'';
- deviceExtraOpts.bootindex = if cfg.useBootLoader then "3" else "2";
+ deviceExtraOpts.bootindex = "2";
driveExtraOpts.format = if cfg.writableStore then "qcow2" else "raw";
}])
- (mkIf cfg.useBootLoader [
- # The order of this list determines the device names, see
- # note [Disk layout with `useBootLoader`].
- {
- name = "boot";
- file = ''"$TMPDIR"/disk.img'';
- driveExtraOpts.media = "disk";
- deviceExtraOpts.bootindex = "1";
- }
- ])
(imap0 (idx: _: {
file = "$(pwd)/empty${toString idx}.qcow2";
driveExtraOpts.werror = "report";
@@ -1065,16 +1063,16 @@ in
device = "tmpfs";
fsType = "tmpfs";
} else {
- device = cfg.bootDevice;
+ device = cfg.rootDevice;
fsType = "ext4";
autoFormat = true;
});
- "/tmp" = lib.mkIf config.boot.tmpOnTmpfs {
+ "/tmp" = lib.mkIf config.boot.tmp.useTmpfs {
device = "tmpfs";
fsType = "tmpfs";
neededForBoot = true;
# Sync with systemd's tmp.mount;
- options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ];
+ options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ];
};
"/nix/${if cfg.writableStore then ".ro-store" else "store"}" = lib.mkIf cfg.useNixStoreImage {
device = "${lookupDriveDeviceName "nix-store" cfg.qemu.drives}";
@@ -1086,9 +1084,8 @@ in
options = [ "mode=0755" ];
neededForBoot = true;
};
- # see note [Disk layout with `useBootLoader`]
- "/boot" = lib.mkIf cfg.useBootLoader {
- device = "${lookupDriveDeviceName "boot" cfg.qemu.drives}2"; # 2 for e.g. `vdb2`, as created in `bootDisk`
+ "/boot" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) {
+ device = cfg.bootPartition; # 1 for e.g. `vda1`, as created in `systemImage`
fsType = "vfat";
noCheck = true; # fsck fails on a r/o filesystem
};
diff --git a/third_party/nixpkgs/nixos/tests/aaaaxy.nix b/third_party/nixpkgs/nixos/tests/aaaaxy.nix
new file mode 100644
index 0000000000..a1e1d44773
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/aaaaxy.nix
@@ -0,0 +1,28 @@
+{ pkgs, lib, ... }: {
+ name = "aaaaxy";
+ meta.maintainers = with lib.maintainers; [ Luflosi ];
+
+ nodes.machine = {
+ hardware.opengl.enable = true;
+ };
+
+ # This starts the game from a known state, feeds it a prerecorded set of button presses
+ # and then checks if the final game state is identical to the expected state.
+ # This is also what AAAAXY's CI system does and serves as a good sanity check.
+ testScript = ''
+ machine.wait_for_unit("basic.target")
+
+ machine.succeed(
+ # benchmark.dem needs to be in a mutable directory,
+ # so we can't just refer to the file in the Nix store directly
+ "mkdir -p '/tmp/aaaaxy/assets/demos/'",
+ "ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
+ """
+ '${pkgs.xvfb-run}/bin/xvfb-run' \
+ '${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
+ 'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
+ '${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'
+ """,
+ )
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index 2ad1ec3502..ee5b5e8396 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -67,6 +67,7 @@ let
in {
_3proxy = runTest ./3proxy.nix;
+ aaaaxy = runTest ./aaaaxy.nix;
acme = runTest ./acme.nix;
adguardhome = runTest ./adguardhome.nix;
aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix;
@@ -210,6 +211,7 @@ in {
envoy = handleTest ./envoy.nix {};
ergo = handleTest ./ergo.nix {};
ergochat = handleTest ./ergochat.nix {};
+ esphome = handleTest ./esphome.nix {};
etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
activation = pkgs.callPackage ../modules/system/activation/test.nix { };
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
@@ -310,7 +312,6 @@ in {
i3wm = handleTest ./i3wm.nix {};
icingaweb2 = handleTest ./icingaweb2.nix {};
iftop = handleTest ./iftop.nix {};
- ihatemoney = handleTest ./ihatemoney {};
incron = handleTest ./incron.nix {};
influxdb = handleTest ./influxdb.nix {};
initrd-network-openvpn = handleTest ./initrd-network-openvpn {};
@@ -359,7 +360,7 @@ in {
ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
- kubo = handleTest ./kubo.nix {};
+ kubo = runTest ./kubo.nix;
ladybird = handleTest ./ladybird.nix {};
languagetool = handleTest ./languagetool.nix {};
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
@@ -421,6 +422,7 @@ in {
mjolnir = handleTest ./matrix/mjolnir.nix {};
mod_perl = handleTest ./mod_perl.nix {};
molly-brown = handleTest ./molly-brown.nix {};
+ monica = handleTest ./web-apps/monica.nix {};
mongodb = handleTest ./mongodb.nix {};
moodle = handleTest ./moodle.nix {};
moonraker = handleTest ./moonraker.nix {};
@@ -587,6 +589,7 @@ in {
pt2-clone = handleTest ./pt2-clone.nix {};
pykms = handleTest ./pykms.nix {};
public-inbox = handleTest ./public-inbox.nix {};
+ pufferpanel = handleTest ./pufferpanel.nix {};
pulseaudio = discoverTests (import ./pulseaudio.nix);
qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {};
qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {};
@@ -631,6 +634,7 @@ in {
smokeping = handleTest ./smokeping.nix {};
snapcast = handleTest ./snapcast.nix {};
snapper = handleTest ./snapper.nix {};
+ snipe-it = runTest ./web-apps/snipe-it.nix;
soapui = handleTest ./soapui.nix {};
sogo = handleTest ./sogo.nix {};
solanum = handleTest ./solanum.nix {};
@@ -642,6 +646,7 @@ in {
sslh = handleTest ./sslh.nix {};
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
+ stargazer = runTest ./web-servers/stargazer.nix;
starship = handleTest ./starship.nix {};
step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};
stratis = handleTest ./stratis {};
@@ -677,6 +682,9 @@ in {
systemd-initrd-simple = handleTest ./systemd-initrd-simple.nix {};
systemd-initrd-swraid = handleTest ./systemd-initrd-swraid.nix {};
systemd-initrd-vconsole = handleTest ./systemd-initrd-vconsole.nix {};
+ systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix {};
+ systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix {};
+ systemd-initrd-networkd-openvpn = handleTest ./initrd-network-openvpn { systemdStage1 = true; };
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-machinectl = handleTest ./systemd-machinectl.nix {};
systemd-networkd = handleTest ./systemd-networkd.nix {};
@@ -706,6 +714,7 @@ in {
tiddlywiki = handleTest ./tiddlywiki.nix {};
tigervnc = handleTest ./tigervnc.nix {};
timescaledb = handleTest ./timescaledb.nix {};
+ promscale = handleTest ./promscale.nix {};
timezone = handleTest ./timezone.nix {};
tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/bootspec.nix b/third_party/nixpkgs/nixos/tests/bootspec.nix
index 077dff918e..9295500422 100644
--- a/third_party/nixpkgs/nixos/tests/bootspec.nix
+++ b/third_party/nixpkgs/nixos/tests/bootspec.nix
@@ -108,9 +108,9 @@ in
machine.start()
machine.wait_for_unit("multi-user.target")
- machine.succeed("test -e /run/current-system/bootspec/boot.json")
+ machine.succeed("test -e /run/current-system/boot.json")
- bootspec = json.loads(machine.succeed("jq -r '.v1' /run/current-system/bootspec/boot.json"))
+ bootspec = json.loads(machine.succeed("jq -r '.\"org.nixos.bootspec.v1\"' /run/current-system/boot.json"))
assert all(key in bootspec for key in ('initrd', 'initrdSecrets')), "Bootspec should contain initrd or initrdSecrets field when initrd is enabled"
'';
@@ -136,10 +136,10 @@ in
machine.succeed("test -e /run/current-system/boot.json")
machine.succeed("test -e /run/current-system/specialisation/something/boot.json")
- sp_in_parent = json.loads(machine.succeed("jq -r '.v1.specialisation.something' /run/current-system/boot.json"))
+ sp_in_parent = json.loads(machine.succeed("jq -r '.\"org.nixos.specialisation.v1\".something' /run/current-system/boot.json"))
sp_in_fs = json.loads(machine.succeed("cat /run/current-system/specialisation/something/boot.json"))
- assert sp_in_parent == sp_in_fs['v1'], "Bootspecs of the same specialisation are different!"
+ assert sp_in_parent['org.nixos.bootspec.v1'] == sp_in_fs['org.nixos.bootspec.v1'], "Bootspecs of the same specialisation are different!"
'';
};
@@ -152,7 +152,9 @@ in
imports = [ standard ];
environment.systemPackages = [ pkgs.jq ];
boot.bootspec.extensions = {
- osRelease = config.environment.etc."os-release".source;
+ "org.nix-tests.product" = {
+ osRelease = config.environment.etc."os-release".source;
+ };
};
};
@@ -161,7 +163,7 @@ in
machine.wait_for_unit("multi-user.target")
current_os_release = machine.succeed("cat /etc/os-release")
- bootspec_os_release = machine.succeed("cat $(jq -r '.v1.extensions.osRelease' /run/current-system/boot.json)")
+ bootspec_os_release = machine.succeed("cat $(jq -r '.\"org.nix-tests.product\".osRelease' /run/current-system/boot.json)")
assert current_os_release == bootspec_os_release, "Filename referenced by extension has unexpected contents"
'';
diff --git a/third_party/nixpkgs/nixos/tests/budgie.nix b/third_party/nixpkgs/nixos/tests/budgie.nix
index b9eba74b45..a2599572b3 100644
--- a/third_party/nixpkgs/nixos/tests/budgie.nix
+++ b/third_party/nixpkgs/nixos/tests/budgie.nix
@@ -20,7 +20,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
};
- services.xserver.desktopManager.budgie.enable = true;
+ services.xserver.desktopManager.budgie = {
+ enable = true;
+ extraPlugins = [
+ pkgs.budgie.budgie-analogue-clock-applet
+ ];
+ };
};
testScript = { nodes, ... }:
diff --git a/third_party/nixpkgs/nixos/tests/cage.nix b/third_party/nixpkgs/nixos/tests/cage.nix
index 39c8d0441b..db1b785467 100644
--- a/third_party/nixpkgs/nixos/tests/cage.nix
+++ b/third_party/nixpkgs/nixos/tests/cage.nix
@@ -10,11 +10,13 @@ import ./make-test-python.nix ({ pkgs, ...} :
{
imports = [ ./common/user-account.nix ];
+
+ fonts.fonts = with pkgs; [ dejavu_fonts ];
+
services.cage = {
enable = true;
user = "alice";
- # Disable color and bold and use a larger font to make OCR easier:
- program = "${pkgs.xterm}/bin/xterm -cm -pc -fa Monospace -fs 24";
+ program = "${pkgs.xterm}/bin/xterm";
};
# Need to switch to a different GPU driver than the default one (-vga std) so that Cage can launch:
diff --git a/third_party/nixpkgs/nixos/tests/common/ec2.nix b/third_party/nixpkgs/nixos/tests/common/ec2.nix
index 6ed420e0aa..1a64c46403 100644
--- a/third_party/nixpkgs/nixos/tests/common/ec2.nix
+++ b/third_party/nixpkgs/nixos/tests/common/ec2.nix
@@ -17,6 +17,7 @@ with pkgs.lib;
ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
'';
};
+ indentLines = str: concatLines (map (s: " " + s) (splitString "\n" str));
in makeTest {
name = "ec2-" + name;
nodes = {};
@@ -36,6 +37,8 @@ with pkgs.lib;
"create",
"-f",
"qcow2",
+ "-F",
+ "qcow2",
"-o",
"backing_file=${image}",
disk_image,
@@ -59,7 +62,11 @@ with pkgs.lib;
)
machine = create_machine({"startCommand": start_command})
- '' + script;
+ try:
+ '' + indentLines script + ''
+ finally:
+ machine.shutdown()
+ '';
inherit meta;
};
diff --git a/third_party/nixpkgs/nixos/tests/esphome.nix b/third_party/nixpkgs/nixos/tests/esphome.nix
new file mode 100644
index 0000000000..b8dbdb0b37
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/esphome.nix
@@ -0,0 +1,41 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+
+let
+ testPort = 6052;
+ unixSocket = "/run/esphome/esphome.sock";
+in
+with lib;
+{
+ name = "esphome";
+ meta.maintainers = with pkgs.lib.maintainers; [ oddlama ];
+
+ nodes = {
+ esphomeTcp = { ... }:
+ {
+ services.esphome = {
+ enable = true;
+ port = testPort;
+ address = "0.0.0.0";
+ openFirewall = true;
+ };
+ };
+
+ esphomeUnix = { ... }:
+ {
+ services.esphome = {
+ enable = true;
+ enableUnixSocket = true;
+ };
+ };
+ };
+
+ testScript = ''
+ esphomeTcp.wait_for_unit("esphome.service")
+ esphomeTcp.wait_for_open_port(${toString testPort})
+ esphomeTcp.succeed("curl --fail http://localhost:${toString testPort}/")
+
+ esphomeUnix.wait_for_unit("esphome.service")
+ esphomeUnix.wait_for_file("${unixSocket}")
+ esphomeUnix.succeed("curl --fail --unix-socket ${unixSocket} http://localhost/")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/ft2-clone.nix b/third_party/nixpkgs/nixos/tests/ft2-clone.nix
index 3c90b3d3fa..a8395d4eba 100644
--- a/third_party/nixpkgs/nixos/tests/ft2-clone.nix
+++ b/third_party/nixpkgs/nixos/tests/ft2-clone.nix
@@ -26,9 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_for_window(r"Fasttracker")
machine.sleep(5)
- # One of the few words that actually get recognized
- if "Songlen" not in machine.get_screen_text():
- raise Exception("Program did not start successfully")
+ machine.wait_for_text(r"(Songlen|Repstart|Time|About|Nibbles|Help)")
machine.screenshot("screen")
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/gitea.nix b/third_party/nixpkgs/nixos/tests/gitea.nix
index 86d4fce379..c38aad1f44 100644
--- a/third_party/nixpkgs/nixos/tests/gitea.nix
+++ b/third_party/nixpkgs/nixos/tests/gitea.nix
@@ -72,6 +72,7 @@ let
server.wait_for_unit("gitea.service")
server.wait_for_open_port(3000)
+ server.wait_for_open_port(22)
server.succeed("curl --fail http://localhost:3000/")
server.succeed(
diff --git a/third_party/nixpkgs/nixos/tests/hibernate.nix b/third_party/nixpkgs/nixos/tests/hibernate.nix
index cb75322ca5..4d0b53e95b 100644
--- a/third_party/nixpkgs/nixos/tests/hibernate.nix
+++ b/third_party/nixpkgs/nixos/tests/hibernate.nix
@@ -63,7 +63,7 @@ in makeTest {
# Small root disk for installer
512
];
- virtualisation.bootDevice = "/dev/vdb";
+ virtualisation.rootDevice = "/dev/vdb";
};
};
diff --git a/third_party/nixpkgs/nixos/tests/home-assistant.nix b/third_party/nixpkgs/nixos/tests/home-assistant.nix
index 8585cb3585..22a63cc736 100644
--- a/third_party/nixpkgs/nixos/tests/home-assistant.nix
+++ b/third_party/nixpkgs/nixos/tests/home-assistant.nix
@@ -61,6 +61,13 @@ in {
# https://www.home-assistant.io/integrations/frontend/
frontend = {};
+ # include some popular integrations, that absolutely shouldn't break
+ esphome = {};
+ knx = {};
+ matter = {};
+ shelly = {};
+ zha = {};
+
# set up a wake-on-lan switch to test capset capability required
# for the ping suid wrapper
# https://www.home-assistant.io/integrations/wake_on_lan/
@@ -107,7 +114,7 @@ in {
# Cause a configuration change that requires a service restart as we added a new runtime dependency
specialisation.newFeature = {
inheritParentConfig = true;
- configuration.services.home-assistant.config.esphome = {};
+ configuration.services.home-assistant.config.backup = {};
};
};
diff --git a/third_party/nixpkgs/nixos/tests/ihatemoney/default.nix b/third_party/nixpkgs/nixos/tests/ihatemoney/default.nix
deleted file mode 100644
index 894a97d43d..0000000000
--- a/third_party/nixpkgs/nixos/tests/ihatemoney/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ system ? builtins.currentSystem,
- config ? {},
- pkgs ? import ../../.. { inherit system config; }
-}:
-
-let
- inherit (import ../../lib/testing-python.nix { inherit system pkgs; }) makeTest;
- f = backend: makeTest {
- name = "ihatemoney-${backend}";
- nodes.machine = { nodes, lib, ... }: {
- services.ihatemoney = {
- enable = true;
- enablePublicProjectCreation = true;
- secureCookie = false;
- inherit backend;
- uwsgiConfig = {
- http = ":8000";
- };
- };
- boot.cleanTmpDir = true;
- # for exchange rates
- security.pki.certificateFiles = [ ./server.crt ];
- networking.extraHosts = "127.0.0.1 api.exchangerate.host";
- services.nginx = {
- enable = true;
- virtualHosts."api.exchangerate.host" = {
- addSSL = true;
- # openssl req -x509 -newkey rsa:4096 -keyout server.key -out server.crt -days 1000000 -nodes -subj '/CN=api.exchangerate.host'
- sslCertificate = ./server.crt;
- sslCertificateKey = ./server.key;
- locations."/".return = "200 '${builtins.readFile ./rates.json}'";
- };
- };
- # ihatemoney needs a local smtp server otherwise project creation just crashes
- services.postfix.enable = true;
- };
- testScript = ''
- machine.wait_for_open_port(8000)
- machine.wait_for_unit("uwsgi.service")
- machine.wait_until_succeeds("curl --fail https://api.exchangerate.host")
- machine.wait_until_succeeds("curl --fail http://localhost:8000")
-
- result = machine.succeed(
- "curl --fail -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com&default_currency=XXX'"
- )
- assert '"yay"' in result, repr(result)
- owner, timestamp = machine.succeed(
- "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key"
- ).split("___")
- assert "ihatemoney:ihatemoney" == owner
-
- with subtest("Restart machine and service"):
- machine.shutdown()
- machine.start()
- machine.wait_for_open_port(8000)
- machine.wait_for_unit("uwsgi.service")
-
- with subtest("check that the database is really persistent"):
- machine.succeed("curl --fail --basic -u yay:yay http://localhost:8000/api/projects/yay")
-
- with subtest("check that the secret key is really persistent"):
- timestamp2 = machine.succeed("stat --printf %Y /var/lib/ihatemoney/secret_key")
- assert timestamp == timestamp2
-
- assert "ihatemoney" in machine.succeed("curl --fail http://localhost:8000")
- '';
- };
-in {
- ihatemoney-sqlite = f "sqlite";
- ihatemoney-postgresql = f "postgresql";
-}
diff --git a/third_party/nixpkgs/nixos/tests/ihatemoney/rates.json b/third_party/nixpkgs/nixos/tests/ihatemoney/rates.json
deleted file mode 100644
index ebdd2651b0..0000000000
--- a/third_party/nixpkgs/nixos/tests/ihatemoney/rates.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "rates": {
- "CAD": 1.3420055134,
- "HKD": 7.7513783598,
- "ISK": 135.9407305307,
- "PHP": 49.3762922123,
- "DKK": 6.4126464507,
- "HUF": 298.9145416954,
- "CZK": 22.6292212267,
- "GBP": 0.7838128877,
- "RON": 4.1630771881,
- "SEK": 8.8464851826,
- "IDR": 14629.5658166782,
- "INR": 74.8328738801,
- "BRL": 5.2357856651,
- "RUB": 71.8416609235,
- "HRK": 6.4757064094,
- "JPY": 106.2715368711,
- "THB": 31.7203652653,
- "CHF": 0.9243625086,
- "EUR": 0.8614748449,
- "MYR": 4.2644727774,
- "BGN": 1.6848725017,
- "TRY": 6.8483804273,
- "CNY": 7.0169710544,
- "NOK": 9.213731909,
- "NZD": 1.5080978635,
- "ZAR": 16.7427636113,
- "USD": 1,
- "MXN": 22.4676085458,
- "SGD": 1.3855099931,
- "AUD": 1.4107512061,
- "ILS": 3.4150585803,
- "KRW": 1203.3339076499,
- "PLN": 3.794452102
- },
- "base": "USD",
- "date": "2020-07-24"
-}
diff --git a/third_party/nixpkgs/nixos/tests/ihatemoney/server.crt b/third_party/nixpkgs/nixos/tests/ihatemoney/server.crt
deleted file mode 100644
index 10e568b14b..0000000000
--- a/third_party/nixpkgs/nixos/tests/ihatemoney/server.crt
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEvjCCAqYCCQDkTQrENPCZjjANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVh
-cGkuZXhjaGFuZ2VyYXRlLmhvc3QwIBcNMjEwNzE0MTI1MzQ0WhgPNDc1OTA2MTEx
-MjUzNDRaMCAxHjAcBgNVBAMMFWFwaS5leGNoYW5nZXJhdGUuaG9zdDCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5zpwUYa/ySqvJ/PUnXYsl1ww5SNGJh
-NujCRxC0Gw+5t5O7USSHRdz7Eb2PNFMa7JR+lliLAWdjHfqPXJWmP10X5ebvyxeQ
-TJkR1HpDSY6TQQlJvwr/JNGryyoQYjXvnyeyVu4TS3U0TTI631OonDAj+HbFIs9L
-gr/HfHzFmxRVLwaJ7hebanihc5RzoWTxgswiOwYQu5AivXQqcvUIxELeT7CxWwiw
-be/SlalDgoezB/poqaa215FUuN2av+nTn+swH3WOi9kwePLgVKn9BnDMwyh8et13
-yt27RWCSOcZagRSYsSbBaEJbClZvnuYvDqooJEy0GVbGBZpClKRKe92yd0PTf3ZJ
-GupyNoCFQlGugY//WLrsPv/Q4WwP+qZ6t97sV0CdM+epKVde/LfPKn+tFMv86qIg
-Q/uGHdDwUI8XH2EysAavhdlssSrovmpl4hyo9UkzTWfJgAbmOZY3Vba41wsq12FT
-usDsswGLBD10MdXWltR/Hdk8OnosLmeJxfZODAv31KSfd+4b6Ntr9BYQvAQSO+1/
-Mf7gEQtNhO003VKIyV5cpH4kVQieEcvoEKgq32NVBSKVf6UIPWIefu19kvrttaUu
-Q2QW2Qm4Ph/4cWpxl0jcrN5rjmgaBtIMmKYjRIS0ThDWzfVkJdmJuATzExJAplLN
-nYPBG3gOtQQpAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAJzt/aN7wl88WrvBasVi
-fSJmJjRaW2rYyBUMptQNkm9ElHN2eQQxJgLi8+9ArQxuGKhHx+D1wMGF8w2yOp0j
-4atfbXDcT+cTQY55qdEeYgU8KhESHHGszGsUpv7hzU2cACZiXG0YbOmORFYcn49Z
-yPyN98kW8BViLzNF9v+I/NJPuaaCeWKjXCqY2GCzddiuotrlLtz0CODXZJ506I1F
-38vQgZb10yAe6+R4y0BK7sUlmfr9BBqVcDQ/z74Kph1aB32zwP8KrNitwG1Tyk6W
-rxD1dStEQyX8uDPAspe2JrToMWsOMje9F5lotmuzyvwRJYfAav300EtIggBqpiHR
-o0P/1xxBzmaCHxEUJegdoYg8Q27llqsjR2T78uv/BlxpX9Dv5kNex5EZThKqyz4a
-Fn1VqiA3D9IsvxH4ud+8eDaP24u1yYObSTDIBsw9xDvoV8fV+NWoNNhcAL5GwC0P
-Goh7/brZSHUprxGpwRB524E//8XmCsRd/+ShtXbi4gEODMH4xLdkD7fZIJC4eG1H
-GOVc1MwjiYvbQlPs6MOcQ0iKQneSlaEJmyyO5Ro5OKiKj89Az/mLYX3R17AIsu0T
-Q5pGcmhKVRyu0zXvkGfK352TLwoe+4vbmakDq21Pkkcy8V9M4wP+vpCfQkg1REQ1
-+mr1Vg+SFya3mlCxpFTy3j8E
------END CERTIFICATE-----
diff --git a/third_party/nixpkgs/nixos/tests/ihatemoney/server.key b/third_party/nixpkgs/nixos/tests/ihatemoney/server.key
deleted file mode 100644
index 72a43577d6..0000000000
--- a/third_party/nixpkgs/nixos/tests/ihatemoney/server.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC+c6cFGGv8kqry
-fz1J12LJdcMOUjRiYTbowkcQtBsPubeTu1Ekh0Xc+xG9jzRTGuyUfpZYiwFnYx36
-j1yVpj9dF+Xm78sXkEyZEdR6Q0mOk0EJSb8K/yTRq8sqEGI1758nslbuE0t1NE0y
-Ot9TqJwwI/h2xSLPS4K/x3x8xZsUVS8Gie4Xm2p4oXOUc6Fk8YLMIjsGELuQIr10
-KnL1CMRC3k+wsVsIsG3v0pWpQ4KHswf6aKmmtteRVLjdmr/p05/rMB91jovZMHjy
-4FSp/QZwzMMofHrdd8rdu0VgkjnGWoEUmLEmwWhCWwpWb57mLw6qKCRMtBlWxgWa
-QpSkSnvdsndD0392SRrqcjaAhUJRroGP/1i67D7/0OFsD/qmerfe7FdAnTPnqSlX
-Xvy3zyp/rRTL/OqiIEP7hh3Q8FCPFx9hMrAGr4XZbLEq6L5qZeIcqPVJM01nyYAG
-5jmWN1W2uNcLKtdhU7rA7LMBiwQ9dDHV1pbUfx3ZPDp6LC5nicX2TgwL99Skn3fu
-G+jba/QWELwEEjvtfzH+4BELTYTtNN1SiMleXKR+JFUInhHL6BCoKt9jVQUilX+l
-CD1iHn7tfZL67bWlLkNkFtkJuD4f+HFqcZdI3Kzea45oGgbSDJimI0SEtE4Q1s31
-ZCXZibgE8xMSQKZSzZ2DwRt4DrUEKQIDAQABAoICAQCpwU465XTDUTvcH/vSCJB9
-/2BYMH+OvRYDS7+qLM7+Kkxt+oWt6IEmIgfDDZTXCmWbSmXaEDS1IYzEG+qrXN6X
-rMh4Gn7MxwrvWQwp2jYDRk+u5rPJKnh4Bwd0u9u+NZKIAJcpZ7tXgcHZJs6Os/hb
-lIRP4RFQ8f5d0IKueDftXKwoyOKW2imB0m7CAHr4DajHKS+xDVMRe1Wg6IFE1YaS
-D7O6S6tXyGKFZA+QKqN7LuHKmmW1Or5URM7uf5PV6JJfQKqZzu/qLCFyYvA0AFsw
-SeMeAC5HnxIMp3KETHIA0gTCBgPJBpVWp+1D9AQPKhyJIHSShekcBi9SO0xgUB+s
-h1UEcC2zf95Vson0KySX9zWRUZkrU8/0KYhYljN2/vdW8XxkRBC0pl3xWzq2kMgz
-SscZqI/MzyeUHaQno62GRlWn+WKP2NidDfR0Td/ybge1DJX+aDIfjalfCEIbJeqm
-BHn0CZ5z1RofatDlPj4p8+f2Trpcz/JCVKbGiQXi/08ZlCwkSIiOIcBVvAFErWop
-GJOBDU3StS/MXhQVb8ZeCkPBz0TM24Sv1az/MuW4w8gavpQuBC4aD5zY/TOwG8ei
-6S1sAZ0G2uc1A0FOngNvOyYYv+LImZKkWGXrLCRsqq6o/mh3M8bCHEY/lOZW8ZpL
-FCsDOO8deVZl/OX1VtB0bQKCAQEA3qRWDlUpCAU8BKa5Z1oRUz06e5KD58t2HpG8
-ndM3UO/F1XNB/6OGMWpL/XuBKOnWIB39UzsnnEtehKURTqqAsB1K3JQ5Q/FyuXRj
-+o7XnNXe5lHBL5JqBIoESDchSAooQhBlQSjLSL2lg//igk0puv08wMK7UtajkV7U
-35WDa6ks6jfoSeuVibfdobkTgfw5edirOBE2Q0U2KtGsnyAzsM6tRbtgI1Yhg7eX
-nSIc4IYgq2hNLBKsegeiz1w4M6O4CQDVYFWKHyKpdrvj/fG7YZMr6YtTkuC+QPDK
-mmQIEL/lj8E26MnPLKtnTFc06LQry2V3pLWNf4mMLPNLEupEXwKCAQEA2vyg8Npn
-EZRunIr51rYScC6U6iryDjJWCwJxwr8vGU+bkqUOHTl3EqZOi5tDeYJJ+WSBqjfW
-IWrPRFZzTITlAslZ02DQ5enS9PwgUUjl7LUEbHHh+fSNIgkVfDhsuNKFzcEaIM1X
-Dl4lI2T8jEzmBep+k8f6gNmgKBgqlCf7XraorIM5diLFzy2G10zdOQTw5hW3TsVY
-d968YpfC5j57/hCrf36ahIT7o1vxLD+L27Mm9Eiib45woWjaAR1Nc9kUjqY4yV7t
-3QOw/Id9+/Sx5tZftOBvHlFyz23e1yaI3VxsiLDO9RxJwAKyA+KOvAybE2VU28hI
-s5tAYOMV6BpEdwKCAQBqRIQyySERi/YOvkmGdC4KzhHJA7DkBXA2vRcLOdKQVjHW
-ZPIeg728fmEQ90856QrkP4w3mueYKT1PEL7HDojoBsNBr5n5vRgmPtCtulpdqJOA
-2YrdGwRxcDMFCRNgoECA7/R0enU1HhgPfiZuTUha0R6bXxcsPfjKnTn8EhAtZg1j
-KhY8mi7BEjq+Q2l1RJ9mci2fUE/XIgTtwTCkrykc/jkkLICBvU234fyC6tJftIWJ
-avpSzAL5KAXk9b55n25rFbPDDHEl1VSPsLTs8+GdfDKcgXz9gTouIwCBWreizwVS
-bUW5LQIu7w0aGhHN9JlmtuK5glKsikmW9vVhbOH/AoIBAE//O7fgwQguBh5Psqca
-CjBLBAFrQNOo1b/d27r95nHDoBx5CWfppzL75/Od+4825lkhuzB4h1Pb1e2r+yC3
-54UWEydh1c43leYC+LdY/w1yrzQCgj+yc6A8W0nuvuDhnxmj8iyLdsL752s/p/aE
-3P7KRAUuZ7eMSLJ86YkH9g8KgSHMKkCawVJG2lxqauI6iNo0kqtG8mOPzZfiwsMj
-jl4ors27bSz9+4MYwkicyjWvA4r3wcco7MI6MHF5x+KLKbRWyqXddN1pTM1jncVe
-BWNDauEDn/QeYuedxmsoW5Up/0gL9v6Zn+Nx2KAMsoHFxRzXxqEnUE+0Zlc+fbE1
-b08CggEBAMiZmWtRmfueu9NMh6mgs+cmMA1ZHmbnIbtFpVjc37lrKUcjLzGF3tmp
-zQl2wy8IcHpNv8F9aKhwAInxD49RUjyqvRD6Pru+EWN6gOPJIUVuZ6mvaf7BOxbn
-Rve63hN5k4znQ1MOqGRiUkBxYSJ5wnFyQP0/8Y6+JM5uAuRUcKVNyoGURpfMrmB3
-r+KHWltM9/5iIfiDNhwStFiuOJj1YBJVzrcAn8Zh5Q0+s1hXoOUs4doLcaPHTCTU
-3hyX78yROMcZto0pVzxgQrYz31yQ5ocy9WcOYbPbQ5gdlnBEv8d7umNY1siz2wkI
-NaEkKVO0D0jFtk37s/YqJpCsXg/B7yc=
------END PRIVATE KEY-----
diff --git a/third_party/nixpkgs/nixos/tests/image-contents.nix b/third_party/nixpkgs/nixos/tests/image-contents.nix
index 90908968a7..858f7d8c68 100644
--- a/third_party/nixpkgs/nixos/tests/image-contents.nix
+++ b/third_party/nixpkgs/nixos/tests/image-contents.nix
@@ -27,13 +27,19 @@ let
inherit pkgs config;
lib = pkgs.lib;
format = "qcow2";
- contents = [{
- source = pkgs.writeText "testFile" "contents";
- target = "/testFile";
- user = "1234";
- group = "5678";
- mode = "755";
- }];
+ contents = [
+ {
+ source = pkgs.writeText "testFile" "contents";
+ target = "/testFile";
+ user = "1234";
+ group = "5678";
+ mode = "755";
+ }
+ {
+ source = ./.;
+ target = "/testDir";
+ }
+ ];
}) + "/nixos.qcow2";
in makeEc2Test {
@@ -42,10 +48,15 @@ in makeEc2Test {
userData = null;
script = ''
machine.start()
+ # Test that if contents includes a file, it is copied to the target.
assert "content" in machine.succeed("cat /testFile")
fileDetails = machine.succeed("ls -l /testFile")
assert "1234" in fileDetails
assert "5678" in fileDetails
assert "rwxr-xr-x" in fileDetails
+
+ # Test that if contents includes a directory, it is copied to the target.
+ dirList = machine.succeed("ls /testDir")
+ assert "image-contents.nix" in dirList
'';
}
diff --git a/third_party/nixpkgs/nixos/tests/initrd-luks-empty-passphrase.nix b/third_party/nixpkgs/nixos/tests/initrd-luks-empty-passphrase.nix
index 41765a395e..d2805f2f17 100644
--- a/third_party/nixpkgs/nixos/tests/initrd-luks-empty-passphrase.nix
+++ b/third_party/nixpkgs/nixos/tests/initrd-luks-empty-passphrase.nix
@@ -30,26 +30,26 @@ in {
specialisation.boot-luks-wrong-keyfile.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
cryptroot = {
- device = "/dev/vdc";
+ device = "/dev/vdb";
keyFile = "/etc/cryptroot.key";
tryEmptyPassphrase = true;
fallbackToPassword = !systemdStage1;
};
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
boot.initrd.secrets."/etc/cryptroot.key" = keyfile;
};
specialisation.boot-luks-missing-keyfile.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
cryptroot = {
- device = "/dev/vdc";
+ device = "/dev/vdb";
keyFile = "/etc/cryptroot.key";
tryEmptyPassphrase = true;
fallbackToPassword = !systemdStage1;
};
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
};
};
@@ -76,7 +76,7 @@ in {
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
- machine.succeed("echo "" | cryptsetup luksFormat /dev/vdc --batch-mode")
+ machine.succeed("echo "" | cryptsetup luksFormat /dev/vdb --batch-mode")
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks-wrong-keyfile.conf")
machine.succeed("sync")
machine.crash()
diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix
index dbb34c28ee..769049905e 100644
--- a/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix
+++ b/third_party/nixpkgs/nixos/tests/initrd-network-openvpn/default.nix
@@ -1,3 +1,9 @@
+{ system ? builtins.currentSystem
+, config ? {}
+, pkgs ? import ../.. { inherit system config; }
+, systemdStage1 ? false
+}:
+
import ../make-test-python.nix ({ lib, ...}:
{
@@ -22,11 +28,12 @@ import ../make-test-python.nix ({ lib, ...}:
minimalboot =
{ ... }:
{
+ boot.initrd.systemd.enable = systemdStage1;
boot.initrd.network = {
enable = true;
openvpn = {
enable = true;
- configuration = "/dev/null";
+ configuration = builtins.toFile "initrd.ovpn" "";
};
};
};
@@ -39,6 +46,17 @@ import ../make-test-python.nix ({ lib, ...}:
virtualisation.vlans = [ 1 ];
boot.initrd = {
+ systemd.enable = systemdStage1;
+ systemd.extraBin.nc = "${pkgs.busybox}/bin/nc";
+ systemd.services.nc = {
+ requiredBy = ["initrd.target"];
+ after = ["network.target"];
+ serviceConfig = {
+ ExecStart = "/bin/nc -p 1234 -lke /bin/echo TESTVALUE";
+ Type = "oneshot";
+ };
+ };
+
# This command does not fork to keep the VM in the state where
# only the initramfs is loaded
preLVMCommands =
diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
index 0ad0563b0c..017de68820 100644
--- a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
+++ b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix
@@ -22,10 +22,6 @@ import ../make-test-python.nix ({ lib, ... }:
hostKeys = [ ./ssh_host_ed25519_key ];
};
};
- boot.initrd.extraUtilsCommands = ''
- mkdir -p $out/secrets/etc/ssh
- cat "${./ssh_host_ed25519_key}" > $out/secrets/etc/ssh/sh_host_ed25519_key
- '';
boot.initrd.preLVMCommands = ''
while true; do
if [ -f fnord ]; then
diff --git a/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix b/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix
index 775c69d014..d6f9ef9ced 100644
--- a/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix
+++ b/third_party/nixpkgs/nixos/tests/initrd-secrets-changing.nix
@@ -15,7 +15,6 @@ testing.makeTest {
nodes.machine = { ... }: {
virtualisation.useBootLoader = true;
- virtualisation.persistBootDevice = true;
boot.loader.grub.device = "/dev/vda";
diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix b/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix
index b04265658f..6e69ada861 100644
--- a/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix
+++ b/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix
@@ -1,15 +1,5 @@
-{ pkgs, lib, makeInstalledTest, ... }:
+{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.pipewire;
- testConfig = {
- hardware.pulseaudio.enable = false;
- services.pipewire = {
- enable = true;
- pulse.enable = true;
- jack.enable = true;
- alsa.enable = true;
- alsa.support32Bit = true;
- };
- };
}
diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix
index d441765fe1..f385a99ce6 100644
--- a/third_party/nixpkgs/nixos/tests/installer.nix
+++ b/third_party/nixpkgs/nixos/tests/installer.nix
@@ -316,8 +316,9 @@ let
# installer. This ensures the target disk (/dev/vda) is
# the same during and after installation.
virtualisation.emptyDiskImages = [ 512 ];
- virtualisation.bootDevice =
+ virtualisation.rootDevice =
if grubVersion == 1 then "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive2" else "/dev/vdb";
+ virtualisation.bootLoaderDevice = "/dev/vda";
virtualisation.qemu.diskInterface =
if grubVersion == 1 then "scsi" else "virtio";
diff --git a/third_party/nixpkgs/nixos/tests/kanidm.nix b/third_party/nixpkgs/nixos/tests/kanidm.nix
index 33c65026b9..d9c0542c4c 100644
--- a/third_party/nixpkgs/nixos/tests/kanidm.nix
+++ b/third_party/nixpkgs/nixos/tests/kanidm.nix
@@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
};
- networking.hosts."${nodes.server.config.networking.primaryIPAddress}" = [ serverDomain ];
+ networking.hosts."${nodes.server.networking.primaryIPAddress}" = [ serverDomain ];
security.pki.certificateFiles = [ certs.ca.cert ];
};
@@ -56,7 +56,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
# We need access to the config file in the test script.
filteredConfig = pkgs.lib.converge
(pkgs.lib.filterAttrsRecursive (_: v: v != null))
- nodes.server.config.services.kanidm.serverSettings;
+ nodes.server.services.kanidm.serverSettings;
serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig;
in
diff --git a/third_party/nixpkgs/nixos/tests/kubo.nix b/third_party/nixpkgs/nixos/tests/kubo.nix
index 94aa24a920..496f409a40 100644
--- a/third_party/nixpkgs/nixos/tests/kubo.nix
+++ b/third_party/nixpkgs/nixos/tests/kubo.nix
@@ -1,10 +1,10 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
+{ lib, ...} : {
name = "kubo";
- meta = with pkgs.lib.maintainers; {
- maintainers = [ mguentner ];
+ meta = with lib.maintainers; {
+ maintainers = [ mguentner Luflosi ];
};
- nodes.machine = { ... }: {
+ nodes.machine = { config, ... }: {
services.kubo = {
enable = true;
# Also will add a unix domain socket socket API address, see module.
@@ -12,50 +12,74 @@ import ./make-test-python.nix ({ pkgs, ...} : {
settings.Addresses.API = "/ip4/127.0.0.1/tcp/2324";
dataDir = "/mnt/ipfs";
};
+ users.users.alice = {
+ isNormalUser = true;
+ extraGroups = [ config.services.kubo.group ];
+ };
};
- nodes.fuse = { ... }: {
+ nodes.fuse = { config, ... }: {
services.kubo = {
enable = true;
- settings.Addresses.API = "/ip4/127.0.0.1/tcp/2324";
autoMount = true;
};
+ users.users.alice = {
+ isNormalUser = true;
+ extraGroups = [ config.services.kubo.group ];
+ };
+ users.users.bob = {
+ isNormalUser = true;
+ };
};
testScript = ''
start_all()
- # IPv4 activation
-
- machine.succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id")
- ipfs_hash = machine.succeed(
- "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'"
- )
-
- machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
-
- # Unix domain socket activation
+ with subtest("Automatic socket activation"):
+ ipfs_hash = machine.succeed(
+ "echo fnord0 | su alice -l -c 'ipfs add --quieter'"
+ )
+ machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord0")
machine.stop_job("ipfs")
- ipfs_hash = machine.succeed(
- "echo fnord2 | ipfs --api /unix/run/ipfs.sock add | awk '{ print $2 }'"
- )
- machine.succeed(
- f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2"
- )
+ with subtest("IPv4 socket activation"):
+ machine.succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id")
+ ipfs_hash = machine.succeed(
+ "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter"
+ )
+ machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
- # Test if setting dataDir works properly with the hardened systemd unit
- machine.succeed("test -e /mnt/ipfs/config")
- machine.succeed("test ! -e /var/lib/ipfs/")
+ machine.stop_job("ipfs")
- # Test FUSE mountpoint
- ipfs_hash = fuse.succeed(
- "echo fnord3 | ipfs --api /ip4/127.0.0.1/tcp/2324 add --quieter"
- )
+ with subtest("Unix domain socket activation"):
+ ipfs_hash = machine.succeed(
+ "echo fnord2 | ipfs --api /unix/run/ipfs.sock add --quieter"
+ )
+ machine.succeed(
+ f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2"
+ )
- # The FUSE mount functionality is broken as of v0.13.0.
- # See https://github.com/ipfs/kubo/issues/9044.
- # fuse.succeed(f"cat /ipfs/{ipfs_hash.strip()} | grep fnord3")
+ with subtest("Setting dataDir works properly with the hardened systemd unit"):
+ machine.succeed("test -e /mnt/ipfs/config")
+ machine.succeed("test ! -e /var/lib/ipfs/")
+
+ with subtest("FUSE mountpoint"):
+ fuse.fail("echo a | su bob -l -c 'ipfs add --quieter'")
+ # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0.
+ # See https://github.com/ipfs/kubo/issues/9044.
+ # Workaround: using CID Version 1 avoids that.
+ ipfs_hash = fuse.succeed(
+ "echo fnord3 | su alice -l -c 'ipfs add --quieter --cid-version=1'"
+ ).strip()
+
+ fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3")
+
+ with subtest("Unmounting of /ipns and /ipfs"):
+ # Force Kubo to crash and wait for it to restart
+ fuse.systemctl("kill --signal=SIGKILL ipfs.service")
+ fuse.wait_for_unit("ipfs.service", timeout = 30)
+
+ fuse.succeed(f"cat /ipfs/{ipfs_hash} | grep fnord3")
'';
-})
+}
diff --git a/third_party/nixpkgs/nixos/tests/luks.nix b/third_party/nixpkgs/nixos/tests/luks.nix
index 82f5095cb2..c2b95c6a95 100644
--- a/third_party/nixpkgs/nixos/tests/luks.nix
+++ b/third_party/nixpkgs/nixos/tests/luks.nix
@@ -18,10 +18,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
boot-luks.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
# We have two disks and only type one password - key reuse is in place
- cryptroot.device = "/dev/vdc";
- cryptroot2.device = "/dev/vdd";
+ cryptroot.device = "/dev/vdb";
+ cryptroot2.device = "/dev/vdc";
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
};
boot-luks-custom-keymap.configuration = lib.mkMerge [
boot-luks.configuration
@@ -37,8 +37,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
testScript = ''
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
+ machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -")
- machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -")
# Boot from the encrypted disk
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
diff --git a/third_party/nixpkgs/nixos/tests/lvm2/systemd-stage-1.nix b/third_party/nixpkgs/nixos/tests/lvm2/systemd-stage-1.nix
index 617ba77b17..b711cd22d7 100644
--- a/third_party/nixpkgs/nixos/tests/lvm2/systemd-stage-1.nix
+++ b/third_party/nixpkgs/nixos/tests/lvm2/systemd-stage-1.nix
@@ -1,18 +1,18 @@
{ kernelPackages ? null, flavour }: let
preparationCode = {
raid = ''
- machine.succeed("vgcreate test_vg /dev/vdc /dev/vdd")
+ machine.succeed("vgcreate test_vg /dev/vdb /dev/vdc")
machine.succeed("lvcreate -L 512M --type raid0 test_vg -n test_lv")
'';
thinpool = ''
- machine.succeed("vgcreate test_vg /dev/vdc")
+ machine.succeed("vgcreate test_vg /dev/vdb")
machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
'';
vdo = ''
- machine.succeed("vgcreate test_vg /dev/vdc")
+ machine.succeed("vgcreate test_vg /dev/vdb")
machine.succeed("lvcreate --type vdo -n test_lv -L 6G -V 12G test_vg/vdo_pool_lv")
'';
}.${flavour};
@@ -79,7 +79,7 @@ in import ../make-test-python.nix ({ pkgs, ... }: {
kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages;
};
- specialisation.boot-lvm.configuration.virtualisation.bootDevice = "/dev/test_vg/test_lv";
+ specialisation.boot-lvm.configuration.virtualisation.rootDevice = "/dev/test_vg/test_lv";
};
testScript = ''
diff --git a/third_party/nixpkgs/nixos/tests/maddy.nix b/third_party/nixpkgs/nixos/tests/maddy.nix
index 800d254f17..7420430333 100644
--- a/third_party/nixpkgs/nixos/tests/maddy.nix
+++ b/third_party/nixpkgs/nixos/tests/maddy.nix
@@ -10,6 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
primaryDomain = "server";
openFirewall = true;
ensureAccounts = [ "postmaster@server" ];
+ ensureCredentials = {
+ # Do not use this in production. This will make passwords world-readable
+ # in the Nix store
+ "postmaster@server".passwordFile = "${pkgs.writeText "postmaster" "test"}";
+ };
};
};
@@ -49,9 +54,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
server.wait_for_unit("maddy.service")
server.wait_for_open_port(143)
server.wait_for_open_port(587)
-
- server.succeed("maddyctl creds create --password test postmaster@server")
-
client.succeed("send-testmail")
client.succeed("test-imap")
'';
diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix
index 350486e8c7..78fe026b4a 100644
--- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix
+++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix
@@ -26,4 +26,4 @@ foldl
};
})
{ }
- [ 24 25 26 ]
+ [ 25 26 ]
diff --git a/third_party/nixpkgs/nixos/tests/non-default-filesystems.nix b/third_party/nixpkgs/nixos/tests/non-default-filesystems.nix
index 7fa75aaad7..d4e8bfbc65 100644
--- a/third_party/nixpkgs/nixos/tests/non-default-filesystems.nix
+++ b/third_party/nixpkgs/nixos/tests/non-default-filesystems.nix
@@ -5,9 +5,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
nodes.machine =
{ config, pkgs, lib, ... }:
let
- disk = config.virtualisation.bootDevice;
+ disk = config.virtualisation.rootDevice;
in
{
+ virtualisation.rootDevice = "/dev/vda";
virtualisation.useDefaultFilesystems = false;
boot.initrd.availableKernelModules = [ "btrfs" ];
diff --git a/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix b/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix
index 278e947118..c887cde4b8 100644
--- a/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix
+++ b/third_party/nixpkgs/nixos/tests/power-profiles-daemon.nix
@@ -6,6 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
maintainers = [ mvnetbiz ];
};
nodes.machine = { pkgs, ... }: {
+ security.polkit.enable = true;
services.power-profiles-daemon.enable = true;
environment.systemPackages = [ pkgs.glib ];
};
diff --git a/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix b/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix
index 684df9c392..42183625c7 100644
--- a/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix
+++ b/third_party/nixpkgs/nixos/tests/predictable-interface-names.nix
@@ -8,25 +8,48 @@ let
testCombinations = pkgs.lib.cartesianProductOfSets {
predictable = [true false];
withNetworkd = [true false];
+ systemdStage1 = [true false];
};
-in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
+in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd, systemdStage1 }: {
name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
- + pkgs.lib.optionalString withNetworkd "Networkd";
+ + pkgs.lib.optionalString withNetworkd "Networkd"
+ + pkgs.lib.optionalString systemdStage1 "SystemdStage1";
value = makeTest {
- name = "${pkgs.lib.optionalString (!predictable) "un"}predictableInterfaceNames${pkgs.lib.optionalString withNetworkd "-with-networkd"}";
+ name = pkgs.lib.optionalString (!predictable) "un" + "predictableInterfaceNames"
+ + pkgs.lib.optionalString withNetworkd "-with-networkd"
+ + pkgs.lib.optionalString systemdStage1 "-systemd-stage-1";
meta = {};
- nodes.machine = { lib, ... }: {
+ nodes.machine = { lib, ... }: let
+ script = ''
+ ip link
+ if ${lib.optionalString predictable "!"} ip link show eth0; then
+ echo Success
+ else
+ exit 1
+ fi
+ '';
+ in {
networking.usePredictableInterfaceNames = lib.mkForce predictable;
networking.useNetworkd = withNetworkd;
networking.dhcpcd.enable = !withNetworkd;
networking.useDHCP = !withNetworkd;
# Check if predictable interface names are working in stage-1
- boot.initrd.postDeviceCommands = ''
- ip link
- ip link show eth0 ${if predictable then "&&" else "||"} exit 1
- '';
+ boot.initrd.postDeviceCommands = script;
+
+ boot.initrd.systemd = lib.mkIf systemdStage1 {
+ enable = true;
+ initrdBin = [ pkgs.iproute2 ];
+ services.systemd-udev-settle.wantedBy = ["initrd.target"];
+ services.check-interfaces = {
+ requiredBy = ["initrd.target"];
+ after = ["systemd-udev-settle.service"];
+ serviceConfig.Type = "oneshot";
+ path = [ pkgs.iproute2 ];
+ inherit script;
+ };
+ };
};
testScript = ''
diff --git a/third_party/nixpkgs/nixos/tests/promscale.nix b/third_party/nixpkgs/nixos/tests/promscale.nix
new file mode 100644
index 0000000000..d4825b6d7f
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/promscale.nix
@@ -0,0 +1,60 @@
+# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix
+# as it seemed unapproriate to test additional extensions for postgresql there.
+
+{ system ? builtins.currentSystem
+, config ? { }
+, pkgs ? import ../.. { inherit system config; }
+}:
+
+with import ../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+
+let
+ postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
+ test-sql = pkgs.writeText "postgresql-test" ''
+ CREATE USER promscale SUPERUSER PASSWORD 'promscale';
+ CREATE DATABASE promscale OWNER promscale;
+ '';
+
+ make-postgresql-test = postgresql-name: postgresql-package: makeTest {
+ name = postgresql-name;
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ anpin ];
+ };
+
+ nodes.machine = { config, pkgs, ... }:
+ {
+ services.postgresql = {
+ enable = true;
+ package = postgresql-package;
+ extraPlugins = with postgresql-package.pkgs; [
+ timescaledb
+ promscale_extension
+ ];
+ settings = { shared_preload_libraries = "timescaledb, promscale"; };
+ };
+ environment.systemPackages = with pkgs; [ promscale ];
+ };
+
+ testScript = ''
+ machine.start()
+ machine.wait_for_unit("postgresql")
+ with subtest("Postgresql with extensions timescaledb and promscale is available just after unit start"):
+ print(machine.succeed("sudo -u postgres psql -f ${test-sql}"))
+ machine.succeed("sudo -u postgres psql promscale -c 'SHOW shared_preload_libraries;' | grep promscale")
+ machine.succeed(
+ "promscale --db.name promscale --db.password promscale --db.user promscale --db.ssl-mode allow --startup.install-extensions --startup.only"
+ )
+ machine.succeed("sudo -u postgres psql promscale -c 'SELECT ps_trace.get_trace_retention_period();' | grep '(1 row)'")
+ machine.shutdown()
+ '';
+ };
+ #version 15 is not supported yet
+ applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12" && !(versionAtLeast value.version "15")) postgresql-versions;
+in
+mapAttrs'
+ (name: package: {
+ inherit name;
+ value = make-postgresql-test name package;
+ })
+ applicablePostgresqlVersions
diff --git a/third_party/nixpkgs/nixos/tests/pufferpanel.nix b/third_party/nixpkgs/nixos/tests/pufferpanel.nix
new file mode 100644
index 0000000000..e7b09c13f9
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/pufferpanel.nix
@@ -0,0 +1,74 @@
+import ./make-test-python.nix ({ lib, ... }: {
+ name = "pufferpanel";
+ meta.maintainers = [ lib.maintainers.tie ];
+
+ nodes.machine = { pkgs, ... }: {
+ environment.systemPackages = [ pkgs.pufferpanel ];
+ services.pufferpanel = {
+ enable = true;
+ extraPackages = [ pkgs.netcat ];
+ environment = {
+ PUFFER_PANEL_REGISTRATIONENABLED = "false";
+ PUFFER_PANEL_SETTINGS_COMPANYNAME = "NixOS";
+ };
+ };
+ };
+
+ testScript = ''
+ import shlex
+ import json
+
+ curl = "curl --fail-with-body --silent"
+ baseURL = "http://localhost:8080"
+ adminName = "admin"
+ adminEmail = "admin@nixos.org"
+ adminPass = "admin"
+ adminCreds = json.dumps({
+ "email": adminEmail,
+ "password": adminPass,
+ })
+ stopCode = 9 # SIGKILL
+ serverPort = 1337
+ serverDefinition = json.dumps({
+ "name": "netcat",
+ "node": 0,
+ "users": [
+ adminName,
+ ],
+ "type": "netcat",
+ "run": {
+ "stopCode": stopCode,
+ "command": f"nc -l {serverPort}",
+ },
+ "environment": {
+ "type": "standard",
+ },
+ })
+
+ start_all()
+
+ machine.wait_for_unit("pufferpanel.service")
+ machine.wait_for_open_port(5657) # SFTP
+ machine.wait_for_open_port(8080) # HTTP
+
+ # Note that PufferPanel does not initialize database unless necessary.
+ # /api/config endpoint creates database file and triggers migrations.
+ # On success, we run a command to create administrator user that we use to
+ # interact with HTTP API.
+ resp = json.loads(machine.succeed(f"{curl} {baseURL}/api/config"))
+ assert resp["branding"]["name"] == "NixOS", "Invalid company name in configuration"
+ assert resp["registrationEnabled"] == False, "Expected registration to be disabled"
+
+ machine.succeed(f"pufferpanel --workDir /var/lib/pufferpanel user add --admin --name {adminName} --email {adminEmail} --password {adminPass}")
+
+ resp = json.loads(machine.succeed(f"{curl} -d '{adminCreds}' {baseURL}/auth/login"))
+ assert "servers.admin" in resp["scopes"], "User is not administrator"
+ token = resp["session"]
+ authHeader = shlex.quote(f"Authorization: Bearer {token}")
+
+ resp = json.loads(machine.succeed(f"{curl} -H {authHeader} -H 'Content-Type: application/json' -d '{serverDefinition}' {baseURL}/api/servers"))
+ serverID = resp["id"]
+ machine.succeed(f"{curl} -X POST -H {authHeader} {baseURL}/proxy/daemon/server/{serverID}/start")
+ machine.wait_for_open_port(serverPort)
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/swap-file-btrfs.nix b/third_party/nixpkgs/nixos/tests/swap-file-btrfs.nix
index 4f73942b5f..d9fcd2be11 100644
--- a/third_party/nixpkgs/nixos/tests/swap-file-btrfs.nix
+++ b/third_party/nixpkgs/nixos/tests/swap-file-btrfs.nix
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, ... }:
{
virtualisation.useDefaultFilesystems = false;
- virtualisation.bootDevice = "/dev/vda";
+ virtualisation.rootDevice = "/dev/vda";
boot.initrd.postDeviceCommands = ''
${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda
diff --git a/third_party/nixpkgs/nixos/tests/swap-partition.nix b/third_party/nixpkgs/nixos/tests/swap-partition.nix
index 2279630b57..ddcaeb9545 100644
--- a/third_party/nixpkgs/nixos/tests/swap-partition.nix
+++ b/third_party/nixpkgs/nixos/tests/swap-partition.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
{
virtualisation.useDefaultFilesystems = false;
- virtualisation.bootDevice = "/dev/vda1";
+ virtualisation.rootDevice = "/dev/vda1";
boot.initrd.postDeviceCommands = ''
if ! test -b /dev/vda1; then
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-btrfs-raid.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-btrfs-raid.nix
index 40fd2d4dc6..c9cdf0060b 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-btrfs-raid.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-btrfs-raid.nix
@@ -21,14 +21,14 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
fileSystems = lib.mkVMOverride {
"/".fsType = lib.mkForce "btrfs";
};
- virtualisation.bootDevice = "/dev/vdc";
+ virtualisation.rootDevice = "/dev/vdb";
};
};
testScript = ''
# Create RAID
- machine.succeed("mkfs.btrfs -d raid0 /dev/vdc /dev/vdd")
- machine.succeed("mkdir -p /mnt && mount /dev/vdc /mnt && echo hello > /mnt/test && umount /mnt")
+ machine.succeed("mkfs.btrfs -d raid0 /dev/vdb /dev/vdc")
+ machine.succeed("mkdir -p /mnt && mount /dev/vdb /mnt && echo hello > /mnt/test && umount /mnt")
# Boot from the RAID
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-btrfs-raid.conf")
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
# Ensure we have successfully booted from the RAID
assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1
- assert "/dev/vdc on / type btrfs" in machine.succeed("mount")
+ assert "/dev/vdb on / type btrfs" in machine.succeed("mount")
assert "hello" in machine.succeed("cat /test")
assert "Total devices 2" in machine.succeed("btrfs filesystem show")
'';
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-fido2.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-fido2.nix
index 133e552a3d..e80d95f79c 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-fido2.nix
@@ -19,19 +19,19 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
specialisation.boot-luks.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
cryptroot = {
- device = "/dev/vdc";
+ device = "/dev/vdb";
crypttabExtraOpts = [ "fido2-device=auto" ];
};
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
};
};
testScript = ''
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
- machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -")
- machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdc |& systemd-cat")
+ machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
+ machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --fido2-device=auto /dev/vdb |& systemd-cat")
# Boot from the encrypted disk
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-keyfile.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-keyfile.nix
index 25c0c5bd86..257243d92a 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-keyfile.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-keyfile.nix
@@ -27,11 +27,11 @@ in {
specialisation.boot-luks.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
cryptroot = {
- device = "/dev/vdc";
+ device = "/dev/vdb";
keyFile = "/etc/cryptroot.key";
};
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
boot.initrd.secrets."/etc/cryptroot.key" = keyfile;
};
};
@@ -39,7 +39,7 @@ in {
testScript = ''
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
- machine.succeed("cryptsetup luksFormat -q --iter-time=1 -d ${keyfile} /dev/vdc")
+ machine.succeed("cryptsetup luksFormat -q --iter-time=1 -d ${keyfile} /dev/vdb")
# Boot from the encrypted disk
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-password.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-password.nix
index 55d0b4324b..2dd3f304e8 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-password.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-password.nix
@@ -19,10 +19,10 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
specialisation.boot-luks.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
# We have two disks and only type one password - key reuse is in place
- cryptroot.device = "/dev/vdc";
- cryptroot2.device = "/dev/vdd";
+ cryptroot.device = "/dev/vdb";
+ cryptroot2.device = "/dev/vdc";
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
# test mounting device unlocked in initrd after switching root
virtualisation.fileSystems."/cryptroot2".device = "/dev/mapper/cryptroot2";
};
@@ -31,9 +31,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
testScript = ''
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
+ machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -")
- machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdd -")
- machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdd cryptroot2")
+ machine.succeed("echo -n supersecret | cryptsetup luksOpen -q /dev/vdc cryptroot2")
machine.succeed("mkfs.ext4 /dev/mapper/cryptroot2")
# Boot from the encrypted disk
@@ -47,7 +47,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
machine.send_console("supersecret\n")
machine.wait_for_unit("multi-user.target")
- assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount")
+ assert "/dev/mapper/cryptroot on / type ext4" in machine.succeed("mount"), "/dev/mapper/cryptroot do not appear in mountpoints list"
assert "/dev/mapper/cryptroot2 on /cryptroot2 type ext4" in machine.succeed("mount")
'';
})
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix
index 085088d2ee..734ef38579 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-luks-tpm2.nix
@@ -21,11 +21,11 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
specialisation.boot-luks.configuration = {
boot.initrd.luks.devices = lib.mkVMOverride {
cryptroot = {
- device = "/dev/vdc";
+ device = "/dev/vdb";
crypttabExtraOpts = [ "tpm2-device=auto" ];
};
};
- virtualisation.bootDevice = "/dev/mapper/cryptroot";
+ virtualisation.rootDevice = "/dev/mapper/cryptroot";
};
};
@@ -55,8 +55,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
# Create encrypted volume
machine.wait_for_unit("multi-user.target")
- machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdc -")
- machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --tpm2-pcrs= --tpm2-device=auto /dev/vdc |& systemd-cat")
+ machine.succeed("echo -n supersecret | cryptsetup luksFormat -q --iter-time=1 /dev/vdb -")
+ machine.succeed("PASSWORD=supersecret SYSTEMD_LOG_LEVEL=debug systemd-cryptenroll --tpm2-pcrs= --tpm2-device=auto /dev/vdb |& systemd-cat")
# Boot from the encrypted disk
machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-luks.conf")
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix
new file mode 100644
index 0000000000..943552613b
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd-ssh.nix
@@ -0,0 +1,82 @@
+import ./make-test-python.nix ({ lib, ... }: {
+ name = "systemd-initrd-network-ssh";
+ meta.maintainers = [ lib.maintainers.elvishjerricco ];
+
+ nodes = with lib; {
+ server = { config, pkgs, ... }: {
+ environment.systemPackages = [pkgs.cryptsetup];
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.timeout = 0;
+ virtualisation = {
+ emptyDiskImages = [ 4096 ];
+ useBootLoader = true;
+ useEFIBoot = true;
+ };
+
+ specialisation.encrypted-root.configuration = {
+ virtualisation.bootDevice = "/dev/mapper/root";
+ boot.initrd.luks.devices = lib.mkVMOverride {
+ root.device = "/dev/vdc";
+ };
+ boot.initrd.systemd.enable = true;
+ boot.initrd.network = {
+ enable = true;
+ ssh = {
+ enable = true;
+ authorizedKeys = [ (readFile ./initrd-network-ssh/id_ed25519.pub) ];
+ port = 22;
+ # Terrible hack so it works with useBootLoader
+ hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ];
+ };
+ };
+ };
+ };
+
+ client = { config, ... }: {
+ environment.etc = {
+ knownHosts = {
+ text = concatStrings [
+ "server,"
+ "${
+ toString (head (splitString " " (toString
+ (elemAt (splitString "\n" config.networking.extraHosts) 2))))
+ } "
+ "${readFile ./initrd-network-ssh/ssh_host_ed25519_key.pub}"
+ ];
+ };
+ sshKey = {
+ source = ./initrd-network-ssh/id_ed25519;
+ mode = "0600";
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ def ssh_is_up(_) -> bool:
+ status, _ = client.execute("nc -z server 22")
+ return status == 0
+
+ server.wait_for_unit("multi-user.target")
+ server.succeed(
+ "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdc",
+ "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
+ "sync",
+ )
+ server.shutdown()
+ server.start()
+
+ client.wait_for_unit("network.target")
+ with client.nested("waiting for SSH server to come up"):
+ retry(ssh_is_up)
+
+ client.succeed(
+ "echo somepass | ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'systemd-tty-ask-password-agent' & exit"
+ )
+
+ server.wait_for_unit("multi-user.target")
+ server.succeed("mount | grep '/dev/mapper/root on /'")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix
new file mode 100644
index 0000000000..00ecbec561
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-networkd.nix
@@ -0,0 +1,74 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ name = "systemd-initrd-network";
+ meta.maintainers = [ lib.maintainers.elvishjerricco ];
+
+ nodes = let
+ mkFlushTest = flush: script: { ... }: {
+ boot.initrd.systemd.enable = true;
+ boot.initrd.network = {
+ enable = true;
+ flushBeforeStage2 = flush;
+ };
+ systemd.services.check-flush = {
+ requiredBy = ["multi-user.target"];
+ before = ["network-pre.target" "multi-user.target"];
+ unitConfig.DefaultDependencies = false;
+ serviceConfig.Type = "oneshot";
+ path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
+ inherit script;
+ };
+ };
+ in {
+ basic = { ... }: {
+ boot.initrd.network.enable = true;
+
+ boot.initrd.systemd = {
+ enable = true;
+ # Enable network-online to fail the test in case of timeout
+ network.wait-online.timeout = 10;
+ network.wait-online.anyInterface = true;
+ targets.network-online.requiredBy = [ "initrd.target" ];
+ services.systemd-networkd-wait-online.requiredBy =
+ [ "network-online.target" ];
+
+ initrdBin = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
+ services.check = {
+ requiredBy = [ "initrd.target" ];
+ before = [ "initrd.target" ];
+ after = [ "network-online.target" ];
+ serviceConfig.Type = "oneshot";
+ path = [ pkgs.iproute2 pkgs.iputils pkgs.gnugrep ];
+ script = ''
+ ip addr | grep 10.0.2.15 || exit 1
+ ping -c1 10.0.2.2 || exit 1
+ '';
+ };
+ };
+ };
+
+ doFlush = mkFlushTest true ''
+ if ip addr | grep 10.0.2.15; then
+ echo "Network configuration survived switch-root; flushBeforeStage2 failed"
+ exit 1
+ fi
+ '';
+
+ dontFlush = mkFlushTest false ''
+ if ! (ip addr | grep 10.0.2.15); then
+ echo "Network configuration didn't survive switch-root"
+ exit 1
+ fi
+ '';
+ };
+
+ testScript = ''
+ start_all()
+ basic.wait_for_unit("multi-user.target")
+ doFlush.wait_for_unit("multi-user.target")
+ dontFlush.wait_for_unit("multi-user.target")
+ # Make sure the systemd-network user was set correctly in initrd
+ basic.succeed("[ $(stat -c '%U,%G' /run/systemd/netif/links) = systemd-network,systemd-network ]")
+ basic.succeed("ip addr show >&2")
+ basic.succeed("ip route show >&2")
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix
index f7f4863d17..a6a22e9d48 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-simple.nix
@@ -27,6 +27,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
machine.succeed("[ -e /dev/pts/ptmx ]") # /dev/pts
machine.succeed("[ -e /run/keys ]") # /run/keys
+ with subtest("groups work"):
+ machine.fail("journalctl -b 0 | grep 'systemd-udevd.*Unknown group.*ignoring'")
with subtest("growfs works"):
oldAvail = machine.succeed("df --output=avail / | sed 1d")
diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix
index 28a0fb3192..d201ba99a2 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix
@@ -20,18 +20,18 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
services.swraid = {
enable = true;
mdadmConf = ''
- ARRAY /dev/md0 devices=/dev/vdc,/dev/vdd
+ ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc
'';
};
kernelModules = [ "raid0" ];
};
- specialisation.boot-swraid.configuration.virtualisation.bootDevice = "/dev/disk/by-label/testraid";
+ specialisation.boot-swraid.configuration.virtualisation.rootDevice = "/dev/disk/by-label/testraid";
};
testScript = ''
# Create RAID
- machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid0 /dev/vdc /dev/vdd")
+ machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid0 /dev/vdb /dev/vdc")
machine.succeed("mkfs.ext4 -L testraid /dev/md0")
machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
diff --git a/third_party/nixpkgs/nixos/tests/web-apps/monica.nix b/third_party/nixpkgs/nixos/tests/web-apps/monica.nix
new file mode 100644
index 0000000000..29f5cb85bb
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/web-apps/monica.nix
@@ -0,0 +1,33 @@
+import ../make-test-python.nix ({pkgs, ...}:
+let
+ cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } ''
+ openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500
+ mkdir -p $out
+ cp key.pem cert.pem $out
+ '';
+in
+{
+ name = "monica";
+
+ nodes = {
+ machine = {pkgs, ...}: {
+ services.monica = {
+ enable = true;
+ hostname = "localhost";
+ appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}";
+ nginx = {
+ forceSSL = true;
+ sslCertificate = "${cert}/cert.pem";
+ sslCertificateKey = "${cert}/key.pem";
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("monica-setup.service")
+ machine.wait_for_open_port(443)
+ machine.succeed("curl -k --fail https://localhost", timeout=10)
+ '';
+})
diff --git a/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix b/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix
new file mode 100644
index 0000000000..123d774205
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/web-apps/snipe-it.nix
@@ -0,0 +1,101 @@
+/*
+Snipe-IT NixOS test
+
+It covers the following scenario:
+- Installation
+- Backup and restore
+
+Scenarios NOT covered by this test (but perhaps in the future):
+- Sending and receiving emails
+*/
+{ pkgs, ... }: let
+ siteName = "NixOS Snipe-IT Test Instance";
+in {
+ name = "snipe-it";
+
+ meta.maintainers = with pkgs.lib.maintainers; [ yayayayaka ];
+
+ nodes = {
+ snipeit = { ... }: {
+ services.snipe-it = {
+ enable = true;
+ appKeyFile = toString (pkgs.writeText "snipe-it-app-key" "uTqGUN5GUmUrh/zSAYmhyzRk62pnpXICyXv9eeITI8k=");
+ hostName = "localhost";
+ database.createLocally = true;
+ mail = {
+ driver = "smtp";
+ encryption = "tls";
+ host = "localhost";
+ port = 1025;
+ from.name = "Snipe-IT NixOS test";
+ from.address = "snipe-it@localhost";
+ replyTo.address = "snipe-it@localhost";
+ user = "snipe-it@localhost";
+ passwordFile = toString (pkgs.writeText "snipe-it-mail-pass" "a-secure-mail-password");
+ };
+ };
+ };
+ };
+
+ testScript = { nodes }: let
+ backupPath = "${nodes.snipeit.services.snipe-it.dataDir}/storage/app/backups";
+
+ # Snipe-IT has been installed successfully if the site name shows up on the login page
+ checkLoginPage = { shouldSucceed ? true }: ''
+ snipeit.${if shouldSucceed then "succeed" else "fail"}("""curl http://localhost/login | grep '${siteName}'""")
+ '';
+ in ''
+ start_all()
+
+ snipeit.wait_for_unit("nginx.service")
+ snipeit.wait_for_unit("snipe-it-setup.service")
+
+ # Create an admin user
+ snipeit.succeed(
+ """
+ snipe-it snipeit:create-admin \
+ --username="admin" \
+ --email="janedoe@localhost" \
+ --password="extremesecurepassword" \
+ --first_name="Jane" \
+ --last_name="Doe"
+ """
+ )
+
+ with subtest("Circumvent the pre-flight setup by just writing some settings into the database ourself"):
+ snipeit.succeed(
+ """
+ mysql -D ${nodes.snipeit.services.snipe-it.database.name} -e "INSERT INTO settings (id, user_id, site_name) VALUES ('1', '1', '${siteName}');"
+ """
+ )
+
+ # Usually these are generated during the pre-flight setup
+ snipeit.succeed("snipe-it passport:keys")
+
+
+ # Login page should now contain the configured site name
+ ${checkLoginPage {}}
+
+ with subtest("Test Backup and restore"):
+ snipeit.succeed("snipe-it snipeit:backup")
+
+ # One zip file should have been created
+ snipeit.succeed("""[ "$(ls -1 "${backupPath}" | wc -l)" -eq 1 ]""")
+
+ # Purge the state
+ snipeit.succeed("snipe-it migrate:fresh --force")
+
+ # Login page should disappear
+ ${checkLoginPage { shouldSucceed = false; }}
+
+ # Restore the state
+ snipeit.succeed(
+ """
+ snipe-it snipeit:restore --force $(find "${backupPath}/" -type f -name "*.zip")
+ """
+ )
+
+ # Login page should be back again
+ ${checkLoginPage {}}
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/web-servers/stargazer.nix b/third_party/nixpkgs/nixos/tests/web-servers/stargazer.nix
new file mode 100644
index 0000000000..6e720b120d
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/web-servers/stargazer.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+{
+ name = "stargazer";
+ meta = with lib.maintainers; { maintainers = [ gaykitty ]; };
+
+ nodes = {
+ geminiserver = { pkgs, ... }: {
+ services.stargazer = {
+ enable = true;
+ routes = {
+ "localhost" = {
+ root = toString (pkgs.writeTextDir "index.gmi" ''
+ # Hello NixOS!
+ '');
+ };
+ };
+ };
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ geminiserver.wait_for_unit("stargazer")
+ geminiserver.wait_for_open_port(1965)
+
+ with subtest("check is serving over gemini"):
+ response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965")
+ print(response)
+ assert "Hello NixOS!" in response
+ '';
+}
diff --git a/third_party/nixpkgs/nixos/tests/zfs.nix b/third_party/nixpkgs/nixos/tests/zfs.nix
index bcb9d9bcfd..8e52e00657 100644
--- a/third_party/nixpkgs/nixos/tests/zfs.nix
+++ b/third_party/nixpkgs/nixos/tests/zfs.nix
@@ -80,6 +80,11 @@ let
fsType = "zfs";
options = [ "noauto" ];
};
+ virtualisation.fileSystems."/manual/httpkey" = {
+ device = "manual/httpkey";
+ fsType = "zfs";
+ options = [ "noauto" ];
+ };
};
specialisation.forcepool.configuration = {
@@ -92,21 +97,34 @@ let
options = [ "noauto" ];
};
};
+
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ localhost = {
+ locations = {
+ "/zfskey" = {
+ return = ''200 "httpkeyabc"'';
+ };
+ };
+ };
+ };
+ };
};
testScript = ''
machine.wait_for_unit("multi-user.target")
machine.succeed(
"zpool status",
+ "parted --script /dev/vdb mklabel msdos",
+ "parted --script /dev/vdb -- mkpart primary 1024M -1s",
"parted --script /dev/vdc mklabel msdos",
"parted --script /dev/vdc -- mkpart primary 1024M -1s",
- "parted --script /dev/vdd mklabel msdos",
- "parted --script /dev/vdd -- mkpart primary 1024M -1s",
)
with subtest("sharesmb works"):
machine.succeed(
- "zpool create rpool /dev/vdc1",
+ "zpool create rpool /dev/vdb1",
"zfs create -o mountpoint=legacy rpool/root",
# shared datasets cannot have legacy mountpoint
"zfs create rpool/shared_smb",
@@ -126,10 +144,12 @@ let
with subtest("encryption works"):
machine.succeed(
'echo password | zpool create -O mountpoint=legacy '
- + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdc1",
- "zpool create -O mountpoint=legacy manual /dev/vdd1",
+ + "-O encryption=aes-256-gcm -O keyformat=passphrase automatic /dev/vdb1",
+ "zpool create -O mountpoint=legacy manual /dev/vdc1",
"echo otherpass | zfs create "
+ "-o encryption=aes-256-gcm -o keyformat=passphrase manual/encrypted",
+ "zfs create -o encryption=aes-256-gcm -o keyformat=passphrase "
+ + "-o keylocation=http://localhost/zfskey manual/httpkey",
"bootctl set-default nixos-generation-1-specialisation-encryption.conf",
"sync",
"zpool export automatic",
@@ -141,10 +161,12 @@ let
machine.send_console("password\n")
machine.wait_for_unit("multi-user.target")
machine.succeed(
- "zfs get keystatus manual/encrypted | grep unavailable",
+ "zfs get -Ho value keystatus manual/encrypted | grep -Fx unavailable",
"echo otherpass | zfs load-key manual/encrypted",
"systemctl start manual-encrypted.mount",
- "umount /automatic /manual/encrypted /manual",
+ "zfs load-key manual/httpkey",
+ "systemctl start manual-httpkey.mount",
+ "umount /automatic /manual/encrypted /manual/httpkey /manual",
"zpool destroy automatic",
"zpool destroy manual",
)
@@ -153,7 +175,7 @@ let
machine.succeed(
"rm /etc/hostid",
"zgenhostid deadcafe",
- "zpool create forcepool /dev/vdc1 -O mountpoint=legacy",
+ "zpool create forcepool /dev/vdb1 -O mountpoint=legacy",
"bootctl set-default nixos-generation-1-specialisation-forcepool.conf",
"rm /etc/hostid",
"sync",
diff --git a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix
index d72c1043a9..9d3d568be2 100644
--- a/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/accessibility/contrast/default.nix
@@ -11,14 +11,13 @@
, ninja
, pango
, pkg-config
-, python3
, rustPlatform
, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
pname = "contrast";
- version = "0.0.5";
+ version = "0.0.7";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@@ -26,13 +25,13 @@ stdenv.mkDerivation rec {
owner = "design";
repo = "contrast";
rev = version;
- sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0=";
+ hash = "sha256-waoXv8dzqynkpfEPZSgZnS6fyo9+9+3Q2oy2fMtEsoE=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ=";
+ hash = "sha256-94QwPSiGjjPuskg5w6QfM5FuChFno7f9dh0Xr2wWKCI=";
};
nativeBuildInputs = [
@@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
- python3
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook4
- glib # for glib-compile-resources
];
buildInputs = [
@@ -57,13 +54,6 @@ stdenv.mkDerivation rec {
pango
];
- postPatch = ''
- patchShebangs build-aux/meson_post_install.py
- # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23
- substituteInPlace build-aux/meson_post_install.py \
- --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
- '';
-
meta = with lib; {
description = "Checks whether the contrast between two colors meet the WCAG requirements";
homepage = "https://gitlab.gnome.org/World/design/contrast";
@@ -74,4 +64,3 @@ stdenv.mkDerivation rec {
broken = stdenv.isDarwin;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix
index 15db4c1cf0..36d9ea7fb8 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "airwindows-lv2";
- version = "16.0";
+ version = "18.0";
src = fetchFromGitHub {
owner = "hannesbraun";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-jdeJ/VAJTDeiR9pyYps82F2Ty16r+a/FK+XV5L3rWco=";
+ sha256 = "sha256-06mfTvt0BXHUGZG2rnEbuOPIP+jD76mQZTo+m4b4lo4=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix
index ed421277f9..9f0b04fbec 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix
@@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
- version = "unstable-2023-01-12";
+ version = "0.10.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
- rev = "0623386c813d0d68564002324958cef7217cec7f";
- hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ=";
+ rev = version;
+ hash = "sha256-pvvpiZHp3Gj3rtjvlnfmC2E0mcmh0/poxidhJC8j4Cg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso=";
+ hash = "sha256-eb4vVgSAvR2LYVmZmdOIoXxJqFz6q78PIoQPVrOIffc=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix b/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix
index 2bf6b2a804..f68c6fa5c7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/artyFX/default.nix
@@ -2,14 +2,13 @@
stdenv.mkDerivation rec {
pname = "artyFX";
- # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0
- version = "unstable-2020-04-28";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-ArtyFX";
- rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa";
- sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail";
+ rev = "release-${version}";
+ hash = "sha256-GD9nwXdXSJX5OvAMxEAnngkvRW+E1jrNfWXK122bsTM=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
index 24d610f62d..a531269bc4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix
@@ -61,17 +61,19 @@
stdenv.mkDerivation rec {
pname = "audacity";
- version = "3.2.5";
+ version = "3.3.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "Audacity-${version}";
- hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ=";
+ hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
};
postPatch = ''
mkdir src/private
+ substituteInPlace scripts/build/macOS/fix_bundle.py \
+ --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace libraries/lib-files/FileNames.cpp \
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
@@ -148,16 +150,20 @@ stdenv.mkDerivation rec {
"-Daudacity_conan_enabled=Off"
"-Daudacity_use_ffmpeg=loaded"
"-Daudacity_has_vst3=Off"
+ "-Daudacity_has_crashreports=Off"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
+
+ # Fix duplicate store paths
+ "-DCMAKE_INSTALL_LIBDIR=lib"
];
# [ 57%] Generating LightThemeAsCeeCode.h...
# ../../utils/image-compiler: error while loading shared libraries:
# lib-theme.so: cannot open shared object file: No such file or directory
preBuild = ''
- export LD_LIBRARY_PATH=$PWD/utils
+ export LD_LIBRARY_PATH=$PWD/Release/lib/audacity
'';
doCheck = false; # Test fails
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index e6b0bea5d4..9d4da64074 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
- version = "4.4.8";
+ version = "4.4.10";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
- sha256 = "sha256-qdqRvCmp6Q7lcTdOIEHeQKAAOLtJxs867gapopyeHuc=";
+ sha256 = "sha256-gtQ1mhXk0AqGidZk5TCzSR58pD1JJoELMBmELtqyb4U=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
index d86d8c6c1a..34b4b7ab18 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
@@ -28,6 +28,7 @@
# output plugins
, alsaSupport ? true, alsa-lib
, pulseSupport ? config.pulseaudio or true, libpulseaudio
+, pipewireSupport ? true, pipewire
# effect plugins
, resamplerSupport ? true, libsamplerate
, overloadSupport ? true, zlib
@@ -40,7 +41,7 @@ assert gtk2Support || gtk3Support;
let
inherit (lib) optionals;
- version = "1.9.4";
+ version = "1.9.5";
in clangStdenv.mkDerivation {
pname = "deadbeef";
inherit version;
@@ -50,7 +51,7 @@ in clangStdenv.mkDerivation {
repo = "deadbeef";
fetchSubmodules = true;
rev = version;
- sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84=";
+ hash = "sha256-dSSIaJxHYUVOmuJN2t5UZSC3ZP5732/qVXSZAuWYr0Q=";
};
buildInputs = [
@@ -92,6 +93,8 @@ in clangStdenv.mkDerivation {
alsa-lib
] ++ optionals pulseSupport [
libpulseaudio
+ ] ++ optionals pipewireSupport [
+ pipewire
] ++ optionals resamplerSupport [
libsamplerate
] ++ optionals overloadSupport [
@@ -121,6 +124,7 @@ in clangStdenv.mkDerivation {
meta = with lib; {
description = "Ultimate Music Player for GNU/Linux";
homepage = "http://deadbeef.sourceforge.net/";
+ downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.abbradar ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index d0b0d0a865..a6d6409f9f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -9,7 +9,7 @@
let
pname = "deadbeef-mpris2-plugin";
- version = "1.14";
+ version = "1.16";
in stdenv.mkDerivation {
inherit pname version;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
owner = "DeaDBeeF-Player";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho=";
+ hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
index 151f03797c..5949458715 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "3.2.8";
+ version = "3.2.10";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk=";
+ sha256 = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
index 62c5962b53..e45627162e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix
@@ -37,13 +37,13 @@
stdenv.mkDerivation rec {
pname = "easyeffects";
- version = "7.0.1";
+ version = "7.0.3";
src = fetchFromGitHub {
owner = "wwmm";
repo = "easyeffects";
rev = "v${version}";
- sha256 = "sha256-PI29TJSYa/dARlSHe4mO4ejV+muhGFhwVvhA10jziTA=";
+ sha256 = "sha256-vHswNRu4JrW95nZaEBs95exUqslO0dyIr41E1gJhHow=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
index df42258700..a49b683363 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,24 +1,24 @@
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
-, AudioUnit, CoreAudio, CoreMIDI, CoreServices
+, AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices
}:
stdenv.mkDerivation rec {
pname = "fluidsynth";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
- sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k";
+ sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM=";
};
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
buildInputs = [ glib libsndfile libjack2 ]
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ]
- ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
+ ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ];
cmakeFlags = [
"-Denable-framework=off"
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
index e5d132ac6a..814dbed3d8 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ft2-clone";
- version = "1.65";
+ version = "1.66";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${version}";
- sha256 = "sha256-Jo1qs0d8/o9FWR7jboWCJ7ntawBGTlm7yPzxxUnZLsI=";
+ sha256 = "sha256-glLgjZFWvz/bJe9R8KTDu4+778dueC9tw3nVKF3xcps=";
};
# Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh)
diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
index e6d409db40..a7f8dcd442 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix
@@ -1,22 +1,20 @@
{ lib
-, fetchFromGitHub
, buildGoModule
-, clangStdenv
+, fetchFromGitHub
, pkg-config
, alsa-lib
, flac
}:
-# gcc only supports objc on darwin
-buildGoModule.override { stdenv = clangStdenv; } rec {
+buildGoModule rec {
pname = "go-musicfox";
- version = "4.0.1";
+ version = "4.0.5";
src = fetchFromGitHub {
owner = "anhoder";
repo = pname;
rev = "v${version}";
- hash = "sha256-eOcQWw5wXU59/EzDLk028mV/Ro6Ii0DYcp4wdDedhrA=";
+ hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss=";
};
deleteVendor = true;
@@ -45,6 +43,6 @@ buildGoModule.override { stdenv = clangStdenv; } rec {
homepage = "https://github.com/anhoder/go-musicfox";
license = licenses.mit;
mainProgram = "musicfox";
- maintainers = with maintainers; [ zendo Ruixi-rebirth ];
+ maintainers = with maintainers; [ zendo Ruixi-rebirth aleksana ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ledfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ledfx/default.nix
new file mode 100644
index 0000000000..507ce0d9a7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/ledfx/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, fetchpatch
+, python3
+}:
+
+python3.pkgs.buildPythonPackage rec {
+ pname = "ledfx";
+ version = "2.0.64";
+ format = "setuptools";
+
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ hash = "sha256-TKRa4PcMd0Jl94XD2WubOhmsxZaUplZeWKsuKz83Rl4=";
+ };
+
+ patches = [
+ # replace tcp-latency which is not packaged with icmplib
+ (fetchpatch {
+ url = "https://github.com/LedFx/LedFx/commit/98cd4256846ae3bdae7094eeacb3b02a4807dc6f.patch";
+ excludes = [
+ # only used in win.spec file which is windows specific
+ "hiddenimports.py"
+ ];
+ hash = "sha256-p9fiLdjZI5fe5Qy2xbJIAtblp/7BwUxAvwjHQy5l9nQ=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace '"openrgb-python~=0.2.10",' "" \
+ --replace '"pyupdater>=3.1.0",' "" \
+ --replace "'rpi-ws281x>=4.3.0; platform_system == \"Linux\"'," "" \
+ --replace "~=" ">="
+ '';
+
+ propagatedBuildInputs = with python3.pkgs; [
+ aiohttp
+ aiohttp-cors
+ aubio
+ certifi
+ cython
+ flux-led
+ icmplib
+ multidict
+ numpy
+ # openrgb-python # not packaged
+ paho-mqtt
+ pillow
+ psutil
+ pyserial
+ pystray
+ # rpi-ws281x # not packaged
+ requests
+ sacn
+ samplerate
+ sentry-sdk
+ sounddevice
+ uvloop
+ voluptuous
+ zeroconf
+ ];
+
+ # has no tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "LedFx is a network based LED effect controller with support for advanced real-time audio effects";
+ homepage = "https://github.com/LedFx/LedFx";
+ changelog = "https://github.com/LedFx/LedFx/blob/${version}/CHANGELOG.rst";
+ license = licenses.gpl3Only;
+ maintainers = teams.c3d2.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
index befa0ac206..a21495027c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
@@ -1,42 +1,72 @@
-{ stdenv, lib, fetchFromGitHub }:
+{ stdenv, stdenvNoCC, lib, symlinkJoin, fetchFromGitHub }:
let
- voices = fetchFromGitHub {
- owner = "numediart";
- repo = "MBROLA-voices";
- rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit
- sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0";
- };
-in
-stdenv.mkDerivation rec {
pname = "mbrola";
version = "3.3";
- src = fetchFromGitHub {
- owner = "numediart";
- repo = "MBROLA";
- rev = version;
- sha256 = "1w86gv6zs2cbr0731n49z8v6xxw0g8b0hzyv2iqb9mqcfh38l8zy";
- };
-
- # required for cross compilation
- makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-
- installPhase = ''
- runHook preInstall
- install -D Bin/mbrola $out/bin/mbrola
-
- # TODO: package separately because it's very big
- install -d $out/share/mbrola/voices
- cp -R ${voices}/data/* $out/share/mbrola/voices/
- runHook postInstall
- '';
-
meta = with lib; {
- description = "Speech synthesizer based on the concatenation of diphones";
- homepage = "https://github.com/numediart/MBROLA";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ davidak ];
platforms = platforms.linux;
+ description = "Speech synthesizer based on the concatenation of diphones";
+ homepage = "https://github.com/numediart/MBROLA";
};
+
+ voices = stdenvNoCC.mkDerivation {
+ pname = "${pname}-voices";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "numediart";
+ repo = "MBROLA-voices";
+ rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit
+ sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0";
+ };
+
+ dontBuild = true;
+ installPhase = ''
+ runHook preInstall
+ install -d $out/share/mbrola/voices
+ cp -R $src/data/* $out/share/mbrola/voices/
+ runHook postInstall
+ '';
+ dontFixup = true;
+
+ meta = meta // {
+ description = "Speech synthesizer based on the concatenation of diphones (voice files)";
+ homepage = "https://github.com/numediart/MBROLA-voices";
+ };
+ };
+
+ bin = stdenv.mkDerivation {
+ pname = "${pname}-bin";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "numediart";
+ repo = "MBROLA";
+ rev = version;
+ sha256 = "1w86gv6zs2cbr0731n49z8v6xxw0g8b0hzyv2iqb9mqcfh38l8zy";
+ };
+
+ # required for cross compilation
+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+
+ installPhase = ''
+ runHook preInstall
+ install -D Bin/mbrola $out/bin/mbrola
+ rm -rf $out/share/mbrola/voices/*
+ runHook postInstall
+ '';
+
+ meta = meta // {
+ description = "Speech synthesizer based on the concatenation of diphones (binary only)";
+ };
+ };
+
+in
+symlinkJoin {
+ inherit pname version meta;
+ name = "${pname}-${version}";
+ paths = [ bin voices ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix
index 7790380f9b..33218cf868 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/jellyfin.nix
@@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-jellyfin";
- version = "1.0.2";
+ version = "1.0.4";
src = python3Packages.fetchPypi {
inherit version;
pname = "Mopidy-Jellyfin";
- sha256 = "0j7v5xx3c401r5dw1sqm1n2263chjga1d3ml85rg79hjhhhacy75";
+ sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c=";
};
propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix
index 81c689a343..a83a3b019a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/somafm.nix
@@ -2,17 +2,15 @@
python3Packages.buildPythonApplication rec {
pname = "mopidy-somafm";
- version = "2.0.0";
+ version = "2.0.2";
src = python3Packages.fetchPypi {
inherit version;
pname = "Mopidy-SomaFM";
- sha256 = "1j88rrliys8hqvnb35k1xqw88bvrllcb4rb53lgh82byhscsxlf3";
+ sha256 = "DC0emxkoWfjGHih2C8nINBFByf521Xf+3Ks4JRxNPLM=";
};
- propagatedBuildInputs = [
- mopidy
- ];
+ propagatedBuildInputs = [ mopidy ];
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
index 36c8a2409a..1e97b7badb 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mpg123/default.nix
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
stdenv.mkDerivation rec {
pname = "${lib.optionalString libOnly "lib"}mpg123";
- version = "1.31.2";
+ version = "1.31.3";
src = fetchurl {
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
- sha256 = "sha256-sX8ikF4x9DtrQB399qce0Ru30Fb2jbRJ1wufmug5x94=";
+ hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo=";
};
outputs = [ "out" ] ++ lib.optional withConplay "conplay";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
index 1a7b1e2f87..92b12140c4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix
@@ -32,13 +32,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
- version = "0.99.7";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
- sha256 = "sha256-bsvq48zTNafsQGFXVApCEWIL8H2RXiowalEu/W3DUu0=";
+ hash = "sha512-W+Zug1SiOGJ+o6FBf2jeDGHFj87vudR4drtjyXiOzdoM8fUCnCj4pp7+70eZGilg6CvBi7CYkbVn53LXJf5qWA==";
};
outputs = [ "out" "dev" ];
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- description = "A fully functional terminal-based music player, library, and streaming audio server";
+ description = "Terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/";
- maintainers = with maintainers; [ aanderse srapenne ];
+ maintainers = with maintainers; [ aanderse srapenne afh ];
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
index fed0e1c663..5c4c0045e7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mympd/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "mympd";
- version = "10.2.6";
+ version = "10.3.0";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${version}";
- sha256 = "sha256-a/HjuBeq7ySDUcEcR6KKnwlvzUInjWmio/zI59sNsak=";
+ sha256 = "sha256-iO/Ogh3G67GYoputrxAiA1i0fAon2NDrgPCMYxxn/o4=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
index 870691ae1c..0333f95710 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix
@@ -16,13 +16,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
- version = "0.47";
+ version = "0.48";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "sha256-7vywLMiIUfRx9/fCmUH1AGUB63bT8z7wabgm3CuLLUs=";
+ sha256 = "sha256-89hBaWFwMPBqSWDmsXND0PEc1a9Fte+p1ho5tWuZFlY=";
};
buildInputs = [ glib ncurses libmpdclient boost ]
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
index 98ecd3064a..418db1a0a5 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.11.22";
+ version = "3.11.24";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "sha256-mmPFASc2ARI1ht9SYhFsDjTkWfhxXdc2zEi5rvfanZc=";
+ sha256 = "sha256-3NM2jw3XvzMxLpDQAR3LZzCJXwSnQXSDoN7IK4nr4wM=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
index caab41a114..1377598f80 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
@@ -2,13 +2,13 @@
buildNpmPackage rec {
pname = "open-stage-control";
- version = "1.23.0";
+ version = "1.24.2";
src = fetchFromGitHub {
owner = "jean-emmanuel";
repo = "open-stage-control";
rev = "v${version}";
- hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI=";
+ hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE=";
};
# Remove some Electron stuff from package.json
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix
index 5712eacd2a..35b1b26a19 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qmmp/default.nix
@@ -26,11 +26,11 @@
stdenv.mkDerivation rec {
pname = "qmmp";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchurl {
url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2";
- hash = "sha256-U86LoAkg6mBFVa/cgB8kpCa5KwdkR0PMQmAGvf/KAXo=";
+ hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix
index 2cae90bdd8..279d0f85b2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:
+{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }:
buildPythonApplication rec {
pname = "raysession";
@@ -23,7 +23,7 @@ buildPythonApplication rec {
qttools # lrelease to build translations.
which # which to find lrelease.
];
- buildInputs = [ libjack2 ];
+ buildInputs = [ libjack2 bash ];
propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];
dontWrapQtApps = true; # The program is a python script.
diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
index 60f7cf657f..68393ad87a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
@@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
- version = "6.77";
+ version = "6.79";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash = {
- x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc=";
- aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60=";
+ x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0=";
+ aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU=";
}.${stdenv.hostPlatform.system};
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
index fe9f4a835c..9cd6b0d9ae 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
@@ -10,7 +10,7 @@
, glib
, gtk3
, libpeas
-, libsoup
+, libsoup_3
, libxml2
, libsecret
, libnotify
@@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "rhythmbox";
- version = "3.4.6";
+ version = "3.4.7";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
+ sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
};
nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = [
python3
- libsoup
+ libsoup_3
libxml2
tdb
json-glib
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
+ "-Ddaap=enabled"
"-Dtests=disabled"
];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix
index c4491cd2a0..72d22e9fb7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "SonyHeadphonesClient";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "Plutoberth";
repo = "SonyHeadphonesClient";
rev = "v${version}";
- hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM=";
+ hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
new file mode 100644
index 0000000000..7fcb3aad71
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/darwin.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, pname
+, meta
+, fetchurl
+, undmg
+, lib
+}:
+
+stdenv.mkDerivation {
+ inherit pname;
+
+ version = "1.1.97.962.g24733a46";
+
+ src = if stdenv.isAarch64 then (
+ fetchurl {
+ url = "https://web.archive.org/web/20221101120432/https://download.scdn.co/SpotifyARM64.dmg";
+ sha256 = "sha256-8WDeVRgaZXuUa95PNa15Cuul95ynklBaZpuq+U1eGTU=";
+ })
+ else (
+ fetchurl {
+ url = "https://web.archive.org/web/20221101120647/https://download.scdn.co/Spotify.dmg";
+ sha256 = "sha256-uPpD8Hv70FlaSjtt9rq5ntI64agxG8+/LNEvRe4ocJ4=";
+ });
+
+ nativeBuildInputs = [ undmg ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/Applications
+ cp -r *.app $out/Applications
+ '';
+
+ meta = meta // {
+ maintainers = with lib.maintainers; [ Enzime ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index b615cf0f2c..cc12846a93 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -1,182 +1,16 @@
-{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
-, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
-, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
-, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
- # High-DPI support: Spotify's --force-device-scale-factor argument
- # not added if `null`, otherwise, should be a number.
-, deviceScaleFactor ? null
-}:
+{ lib, stdenv, callPackage }:
let
- # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
- # "rev" decides what is actually being downloaded
- # If an update breaks things, one of those might have valuable info:
- # https://aur.archlinux.org/packages/spotify/
- # https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.99.878.g1e4ccc6e";
- # To get the latest stable revision:
- # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
- # To get general information:
- # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
- # More examples of api usage:
- # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "62";
-
- deps = [
- alsa-lib
- at-spi2-atk
- at-spi2-core
- atk
- cairo
- cups
- curlWithGnuTls
- dbus
- expat
- ffmpeg
- fontconfig
- freetype
- gdk-pixbuf
- glib
- gtk3
- libdrm
- libgcrypt
- libnotify
- libpng
- libpulseaudio
- libxkbcommon
- mesa
- nss
- pango
- stdenv.cc.cc
- systemd
- xorg.libICE
- xorg.libSM
- xorg.libX11
- xorg.libxcb
- xorg.libXcomposite
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXi
- xorg.libXrandr
- xorg.libXrender
- xorg.libXScrnSaver
- xorg.libxshmfence
- xorg.libXtst
- zlib
- ];
-
-in
-
-stdenv.mkDerivation {
pname = "spotify";
- inherit version;
-
- # fetch from snapcraft instead of the debian repository most repos fetch from.
- # That is a bit more cumbersome. But the debian repository only keeps the last
- # two versions, while snapcraft should provide versions indefinitely:
- # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512
-
- # This is the next-best thing, since we're not allowed to re-distribute
- # spotify ourselves:
- # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
- src = fetchurl {
- url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv";
- };
-
- nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
-
- dontStrip = true;
- dontPatchELF = true;
-
- unpackPhase = ''
- runHook preUnpack
- unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml'
- cd squashfs-root
- if ! grep -q 'grade: stable' meta/snap.yaml; then
- # Unfortunately this check is not reliable: At the moment (2018-07-26) the
- # latest version in the "edge" channel is also marked as stable.
- echo "The snap package is marked as unstable:"
- grep 'grade: ' meta/snap.yaml
- echo "You probably chose the wrong revision."
- exit 1
- fi
- if ! grep -q '${version}' meta/snap.yaml; then
- echo "Package version differs from version found in snap metadata:"
- grep 'version: ' meta/snap.yaml
- echo "While the nix package specifies: ${version}."
- echo "You probably chose the wrong revision or forgot to update the nix version."
- exit 1
- fi
- runHook postUnpack
- '';
-
- # Prevent double wrapping
- dontWrapGApps = true;
-
- installPhase =
- ''
- runHook preInstall
-
- libdir=$out/lib/spotify
- mkdir -p $libdir
- mv ./usr/* $out/
-
- cp meta/snap.yaml $out
-
- # Work around Spotify referring to a specific minor version of
- # OpenSSL.
-
- ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
- ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
- ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
- ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
-
- ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
- ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir
-
- rpath="$out/share/spotify:$libdir"
-
- patchelf \
- --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath $rpath $out/share/spotify/spotify
-
- librarypath="${lib.makeLibraryPath deps}:$libdir"
- wrapProgramShell $out/share/spotify/spotify \
- ''${gappsWrapperArgs[@]} \
- ${lib.optionalString (deviceScaleFactor != null) ''
- --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
- ''} \
- --prefix LD_LIBRARY_PATH : "$librarypath" \
- --prefix PATH : "${gnome.zenity}/bin" \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
-
- # fix Icon line in the desktop file (#48062)
- sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
-
- # Desktop file
- mkdir -p "$out/share/applications/"
- cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
-
- # Icons
- for i in 16 22 24 32 48 64 128 256 512; do
- ixi="$i"x"$i"
- mkdir -p "$out/share/icons/hicolor/$ixi/apps"
- ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
- "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
- done
-
- runHook postInstall
- '';
meta = with lib; {
homepage = "https://www.spotify.com/";
description = "Play music from the Spotify music service";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
- maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
-}
+
+in if stdenv.isDarwin
+then callPackage ./darwin.nix { inherit pname meta; }
+else callPackage ./linux.nix { inherit pname meta; }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix
new file mode 100644
index 0000000000..df50e3bd28
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix
@@ -0,0 +1,178 @@
+{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype
+, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
+, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
+, pname, meta, harfbuzz
+ # High-DPI support: Spotify's --force-device-scale-factor argument
+ # not added if `null`, otherwise, should be a number.
+, deviceScaleFactor ? null
+}:
+
+let
+ # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
+ # "rev" decides what is actually being downloaded
+ # If an update breaks things, one of those might have valuable info:
+ # https://aur.archlinux.org/packages/spotify/
+ # https://community.spotify.com/t5/Desktop-Linux
+ version = "1.2.9.743.g85d9593d";
+ # To get the latest stable revision:
+ # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
+ # To get general information:
+ # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
+ # More examples of api usage:
+ # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
+ rev = "64";
+
+ deps = [
+ alsa-lib
+ at-spi2-atk
+ at-spi2-core
+ atk
+ cairo
+ cups
+ curlWithGnuTls
+ dbus
+ expat
+ ffmpeg
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ gtk3
+ harfbuzz
+ libdrm
+ libgcrypt
+ libnotify
+ libpng
+ libpulseaudio
+ libxkbcommon
+ mesa
+ nss
+ pango
+ stdenv.cc.cc
+ systemd
+ xorg.libICE
+ xorg.libSM
+ xorg.libX11
+ xorg.libxcb
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXScrnSaver
+ xorg.libxshmfence
+ xorg.libXtst
+ zlib
+ ];
+
+in
+
+stdenv.mkDerivation {
+ inherit pname version;
+
+ # fetch from snapcraft instead of the debian repository most repos fetch from.
+ # That is a bit more cumbersome. But the debian repository only keeps the last
+ # two versions, while snapcraft should provide versions indefinitely:
+ # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512
+
+ # This is the next-best thing, since we're not allowed to re-distribute
+ # spotify ourselves:
+ # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
+ src = fetchurl {
+ url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
+ sha512 = "5e8f4a1901c26e9bb5986e048226d8a15f5bc4c2acf16b20a404f228ef142e4d21c6a88a4a54c8d9e654ba5b15cb1fea1cdc50c21fbe8e3c374e241a44adf12d";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
+
+ dontStrip = true;
+ dontPatchELF = true;
+
+ unpackPhase = ''
+ runHook preUnpack
+ unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml'
+ cd squashfs-root
+ if ! grep -q 'grade: stable' meta/snap.yaml; then
+ # Unfortunately this check is not reliable: At the moment (2018-07-26) the
+ # latest version in the "edge" channel is also marked as stable.
+ echo "The snap package is marked as unstable:"
+ grep 'grade: ' meta/snap.yaml
+ echo "You probably chose the wrong revision."
+ exit 1
+ fi
+ if ! grep -q '${version}' meta/snap.yaml; then
+ echo "Package version differs from version found in snap metadata:"
+ grep 'version: ' meta/snap.yaml
+ echo "While the nix package specifies: ${version}."
+ echo "You probably chose the wrong revision or forgot to update the nix version."
+ exit 1
+ fi
+ runHook postUnpack
+ '';
+
+ # Prevent double wrapping
+ dontWrapGApps = true;
+
+ installPhase =
+ ''
+ runHook preInstall
+
+ libdir=$out/lib/spotify
+ mkdir -p $libdir
+ mv ./usr/* $out/
+
+ cp meta/snap.yaml $out
+
+ # Work around Spotify referring to a specific minor version of
+ # OpenSSL.
+
+ ln -s ${lib.getLib openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
+ ln -s ${lib.getLib openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+ ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
+ ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
+
+ ln -s ${ffmpeg.lib}/lib/libavcodec.so* $libdir
+ ln -s ${ffmpeg.lib}/lib/libavformat.so* $libdir
+
+ rpath="$out/share/spotify:$libdir"
+
+ patchelf \
+ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath $rpath $out/share/spotify/spotify
+
+ librarypath="${lib.makeLibraryPath deps}:$libdir"
+ wrapProgramShell $out/share/spotify/spotify \
+ ''${gappsWrapperArgs[@]} \
+ ${lib.optionalString (deviceScaleFactor != null) ''
+ --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
+ ''} \
+ --prefix LD_LIBRARY_PATH : "$librarypath" \
+ --prefix PATH : "${gnome.zenity}/bin" \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+
+ # fix Icon line in the desktop file (#48062)
+ sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
+
+ # Desktop file
+ mkdir -p "$out/share/applications/"
+ cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
+
+ # Icons
+ for i in 16 22 24 32 48 64 128 256 512; do
+ ixi="$i"x"$i"
+ mkdir -p "$out/share/icons/hicolor/$ixi/apps"
+ ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
+ "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
+ done
+
+ runHook postInstall
+ '';
+
+ meta = meta // {
+ maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh b/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh
index 0f19b1e295..8c466e836c 100755
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/update.sh
@@ -20,7 +20,7 @@
channel="${1:-stable}" # stable/candidate/edge
nixpkgs="$(git rev-parse --show-toplevel)"
-spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix"
+spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/linux.nix"
#
diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
index 8f3eef1cdb..adaaca69fe 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix
@@ -42,13 +42,13 @@ let
in
stdenv.mkDerivation rec {
pname = "strawberry";
- version = "1.0.15";
+ version = "1.0.17";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- hash = "sha256-P7M7UIRFr0pABNhb63pV3TqIdTP8Xox4f0BT2ii9rRE=";
+ hash = "sha256-Z2b3/pIdSmZUO724hkdn78YrVuRiXALbTOUs+KJMjvU=";
};
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
index b79e9c217e..efac517024 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "tageditor";
- version = "3.7.8";
+ version = "3.7.9";
src = fetchFromGitHub {
owner = "martchus";
repo = pname;
rev = "v${version}";
- hash = "sha256-/34KS6nxpIsKEklSRpO+AmGAdpJhapoGe24DCCodU38=";
+ hash = "sha256-QQvc9S+9h0Qy/qBROwJMZIALf/Rbj/9my4PZGxQzlnM=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix
index cde74ae96c..7cd64eb420 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix
@@ -4,7 +4,7 @@
, ladspa-sdk
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "tap-plugins";
version = "unstable-2020-12-09";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix
index 427c1e9e5d..23dd5e8fa6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "tauon";
- version = "7.6.3";
+ version = "7.6.4";
src = fetchFromGitHub {
owner = "Taiko2k";
repo = "TauonMusicBox";
rev = "v${version}";
- hash = "sha256-cNR4Ffn9HvgL5KV4FUSnbzEh6VfoKaIbfpb18/qKEns=";
+ hash = "sha256-xMUQ2LabxuvCdd7dsoXPN3tjkDxfXIQ8UrJcsGQ+EEU=";
};
postUnpack = ''
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
patchShebangs compile-phazor.sh
+ substituteInPlace compile-phazor.sh --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
+
substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon'
'';
@@ -95,7 +97,6 @@ stdenv.mkDerivation rec {
natsort
pillow
plexapi
- pulsectl
pycairo
pychromecast
pylast
@@ -105,7 +106,8 @@ stdenv.mkDerivation rec {
requests
send2trash
setproctitle
- ] ++ lib.optional withDiscordRPC pypresence;
+ ] ++ lib.optional withDiscordRPC pypresence
+ ++ lib.optional stdenv.isLinux pulsectl;
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ffmpeg]}"
@@ -134,6 +136,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}";
license = licenses.gpl3;
maintainers = with maintainers; [ jansol ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix
index 85d829f765..158f2e708b 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix
@@ -10,22 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "termusic";
- version = "0.7.9";
+ version = "0.7.10";
src = fetchCrate {
inherit pname version;
- hash = "sha256-ytAKINcZwLyHWbzShxfxRKx4BepM0G2BYdLgwR48g7w=";
+ hash = "sha256-m0hi5u4BcRcEDEpg1BoWXc25dfhD6+OJtqSZfSdV0HM=";
};
- cargoHash = "sha256-yxFF5Yqj+xTB3FAJUtgcIeAEHR44JA1xONxGFdG0yS0=";
-
- patches = [
- (fetchpatch {
- name = "fix-panic-when-XDG_AUDIO_DIR-not-set.patch";
- url = "https://github.com/tramhao/termusic/commit/b6006b22901f1f865a2e3acf7490fd3fa520ca5e.patch";
- hash = "sha256-1ukQ0y5IRdOndsryuqXI9/zyhCDQ5NIeTan4KCynAv0=";
- })
- ];
+ cargoHash = "sha256-A83gLsaPm6t4nm7DJfcp9z1huDU/Sfy9gunP8pzBiCA=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix
index 93b8d32035..f3a16e89df 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix
@@ -18,7 +18,6 @@
, gdk-pixbuf
, glib
, gtk3
-, imagemagick
, libappindicator-gtk3
, libdbusmenu
, libdrm
@@ -37,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "tidal-hifi";
- version = "4.4.0";
+ version = "5.1.0";
src = fetchurl {
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
- sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8=";
+ sha256 = "sha256-IaSgul2L0L343TVT3ujgBoMt6tITwjJaBNOVJPCBDtI=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@@ -61,7 +60,6 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gtk3
- imagemagick
pango
systemd
mesa # for libgbm
@@ -110,12 +108,6 @@ stdenv.mkDerivation rec {
"''${gappsWrapperArgs[@]}"
substituteInPlace $out/share/applications/tidal-hifi.desktop \
--replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
-
- for size in 48 64 128 256 512; do
- mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/
- convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \
- -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png
- done
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix
index 9647eef681..199f75ff20 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/vgmplay-libvgm/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "vgmplay-libvgm";
- version = "unstable-2022-03-17";
+ version = "unstable-2023-04-12";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "vgmplay-libvgm";
- rev = "a2c21cb134b58043a013ac2efc060144cdecf13d";
- sha256 = "0g251laqjvvzblyflkg8xac424dbxm1v35ckfazsfchmcqiaqfw4";
+ rev = "813abab549e99bb7e936acbfa1199cf435c237c6";
+ sha256 = "sdQO+xk3a7AFXo3jpbcuNBkd19PjKoBMRhr4IK06oHg=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix
index 6c0d439a0d..ae8a27f324 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix
@@ -1,21 +1,23 @@
-{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
+{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp, AudioUnit, CoreAudio }:
stdenv.mkDerivation rec {
pname = "xmp";
version = "4.1.0";
- meta = with lib; {
- description = "Extended module player";
- homepage = "https://xmp.sourceforge.net/";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsa-lib libxmp ];
+ buildInputs = [ libxmp ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib ]
+ ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ];
+
+ meta = with lib; {
+ description = "Extended module player";
+ homepage = "https://xmp.sourceforge.net/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ };
}
diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix
index 44f5c5acfb..eab22b730f 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix
@@ -18,16 +18,16 @@
rustPlatform.buildRustPackage rec {
pname = "ludusavi";
- version = "0.15.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3nh1EhjiH+dUBw3CNeFSg/+Wkxr5AYgVdM1HzVKbqJI=";
+ sha256 = "sha256-LTqorrZ7hp9hFGcQ0rdc/U6st9YraXEftDpH7VEShs8=";
};
- cargoSha256 = "sha256-l9jYqmKC0GJL9MSRbrNng4rO6/dx4q8EVCxfuin4v6E=";
+ cargoSha256 = "sha256-3SijgvIPb+QBAWZaTivw8P5aYjctGfgnVrFYcGl8PyE=";
nativeBuildInputs = [
cmake
diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
index 88b7b9fa5c..ef4ab30eb2 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
@@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
- version = "0.5.2";
+ version = "0.6.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
- hash = "sha256-d+VkKY14o1wwINSlVBsvWux8YhyXg77N9i2R61QLGqM=";
+ hash = "sha256-eI2MRrW6MID4dMHR1OjDT83xd/9CgDuhAWpEHmhnMVw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-3MNwX8kB+bjP9Dz+k+HYmCOI1Naa9tDBe0+GKsEmqnc=";
+ hash = "sha256-hbh4kfQcym0n2cCp2ebljQpizolsxyfZk7ctKOlDybA=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/backup/restique/default.nix b/third_party/nixpkgs/pkgs/applications/backup/restique/default.nix
index 744379f213..6bc2ea8caf 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/restique/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/restique/default.nix
@@ -4,19 +4,20 @@
, cmake
, libsecret
, qtkeychain
+, qttools
, restic
}:
mkDerivation rec {
pname = "restique";
- version = "unstable-2021-05-03";
+ version = "unstable-2022-11-29";
src = fetchFromGitea {
domain = "git.srcbox.net";
owner = "stefan";
repo = "restique";
- rev = "f83ea63c2e2f2a41e845f54c7fe2c391a528a121";
- sha256 = "0j1qihv7hd90xkfm4ksv74q6m7cq781fbdnc3l4spcd7h2p8lh0z";
+ rev = "906b0b1726c26988c910baea9665f540c37c99c4";
+ hash = "sha256-EYoADtYX+gm8T3/3gxTtdFOFGJf2rXryiTu8NIO0Ez4=";
};
nativeBuildInputs = [
@@ -26,6 +27,7 @@ mkDerivation rec {
buildInputs = [
libsecret
qtkeychain
+ qttools
];
qtWrapperArgs = [
diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
index 05d3cc8626..5229786d72 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix
@@ -8,19 +8,18 @@
python3Packages.buildPythonApplication rec {
pname = "vorta";
- version = "0.8.10";
+ version = "0.8.12";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
- rev = "refs/tags/v${version}";
- hash = "sha256-okxZ1kALB5l94ShStAJLfzD37MLhob8MCzhbqfVISkw=";
+ rev = "v${version}";
+ hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs=";
};
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = with python3Packages; [
- paramiko
peewee
pyqt5
python-dateutil
@@ -29,6 +28,9 @@ python3Packages.buildPythonApplication rec {
secretstorage
appdirs
setuptools
+ platformdirs
+ ] ++ lib.optionals stdenv.isLinux [
+ qt5.qtwayland
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix
index 7993887be6..183dbc9f33 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "besu";
- version = "22.10.3";
+ version = "23.1.2";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w=";
+ sha256 = "sha256-PTpwmjqrmToIAbQSpHGddOMZ+ULdwT+w8ws8SlTRJTg=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
index ae1a60ec1d..31e4a95503 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
- version = "5.0.7";
+ version = "5.0.9";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
- sha256 = "sha256-yxb8cMAokAv0tl9FSjjtdvHkJP/UKlZxLLu/+gx8kyQ=";
+ sha256 = "sha256-EChnLRoInWFRuRMfnyRlZbZBWB6/QG9yRdwW9+IiMYc=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix
index 3b489f8ace..8583fc8683 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix
@@ -2,7 +2,7 @@
let
pname = "erigon";
- version = "2.42.0";
+ version = "2.43.0";
in
buildGoModule {
inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-M2u8/WKo1yZu27KjTJhJFqycCxCopJqtVQpIs9inswI=";
+ sha256 = "sha256-3o7vu2bA8lB1CiVaSF6YU9WjwNliQAK5AcGl82GCqFg=";
fetchSubmodules = true;
};
- vendorSha256 = "sha256-Vyurf4wSN4zSDjcH8FC+OOiviiSjRVF4RId/eqFDd+c=";
+ vendorSha256 = "sha256-JhMefeUxo9ksyCnNsLgAhGG0Ix7kxCA/cYyiELd0H64=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix
index 709e20f476..d0ba9d2834 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix
@@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
- version = "23.3.13";
+ version = "23.4.10";
src = fetchzip {
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
- sha256 = "sha256-/xCDtR3V++LaZZWTaNpeD3YuP5ZM5BChB1CUBH/xNcU=";
+ sha256 = "sha256-NWUIJCsoCsG8FKZnApicHsBTBwTL2fNb0su1KWd1E1o=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix
index a1ded4cc7c..bb6068ca55 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix
@@ -2,10 +2,10 @@
let
pname = "framesh";
- version = "0.5.0-beta.22";
+ version = "0.6.2";
src = fetchurl {
url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage";
- sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA=";
+ sha256 = "sha256-nN5+6SwfHcwhePlbsXjT3qNd/d6Xqnd85NVC8vw3ehk=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix
index 28571a57e1..4676eb5b77 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fulcrum";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "cculianu";
repo = "Fulcrum";
rev = "v${version}";
- sha256 = "sha256-HAA5YRShLzxVP9aIP1RdDH09cZqjiZhZOxxc2EVGvx8=";
+ sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ=";
};
nativeBuildInputs = [ pkg-config qmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 3c9086b97f..3455641b0e 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
- version = "2.55.0";
+ version = "2.57.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
- hash = "sha256-N0BhbqZvZs3IP+jMxr85KlHs6I/fxWgoK884EKT9C9Y=";
+ hash = "sha256-fXvCj9eBEp/kGPSiNUdir19eU0x461KzXgl5YgeapHI=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/Cargo.lock
index 5951b49c7e..c2484cee5c 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/Cargo.lock
@@ -88,6 +88,16 @@ dependencies = [
"rand_core 0.6.4",
]
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
[[package]]
name = "aes"
version = "0.6.0"
@@ -113,17 +123,14 @@ dependencies = [
]
[[package]]
-name = "aes-gcm"
-version = "0.8.0"
+name = "aes"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
+checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
dependencies = [
- "aead 0.3.2",
- "aes 0.6.0",
- "cipher 0.2.5",
- "ctr 0.6.0",
- "ghash 0.3.1",
- "subtle",
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
]
[[package]]
@@ -140,6 +147,20 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "aes-gcm"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
+dependencies = [
+ "aead 0.5.2",
+ "aes 0.8.2",
+ "cipher 0.4.4",
+ "ctr 0.9.2",
+ "ghash 0.5.0",
+ "subtle",
+]
+
[[package]]
name = "aes-soft"
version = "0.6.4"
@@ -205,14 +226,14 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "arbitrary"
-version = "1.2.2"
-source = "git+https://github.com/michaelsproul/arbitrary?rev=a572fd8743012a4f1ada5ee5968b1b3619c427ba#a572fd8743012a4f1ada5ee5968b1b3619c427ba"
+version = "1.3.0"
+source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991"
dependencies = [
"derive_arbitrary",
]
@@ -225,9 +246,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[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"
@@ -248,14 +269,14 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
name = "asn1-rs"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
dependencies = [
"asn1-rs-derive 0.4.0",
"asn1-rs-impl",
@@ -264,7 +285,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -275,7 +296,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"synstructure",
]
@@ -287,7 +308,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"synstructure",
]
@@ -299,7 +320,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -310,64 +331,64 @@ checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21"
[[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 1.1.0",
+ "cfg-if",
"concurrent-queue",
"futures-lite",
- "libc",
"log",
"parking",
"polling",
+ "rustix",
"slab",
- "socket2",
+ "socket2 0.4.9",
"waker-fn",
- "windows-sys 0.42.0",
]
[[package]]
name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
dependencies = [
"event-listener",
- "futures-lite",
]
[[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 0.2.9",
]
[[package]]
name = "async-stream-impl"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "async-trait"
-version = "0.1.64"
+version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -431,7 +452,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -537,14 +558,14 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "base64ct"
-version = "1.5.3"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]]
name = "beacon-api-client"
version = "0.1.0"
-source = "git+https://github.com/ralexstokes/beacon-api-client#53690a711e33614d59d4d44fb09762b4699e2a4e"
+source = "git+https://github.com/ralexstokes/beacon-api-client#30679e9e25d61731cde54e14cd8a3688a39d8e5b"
dependencies = [
"ethereum-consensus",
"http",
@@ -610,6 +631,7 @@ dependencies = [
"task_executor",
"tempfile",
"tokio",
+ "tokio-stream",
"tree_hash",
"types",
"unused_port",
@@ -617,7 +639,7 @@ dependencies = [
[[package]]
name = "beacon_node"
-version = "3.5.1"
+version = "4.1.0"
dependencies = [
"beacon_chain",
"clap",
@@ -728,9 +750,9 @@ dependencies = [
[[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",
]
@@ -783,9 +805,20 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "bollard-stubs"
+version = "1.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8"
+dependencies = [
+ "chrono",
+ "serde",
+ "serde_with",
+]
+
[[package]]
name = "boot_node"
-version = "3.5.1"
+version = "4.1.0"
dependencies = [
"beacon_node",
"clap",
@@ -830,6 +863,7 @@ name = "builder_client"
version = "0.1.0"
dependencies = [
"eth2",
+ "lighthouse_version",
"reqwest",
"sensitive_url",
"serde",
@@ -964,14 +998,15 @@ dependencies = [
[[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",
"js-sys",
"num-integer",
"num-traits",
+ "serde",
"time 0.1.45",
"wasm-bindgen",
"winapi",
@@ -996,10 +1031,20 @@ dependencies = [
]
[[package]]
-name = "clang-sys"
-version = "1.4.0"
+name = "cipher"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
@@ -1072,7 +1117,7 @@ dependencies = [
"state_processing",
"store",
"task_executor",
- "time 0.3.17",
+ "time 0.3.20",
"timer",
"tokio",
"types",
@@ -1080,9 +1125,9 @@ dependencies = [
[[package]]
name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
@@ -1109,7 +1154,7 @@ name = "compare_fields_derive"
version = "0.2.0"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1133,9 +1178,9 @@ dependencies = [
[[package]]
name = "const-oid"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
+checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
[[package]]
name = "convert_case"
@@ -1155,9 +1200,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "core2"
@@ -1170,19 +1215,13 @@ 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",
]
-[[package]]
-name = "cpuid-bool"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
-
[[package]]
name = "crc"
version = "3.0.1"
@@ -1245,9 +1284,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -1255,9 +1294,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -1266,22 +1305,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
dependencies = [
"autocfg 1.1.0",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
"scopeguard",
]
[[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",
]
@@ -1311,6 +1350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
"generic-array",
+ "rand_core 0.6.4",
"typenum",
]
@@ -1324,16 +1364,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
[[package]]
name = "crypto-mac"
version = "0.11.1"
@@ -1346,9 +1376,9 @@ dependencies = [
[[package]]
name = "csv"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359"
+checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
dependencies = [
"csv-core",
"itoa",
@@ -1365,15 +1395,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "ctr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
-dependencies = [
- "cipher 0.2.5",
-]
-
[[package]]
name = "ctr"
version = "0.8.0"
@@ -1383,6 +1404,15 @@ dependencies = [
"cipher 0.3.0",
]
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher 0.4.4",
+]
+
[[package]]
name = "ctrlc"
version = "3.2.5"
@@ -1408,9 +1438,9 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-rc.0"
+version = "4.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac"
+checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585"
dependencies = [
"cfg-if",
"fiat-crypto",
@@ -1422,9 +1452,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.90"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1434,9 +1464,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.90"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -1444,24 +1474,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.90"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.90"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -1476,12 +1506,12 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.14.3"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
- "darling_core 0.14.3",
- "darling_macro 0.14.3",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
]
[[package]]
@@ -1495,21 +1525,21 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.10.0",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "darling_core"
-version = "0.14.3"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.10.0",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1520,18 +1550,18 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core 0.13.4",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "darling_macro"
-version = "0.14.3"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
- "darling_core 0.14.3",
+ "darling_core 0.14.4",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1577,7 +1607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
dependencies = [
"data-encoding",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1606,12 +1636,12 @@ checksum = "b72465f46d518f6015d9cf07f7f3013a95dd6b9c2747c3d65ae0cce43929d14f"
[[package]]
name = "delay_map"
-version = "0.1.2"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c4d75d3abfe4830dcbf9bcb1b926954e121669f74dd1ca7aa0183b1755d83f6"
+checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8"
dependencies = [
"futures",
- "tokio-util 0.6.10",
+ "tokio-util 0.7.7",
]
[[package]]
@@ -1655,11 +1685,11 @@ dependencies = [
[[package]]
name = "der-parser"
-version = "8.1.0"
+version = "8.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
"displaydoc",
"nom 7.1.3",
"num-bigint",
@@ -1675,18 +1705,17 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "derive_arbitrary"
-version = "1.2.2"
-source = "git+https://github.com/michaelsproul/arbitrary?rev=a572fd8743012a4f1ada5ee5968b1b3619c427ba#a572fd8743012a4f1ada5ee5968b1b3619c427ba"
+version = "1.3.0"
+source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991"
dependencies = [
- "darling 0.14.3",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1704,10 +1733,10 @@ version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
dependencies = [
- "darling 0.14.3",
+ "darling 0.14.4",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1717,7 +1746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
dependencies = [
"derive_builder_core",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1730,7 +1759,44 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version 0.4.0",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "diesel"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "diesel_derives",
+ "itoa",
+ "pq-sys",
+ "r2d2",
+]
+
+[[package]]
+name = "diesel_derives"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "diesel_migrations"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2"
+dependencies = [
+ "diesel",
+ "migrations_internals",
+ "migrations_macros",
]
[[package]]
@@ -1748,7 +1814,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
"crypto-common",
"subtle",
]
@@ -1805,15 +1871,15 @@ dependencies = [
[[package]]
name = "discv5"
-version = "0.1.0"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767c0e59b3e8d65222d95df723cc2ea1da92bb0f27c563607e6f0bde064f255"
+checksum = "b009a99b85b58900df46435307fc5c4c845af7e182582b1fbf869572fa9fce69"
dependencies = [
"aes 0.7.5",
"aes-gcm 0.9.4",
"arrayvec",
"delay_map",
- "enr",
+ "enr 0.7.0",
"fnv",
"futures",
"hashlink 0.7.0",
@@ -1827,7 +1893,7 @@ dependencies = [
"rand 0.8.5",
"rlp",
"smallvec",
- "socket2",
+ "socket2 0.4.9",
"tokio",
"tokio-stream",
"tokio-util 0.6.10",
@@ -1845,14 +1911,14 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "dtoa"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313"
+checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169"
[[package]]
name = "ecdsa"
@@ -1962,6 +2028,25 @@ name = "enr"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26fa0a0be8915790626d5759eb51fe47435a8eac92c2f212bd2da9aa7f30ea56"
+dependencies = [
+ "base64 0.13.1",
+ "bs58",
+ "bytes",
+ "hex",
+ "k256",
+ "log",
+ "rand 0.8.5",
+ "rlp",
+ "serde",
+ "sha3 0.10.6",
+ "zeroize",
+]
+
+[[package]]
+name = "enr"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "492a7e5fc2504d5fdce8e124d3e263b244a68b283cac67a69eda0cd43e0aebad"
dependencies = [
"base64 0.13.1",
"bs58",
@@ -1986,7 +2071,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2036,13 +2121,13 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -2210,7 +2295,7 @@ dependencies = [
name = "eth2_network_config"
version = "0.2.0"
dependencies = [
- "enr",
+ "discv5",
"eth2_config",
"eth2_ssz",
"serde_yaml",
@@ -2248,7 +2333,7 @@ dependencies = [
"eth2_ssz",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2361,11 +2446,11 @@ dependencies = [
"async-stream",
"blst",
"bs58",
- "enr",
+ "enr 0.6.2",
"hex",
"integer-sqrt",
"multiaddr 0.14.0",
- "multihash",
+ "multihash 0.16.3",
"rand 0.8.5",
"serde",
"serde_json",
@@ -2597,18 +2682,18 @@ checksum = "ec54ac60a7f2ee9a97cad9946f9bf629a3bc6a7ae59e68983dc9318f5a54b81a"
[[package]]
name = "fiat-crypto"
-version = "0.1.17"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]]
name = "field-offset"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
dependencies = [
- "memoffset 0.6.5",
- "rustc_version 0.3.3",
+ "memoffset 0.8.0",
+ "rustc_version 0.4.0",
]
[[package]]
@@ -2730,9 +2815,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -2745,9 +2830,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -2755,15 +2840,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -2773,9 +2858,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
@@ -2794,13 +2879,13 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -2816,15 +2901,15 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-timer"
@@ -2834,9 +2919,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -2861,9 +2946,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -2916,16 +3001,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "ghash"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
-dependencies = [
- "opaque-debug",
- "polyval 0.4.5",
-]
-
[[package]]
name = "ghash"
version = "0.4.4"
@@ -2937,10 +3012,20 @@ dependencies = [
]
[[package]]
-name = "gimli"
-version = "0.27.1"
+name = "ghash"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec"
+checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+dependencies = [
+ "opaque-debug",
+ "polyval 0.6.0",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
[[package]]
name = "git-version"
@@ -2961,7 +3046,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2983,9 +3068,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",
@@ -3115,6 +3200,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -3146,16 +3237,6 @@ dependencies = [
"digest 0.9.0",
]
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest 0.9.0",
-]
-
[[package]]
name = "hmac"
version = "0.11.0"
@@ -3199,9 +3280,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",
@@ -3312,9 +3393,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.24"
+version = "0.14.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
dependencies = [
"bytes",
"futures-channel",
@@ -3327,7 +3408,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite 0.2.9",
- "socket2",
+ "socket2 0.4.9",
"tokio",
"tower-service",
"tracing",
@@ -3362,16 +3443,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]]
@@ -3444,9 +3525,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "3.0.0"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e"
+checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f"
dependencies = [
"async-io",
"core-foundation",
@@ -3458,7 +3539,7 @@ dependencies = [
"rtnetlink",
"system-configuration",
"tokio",
- "windows",
+ "windows 0.34.0",
]
[[package]]
@@ -3527,19 +3608,28 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[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 1.1.0",
"hashbrown 0.12.3",
]
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
[[package]]
name = "instant"
version = "0.1.12"
@@ -3591,10 +3681,11 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
dependencies = [
+ "hermit-abi 0.3.1",
"libc",
"windows-sys 0.45.0",
]
@@ -3605,7 +3696,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
dependencies = [
- "socket2",
+ "socket2 0.4.9",
"widestring 0.5.1",
"winapi",
"winreg",
@@ -3613,9 +3704,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.7.1"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "itertools"
@@ -3628,9 +3719,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "jemalloc-ctl"
@@ -3689,11 +3780,11 @@ dependencies = [
[[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 0.13.1",
+ "base64 0.21.0",
"pem",
"ring",
"serde",
@@ -3750,7 +3841,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lcli"
-version = "3.5.1"
+version = "4.1.0"
dependencies = [
"account_utils",
"beacon_chain",
@@ -3810,15 +3901,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
[[package]]
name = "libflate"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093"
+checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0"
dependencies = [
"adler32",
"crc32fast",
@@ -3827,9 +3918,9 @@ dependencies = [
[[package]]
name = "libflate_lz77"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a"
+checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
dependencies = [
"rle-decode-fast",
]
@@ -3873,9 +3964,9 @@ dependencies = [
[[package]]
name = "libp2p"
-version = "0.50.0"
+version = "0.50.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819"
+checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8"
dependencies = [
"bytes",
"futures",
@@ -3921,7 +4012,7 @@ dependencies = [
"libsecp256k1",
"log",
"multiaddr 0.14.0",
- "multihash",
+ "multihash 0.16.3",
"multistream-select 0.11.0",
"p256",
"parking_lot 0.12.1",
@@ -3955,7 +4046,7 @@ dependencies = [
"libsecp256k1",
"log",
"multiaddr 0.16.0",
- "multihash",
+ "multihash 0.16.3",
"multistream-select 0.12.1",
"once_cell",
"p256",
@@ -3974,6 +4065,34 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "libp2p-core"
+version = "0.39.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af"
+dependencies = [
+ "either",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "instant",
+ "libp2p-identity",
+ "log",
+ "multiaddr 0.17.1",
+ "multihash 0.17.0",
+ "multistream-select 0.12.1",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "pin-project",
+ "quick-protobuf",
+ "rand 0.8.5",
+ "rw-stream-sink",
+ "smallvec",
+ "thiserror",
+ "unsigned-varint 0.7.1",
+ "void",
+]
+
[[package]]
name = "libp2p-dns"
version = "0.38.0"
@@ -4039,6 +4158,24 @@ dependencies = [
"void",
]
+[[package]]
+name = "libp2p-identity"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27"
+dependencies = [
+ "bs58",
+ "ed25519-dalek",
+ "log",
+ "multiaddr 0.17.1",
+ "multihash 0.17.0",
+ "prost",
+ "quick-protobuf",
+ "rand 0.8.5",
+ "thiserror",
+ "zeroize",
+]
+
[[package]]
name = "libp2p-mdns"
version = "0.42.0"
@@ -4053,7 +4190,7 @@ dependencies = [
"log",
"rand 0.8.5",
"smallvec",
- "socket2",
+ "socket2 0.4.9",
"tokio",
"trust-dns-proto",
"void",
@@ -4181,7 +4318,7 @@ checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
dependencies = [
"heck",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4196,19 +4333,20 @@ dependencies = [
"libc",
"libp2p-core 0.38.0",
"log",
- "socket2",
+ "socket2 0.4.9",
"tokio",
]
[[package]]
name = "libp2p-tls"
-version = "0.1.0-alpha"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8"
+checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
dependencies = [
"futures",
"futures-rustls",
- "libp2p-core 0.38.0",
+ "libp2p-core 0.39.1",
+ "libp2p-identity",
"rcgen 0.10.0",
"ring",
"rustls 0.20.8",
@@ -4234,7 +4372,7 @@ dependencies = [
"libp2p-core 0.38.0",
"libp2p-noise",
"log",
- "multihash",
+ "multihash 0.16.3",
"prost",
"prost-build",
"prost-codec",
@@ -4336,7 +4474,6 @@ version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa"
dependencies = [
- "cc",
"pkg-config",
"vcpkg",
]
@@ -4354,7 +4491,7 @@ dependencies = [
[[package]]
name = "lighthouse"
-version = "3.5.1"
+version = "4.1.0"
dependencies = [
"account_manager",
"account_utils",
@@ -4478,9 +4615,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "lmdb-rkv"
@@ -4666,9 +4803,9 @@ dependencies = [
[[package]]
name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg 1.1.0",
]
@@ -4705,7 +4842,7 @@ dependencies = [
"proc-macro2",
"quote",
"smallvec",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4725,6 +4862,27 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "migrations_internals"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc"
+dependencies = [
+ "serde",
+ "toml",
+]
+
+[[package]]
+name = "migrations_macros"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58"
+dependencies = [
+ "migrations_internals",
+ "proc-macro2",
+ "quote",
+]
+
[[package]]
name = "milagro_bls"
version = "1.4.2"
@@ -4739,9 +4897,9 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
@@ -4816,7 +4974,7 @@ dependencies = [
"bs58",
"byteorder",
"data-encoding",
- "multihash",
+ "multihash 0.16.3",
"percent-encoding",
"serde",
"static_assertions",
@@ -4834,7 +4992,26 @@ dependencies = [
"byteorder",
"data-encoding",
"multibase",
- "multihash",
+ "multihash 0.16.3",
+ "percent-encoding",
+ "serde",
+ "static_assertions",
+ "unsigned-varint 0.7.1",
+ "url",
+]
+
+[[package]]
+name = "multiaddr"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
+dependencies = [
+ "arrayref",
+ "byteorder",
+ "data-encoding",
+ "log",
+ "multibase",
+ "multihash 0.17.0",
"percent-encoding",
"serde",
"static_assertions",
@@ -4866,6 +5043,19 @@ dependencies = [
"unsigned-varint 0.7.1",
]
+[[package]]
+name = "multihash"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
+dependencies = [
+ "core2",
+ "digest 0.10.6",
+ "multihash-derive",
+ "sha2 0.10.6",
+ "unsigned-varint 0.7.1",
+]
+
[[package]]
name = "multihash-derive"
version = "0.8.1"
@@ -4876,7 +5066,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"synstructure",
]
@@ -5005,9 +5195,9 @@ dependencies = [
[[package]]
name = "netlink-sys"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b"
+checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
dependencies = [
"bytes",
"futures",
@@ -5258,7 +5448,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
]
[[package]]
@@ -5308,14 +5498,14 @@ dependencies = [
"bytes",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "openssl"
-version = "0.10.45"
+version = "0.10.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33"
dependencies = [
"bitflags",
"cfg-if",
@@ -5328,13 +5518,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -5345,20 +5535,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "111.25.1+1.1.1t"
+version = "111.25.2+1.1.1t"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10"
+checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa"
dependencies = [
- "autocfg 1.1.0",
"cc",
"libc",
"openssl-src",
@@ -5465,7 +5654,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -5477,7 +5666,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -5516,7 +5705,7 @@ dependencies = [
"cfg-if",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"winapi",
]
@@ -5529,16 +5718,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"windows-sys 0.45.0",
]
[[package]]
name = "paste"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "pbkdf2"
@@ -5588,16 +5777,6 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
[[package]]
name = "petgraph"
version = "0.6.3"
@@ -5618,6 +5797,24 @@ dependencies = [
"rustc_version 0.4.0",
]
+[[package]]
+name = "phf"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+dependencies = [
+ "siphasher",
+]
+
[[package]]
name = "pin-project"
version = "1.0.12"
@@ -5635,7 +5832,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -5714,16 +5911,18 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.5.2"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa"
dependencies = [
"autocfg 1.1.0",
+ "bitflags",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite 0.2.9",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -5734,18 +5933,7 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
dependencies = [
"cpufeatures",
"opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "polyval"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
-dependencies = [
- "cpuid-bool",
- "opaque-debug",
- "universal-hash",
+ "universal-hash 0.4.1",
]
[[package]]
@@ -5757,7 +5945,48 @@ dependencies = [
"cfg-if",
"cpufeatures",
"opaque-debug",
- "universal-hash",
+ "universal-hash 0.4.1",
+]
+
+[[package]]
+name = "polyval"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash 0.5.0",
+]
+
+[[package]]
+name = "postgres-protocol"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b7fa9f396f51dffd61546fd8573ee20592287996568e6175ceb0f8699ad75d"
+dependencies = [
+ "base64 0.21.0",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "hmac 0.12.1",
+ "md-5",
+ "memchr",
+ "rand 0.8.5",
+ "sha2 0.10.6",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6"
+dependencies = [
+ "bytes",
+ "fallible-iterator",
+ "postgres-protocol",
]
[[package]]
@@ -5767,13 +5996,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
-name = "prettyplease"
-version = "0.1.23"
+name = "pq-sys"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
+checksum = "3b845d6d8ec554f972a2c5298aad68953fd64e7441e846075450b44656a016d1"
+dependencies = [
+ "vcpkg",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -5822,7 +6060,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -5845,9 +6083,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564"
dependencies = [
"unicode-ident",
]
@@ -5899,14 +6137,14 @@ checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "prost"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
+checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537"
dependencies = [
"bytes",
"prost-derive",
@@ -5914,9 +6152,9 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e"
+checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
dependencies = [
"bytes",
"heck",
@@ -5929,7 +6167,7 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn",
+ "syn 1.0.109",
"tempfile",
"which",
]
@@ -5949,24 +6187,23 @@ dependencies = [
[[package]]
name = "prost-derive"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
+checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b"
dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "prost-types"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788"
+checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88"
dependencies = [
- "bytes",
"prost",
]
@@ -6014,6 +6251,15 @@ version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "quickcheck"
version = "0.9.2"
@@ -6034,7 +6280,7 @@ checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6050,9 +6296,9 @@ dependencies = [
[[package]]
name = "quinn-proto"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9"
+checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c"
dependencies = [
"bytes",
"rand 0.8.5",
@@ -6068,9 +6314,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@@ -6190,9 +6436,9 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
@@ -6200,9 +6446,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.10.2"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -6218,7 +6464,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
dependencies = [
"pem",
"ring",
- "time 0.3.17",
+ "time 0.3.20",
"x509-parser 0.13.2",
"yasna",
]
@@ -6231,7 +6477,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
"ring",
- "time 0.3.17",
+ "time 0.3.20",
"yasna",
]
@@ -6244,6 +6490,15 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "redox_users"
version = "0.4.3"
@@ -6251,15 +6506,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom 0.2.8",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[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",
@@ -6277,15 +6532,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "reqwest"
-version = "0.11.14"
+version = "0.11.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
dependencies = [
"base64 0.21.0",
"bytes",
@@ -6385,7 +6640,7 @@ checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6454,9 +6709,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"
@@ -6479,22 +6734,13 @@ dependencies = [
"semver 0.9.0",
]
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.16",
+ "semver 1.0.17",
]
[[package]]
@@ -6508,9 +6754,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.36.9"
+version = "0.37.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
dependencies = [
"bitflags",
"errno",
@@ -6556,9 +6802,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]]
name = "rw-stream-sink"
@@ -6573,9 +6819,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "safe_arith"
@@ -6607,9 +6853,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.3.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608"
+checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97"
dependencies = [
"cfg-if",
"derive_more",
@@ -6619,14 +6865,14 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.3.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c"
+checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6640,9 +6886,9 @@ dependencies = [
[[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 0.12.1",
]
@@ -6661,9 +6907,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
-version = "1.0.3"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "scrypt"
@@ -6770,23 +7016,14 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
- "semver-parser 0.7.0",
+ "semver-parser",
]
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "semver-parser"
@@ -6794,15 +7031,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
[[package]]
name = "send_wrapper"
version = "0.6.0"
@@ -6819,9 +7047,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.152"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
dependencies = [
"serde_derive",
]
@@ -6848,20 +7076,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.152"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "serde_json"
-version = "1.0.93"
+version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
dependencies = [
"itoa",
"ryu",
@@ -6870,13 +7098,13 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.10"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -6910,7 +7138,7 @@ dependencies = [
"darling 0.13.4",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7049,7 +7277,7 @@ dependencies = [
"num-bigint",
"num-traits",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -7071,10 +7299,16 @@ dependencies = [
]
[[package]]
-name = "slab"
-version = "0.4.7"
+name = "siphasher"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg 1.1.0",
]
@@ -7175,7 +7409,7 @@ dependencies = [
"serde",
"serde_json",
"slog",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -7220,7 +7454,7 @@ dependencies = [
"slog",
"term",
"thread_local",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -7271,14 +7505,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
-version = "0.9.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d"
+checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d"
dependencies = [
"aes-gcm 0.9.4",
"blake2",
"chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.0",
+ "curve25519-dalek 4.0.0-rc.2",
"rand_core 0.6.4",
"ring",
"rustc_version 0.4.0",
@@ -7288,14 +7522,24 @@ dependencies = [
[[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",
]
+[[package]]
+name = "socket2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc8d618c6641ae355025c449427f9e96b98abf99a772be3cef6708d15c77147a"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
[[package]]
name = "soketto"
version = "0.7.1"
@@ -7349,7 +7593,7 @@ source = "git+https://github.com/ralexstokes//ssz-rs?rev=adf1a0b14cef90b9536f28e
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7422,6 +7666,16 @@ dependencies = [
"types",
]
+[[package]]
+name = "stringprep"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
[[package]]
name = "strsim"
version = "0.8.0"
@@ -7453,7 +7707,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7501,7 +7755,7 @@ dependencies = [
"proc-macro2",
"quote",
"smallvec",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7515,7 +7769,7 @@ dependencies = [
"proc-macro2",
"quote",
"smallvec",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7529,9 +7783,20 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
dependencies = [
"proc-macro2",
"quote",
@@ -7552,7 +7817,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"unicode-xid",
]
@@ -7645,15 +7910,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -7689,7 +7954,24 @@ name = "test_random_derive"
version = "0.2.0"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "testcontainers"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87"
+dependencies = [
+ "bollard-stubs",
+ "futures",
+ "hex",
+ "hmac 0.12.1",
+ "log",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "sha2 0.10.6",
]
[[package]]
@@ -7703,22 +7985,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -7753,9 +8035,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",
@@ -7773,9 +8055,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",
]
@@ -7846,20 +8128,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.26.0"
+version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg 1.1.0",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"parking_lot 0.12.1",
"pin-project-lite 0.2.9",
"signal-hook-registry",
- "socket2",
+ "socket2 0.4.9",
"tokio-macros",
"windows-sys 0.45.0",
]
@@ -7876,13 +8157,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -7895,6 +8176,30 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "tokio-postgres"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e89f6234aa8fd43779746012fcf53603cdb91fdd8399aa0de868c2d56b6dde1"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "futures-channel",
+ "futures-util",
+ "log",
+ "parking_lot 0.12.1",
+ "percent-encoding",
+ "phf",
+ "pin-project-lite 0.2.9",
+ "postgres-protocol",
+ "postgres-types",
+ "socket2 0.5.1",
+ "tokio",
+ "tokio-util 0.7.7",
+]
+
[[package]]
name = "tokio-rustls"
version = "0.22.0"
@@ -7919,9 +8224,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 0.2.9",
@@ -7985,6 +8290,7 @@ dependencies = [
"futures-io",
"futures-sink",
"pin-project-lite 0.2.9",
+ "slab",
"tokio",
"tracing",
]
@@ -8066,7 +8372,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -8134,7 +8440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -8158,7 +8464,7 @@ version = "0.4.0"
dependencies = [
"darling 0.13.4",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -8189,7 +8495,7 @@ dependencies = [
"lazy_static",
"rand 0.8.5",
"smallvec",
- "socket2",
+ "socket2 0.4.9",
"thiserror",
"tinyvec",
"tokio",
@@ -8348,12 +8654,6 @@ dependencies = [
"tree_hash_derive",
]
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "uint"
version = "0.9.5"
@@ -8384,15 +8684,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-normalization"
@@ -8425,6 +8725,16 @@ dependencies = [
"subtle",
]
+[[package]]
+name = "universal-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
[[package]]
name = "unsigned-varint"
version = "0.6.0"
@@ -8454,6 +8764,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "unused_port"
version = "0.1.0"
+dependencies = [
+ "lazy_static",
+ "lru_cache",
+ "parking_lot 0.12.1",
+]
[[package]]
name = "url"
@@ -8610,12 +8925,11 @@ 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",
]
@@ -8716,7 +9030,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
@@ -8750,7 +9064,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -8813,6 +9127,39 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "watch"
+version = "0.1.0"
+dependencies = [
+ "axum",
+ "beacon_chain",
+ "beacon_node",
+ "bls",
+ "byteorder",
+ "clap",
+ "diesel",
+ "diesel_migrations",
+ "env_logger 0.9.3",
+ "eth2",
+ "hex",
+ "http_api",
+ "hyper",
+ "log",
+ "network",
+ "r2d2",
+ "rand 0.7.3",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "testcontainers",
+ "tokio",
+ "tokio-postgres",
+ "types",
+ "unused_port",
+ "url",
+]
+
[[package]]
name = "web-sys"
version = "0.3.61"
@@ -8880,6 +9227,8 @@ dependencies = [
"eth2_network_config",
"exit-future",
"futures",
+ "lazy_static",
+ "parking_lot 0.12.1",
"reqwest",
"serde",
"serde_derive",
@@ -8950,7 +9299,7 @@ dependencies = [
"sha2 0.10.6",
"stun",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
"tokio",
"turn",
"url",
@@ -8982,22 +9331,22 @@ dependencies = [
[[package]]
name = "webrtc-dtls"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f"
+checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05"
dependencies = [
"aes 0.6.0",
- "aes-gcm 0.8.0",
+ "aes-gcm 0.10.1",
"async-trait",
"bincode",
"block-modes",
"byteorder",
"ccm",
"curve25519-dalek 3.2.0",
- "der-parser 8.1.0",
+ "der-parser 8.2.0",
"elliptic-curve",
"hkdf",
- "hmac 0.10.1",
+ "hmac 0.12.1",
"log",
"oid-registry 0.6.1",
"p256",
@@ -9009,15 +9358,15 @@ dependencies = [
"rustls 0.19.1",
"sec1",
"serde",
- "sha-1 0.9.8",
- "sha2 0.9.9",
+ "sha1",
+ "sha2 0.10.6",
"signature",
"subtle",
"thiserror",
"tokio",
"webpki 0.21.4",
"webrtc-util",
- "x25519-dalek 2.0.0-pre.1",
+ "x25519-dalek 2.0.0-rc.2",
"x509-parser 0.13.2",
]
@@ -9052,7 +9401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
dependencies = [
"log",
- "socket2",
+ "socket2 0.4.9",
"thiserror",
"tokio",
"webrtc-util",
@@ -9136,15 +9485,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "which"
version = "4.4.0"
@@ -9212,6 +9552,15 @@ dependencies = [
"windows_x86_64_msvc 0.34.0",
]
+[[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-acl"
version = "0.3.0"
@@ -9231,12 +9580,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
@@ -9250,24 +9599,24 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_msvc"
@@ -9277,9 +9626,9 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_i686_gnu"
@@ -9289,9 +9638,9 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_msvc"
@@ -9301,9 +9650,9 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_x86_64_gnu"
@@ -9313,15 +9662,15 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_msvc"
@@ -9331,9 +9680,9 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "winreg"
@@ -9391,12 +9740,13 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "2.0.0-pre.1"
+version = "2.0.0-rc.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
+checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95"
dependencies = [
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek 4.0.0-rc.2",
"rand_core 0.6.4",
+ "serde",
"zeroize",
]
@@ -9416,7 +9766,7 @@ dependencies = [
"ring",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -9425,16 +9775,16 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
"base64 0.13.1",
"data-encoding",
- "der-parser 8.1.0",
+ "der-parser 8.2.0",
"lazy_static",
"nom 7.1.3",
"oid-registry 0.6.1",
"rusticata-macros",
"thiserror",
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
@@ -9481,28 +9831,27 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4"
dependencies = [
- "time 0.3.17",
+ "time 0.3.20",
]
[[package]]
name = "zeroize"
-version = "1.5.7"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn",
- "synstructure",
+ "syn 2.0.13",
]
[[package]]
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix
index 891d2370de..20792dd8fd 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix
@@ -1,26 +1,28 @@
{ clang
, cmake
+, CoreFoundation
, fetchFromGitHub
, fetchurl
, lib
, lighthouse
-, llvmPackages
+, nix-update-script
, nodePackages
, perl
+, pkg-config
+, postgresql
, protobuf
, rustPlatform
, Security
-, CoreFoundation
+, sqlite
, stdenv
+, SystemConfiguration
, testers
, unzip
-, nix-update-script
-, SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
pname = "lighthouse";
- version = "3.5.1";
+ version = "4.1.0";
# lighthouse/common/deposit_contract/build.rs
depositContractSpecVersion = "0.12.1";
@@ -30,15 +32,23 @@ rustPlatform.buildRustPackage rec {
owner = "sigp";
repo = "lighthouse";
rev = "v${version}";
- hash = "sha256-oF32s1nfzEZbaNUi5sQSrotcyOSinULj/qrRQWdMXHg=";
+ hash = "sha256-QVAFzV9sao8+eegI7bLfm+pPHyvDFhnADS80+nqqgtE=";
};
+ patches = [
+ ./use-system-sqlite.patch
+ ];
+
+ postPatch = ''
+ cp ${./Cargo.lock} Cargo.lock
+ '';
+
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"amcl-0.3.0" = "sha256-Mj4dXTlGVSleFfuTKgVDQ7S3jANMsdtVE5L90WGxA4U=";
- "arbitrary-1.2.2" = "sha256-39ZefB5Xok28y8lIdKleILBv4aokY90eMOssxUtU7yA=";
- "beacon-api-client-0.1.0" = "sha256-vqTC7bKXgliN7qd5LstNM5O6jRnn4aV/paj88Mua+Bc=";
+ "arbitrary-1.3.0" = "sha256-BMxcBfxBRf+Kb0Tz55jtFbwokSeD2GPtB+KV8Wbne0g=";
+ "beacon-api-client-0.1.0" = "sha256-fI8qST6HZrchg7yr/nVtRNrsW3f5ONSX+mGRYW+iiqA=";
"ethereum-consensus-0.1.1" = "sha256-aBrZ786Me0BWpnncxQc5MT3r+O0yLQhqGKFBiNTdqSA=";
"libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q=";
"lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk=";
@@ -50,11 +60,19 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "modern" "gnosis" ];
- nativeBuildInputs = [ rustPlatform.bindgenHook cmake perl protobuf ];
+ nativeBuildInputs = [
+ rustPlatform.bindgenHook
+ cmake
+ perl
+ pkg-config
+ protobuf
+ ];
- buildInputs = lib.optionals stdenv.isDarwin [
- Security
+ buildInputs = [
+ sqlite
+ ] ++ lib.optionals stdenv.isDarwin [
CoreFoundation
+ Security
SystemConfiguration
];
@@ -79,7 +97,7 @@ rustPlatform.buildRustPackage rec {
checkFeatures = [ ];
- # All of these tests require network access
+ # All of these tests require network access and/or docker
cargoTestFlags = [
"--workspace"
"--exclude beacon_node"
@@ -88,6 +106,7 @@ rustPlatform.buildRustPackage rec {
"--exclude lighthouse"
"--exclude lighthouse_network"
"--exclude slashing_protection"
+ "--exclude watch"
"--exclude web3signer_tests"
];
@@ -95,6 +114,7 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
"--skip service::tests::tests::test_dht_persistence"
"--skip time::test::test_reinsertion_updates_timeout"
+
] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [
"--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch"
"--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"
@@ -102,6 +122,7 @@ rustPlatform.buildRustPackage rec {
nativeCheckInputs = [
nodePackages.ganache
+ postgresql
];
passthru = {
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch
new file mode 100644
index 0000000000..b72e3062d2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch
@@ -0,0 +1,26 @@
+diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
+index 46b88af66..c8c909234 100644
+--- a/consensus/types/Cargo.toml
++++ b/consensus/types/Cargo.toml
+@@ -37,7 +37,7 @@ cached_tree_hash = { path = "../cached_tree_hash" }
+ serde_yaml = "0.8.13"
+ tempfile = "3.1.0"
+ derivative = "2.1.1"
+-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
++rusqlite = { version = "0.28.0", optional = true }
+ # The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by
+ # `AbstractExecPayload`
+ arbitrary = { version = "1.0", features = ["derive"] }
+diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml
+index 631e54dc4..dec95156b 100644
+--- a/validator_client/slashing_protection/Cargo.toml
++++ b/validator_client/slashing_protection/Cargo.toml
+@@ -12,7 +12,7 @@ path = "tests/main.rs"
+ [dependencies]
+ tempfile = "3.1.0"
+ types = { path = "../../consensus/types" }
+-rusqlite = { version = "0.28.0", features = ["bundled"] }
++rusqlite = { version = "0.28.0" }
+ r2d2 = "0.8.9"
+ r2d2_sqlite = "0.21.0"
+ serde = "1.0.116"
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
index 20e94d1ec9..6721cfec38 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock
@@ -466,7 +466,7 @@ dependencies = [
[[package]]
name = "binary-merkle-tree"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"hash-db",
"log",
@@ -2295,7 +2295,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
]
@@ -2318,7 +2318,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-support-procedural",
@@ -2343,7 +2343,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"Inflector",
"array-bytes",
@@ -2390,7 +2390,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-solution-type"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -2401,7 +2401,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-election-provider-solution-type",
"frame-support",
@@ -2418,7 +2418,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -2447,7 +2447,7 @@ dependencies = [
[[package]]
name = "frame-remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"log",
@@ -2463,7 +2463,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"bitflags",
"environmental",
@@ -2496,7 +2496,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"Inflector",
"cfg-expr",
@@ -2511,7 +2511,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -2523,7 +2523,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro2",
"quote",
@@ -2533,7 +2533,7 @@ dependencies = [
[[package]]
name = "frame-support-test"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2557,7 +2557,7 @@ dependencies = [
[[package]]
name = "frame-support-test-pallet"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -2568,7 +2568,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"log",
@@ -2586,7 +2586,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2601,7 +2601,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2610,7 +2610,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2792,7 +2792,7 @@ dependencies = [
[[package]]
name = "generate-bags"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"chrono",
"frame-election-provider-support",
@@ -3584,7 +3584,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
[[package]]
name = "kusama-runtime"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -3689,7 +3689,7 @@ dependencies = [
[[package]]
name = "kusama-runtime-constants"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -4571,7 +4571,7 @@ dependencies = [
[[package]]
name = "mmr-gadget"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"log",
@@ -4590,7 +4590,7 @@ dependencies = [
[[package]]
name = "mmr-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"anyhow",
"jsonrpsee",
@@ -5067,9 +5067,9 @@ dependencies = [
[[package]]
name = "orchestra"
-version = "0.2.0"
+version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecae97f74ddeb5c6ff00c98ef368423b4ec9a4d5ab48c0d909e84b7594b09718"
+checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015"
dependencies = [
"async-trait",
"dyn-clonable",
@@ -5084,9 +5084,9 @@ dependencies = [
[[package]]
name = "orchestra-proc-macro"
-version = "0.2.0"
+version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a9846c70b1df02657dbe5b54fadbad0ea3b944623ebf3fcbf7f33ef859dcba"
+checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066"
dependencies = [
"expander 0.0.6",
"itertools",
@@ -5152,7 +5152,7 @@ dependencies = [
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5167,7 +5167,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5183,7 +5183,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5197,7 +5197,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5221,7 +5221,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5241,7 +5241,7 @@ dependencies = [
[[package]]
name = "pallet-bags-list-remote-tests"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-election-provider-support",
"frame-remote-externalities",
@@ -5260,7 +5260,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5275,7 +5275,7 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5294,7 +5294,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"binary-merkle-tree",
@@ -5318,7 +5318,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5336,7 +5336,7 @@ dependencies = [
[[package]]
name = "pallet-child-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5355,7 +5355,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5372,7 +5372,7 @@ dependencies = [
[[package]]
name = "pallet-conviction-voting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5389,7 +5389,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5407,7 +5407,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5430,7 +5430,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-support-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5443,7 +5443,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5461,7 +5461,7 @@ dependencies = [
[[package]]
name = "pallet-fast-unstake"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5479,7 +5479,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5502,7 +5502,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5518,7 +5518,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5538,7 +5538,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5555,7 +5555,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5572,7 +5572,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5589,7 +5589,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5605,7 +5605,7 @@ dependencies = [
[[package]]
name = "pallet-nis"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5621,7 +5621,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5638,7 +5638,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-benchmarking"
version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5658,7 +5658,7 @@ dependencies = [
[[package]]
name = "pallet-nomination-pools-runtime-api"
version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"pallet-nomination-pools",
"parity-scale-codec",
@@ -5669,7 +5669,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5686,7 +5686,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5710,7 +5710,7 @@ dependencies = [
[[package]]
name = "pallet-preimage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5727,7 +5727,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5742,7 +5742,7 @@ dependencies = [
[[package]]
name = "pallet-ranked-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5760,7 +5760,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5775,7 +5775,7 @@ dependencies = [
[[package]]
name = "pallet-referenda"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"assert_matches",
"frame-benchmarking",
@@ -5794,7 +5794,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5811,7 +5811,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5832,7 +5832,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5848,7 +5848,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5862,7 +5862,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5885,7 +5885,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -5896,7 +5896,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"log",
"sp-arithmetic",
@@ -5905,7 +5905,7 @@ dependencies = [
[[package]]
name = "pallet-staking-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -5914,7 +5914,7 @@ dependencies = [
[[package]]
name = "pallet-state-trie-migration"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5931,7 +5931,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5945,7 +5945,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5963,7 +5963,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5982,7 +5982,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-support",
"frame-system",
@@ -5998,7 +5998,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"jsonrpsee",
"pallet-transaction-payment-rpc-runtime-api",
@@ -6014,7 +6014,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6026,7 +6026,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6043,7 +6043,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6058,7 +6058,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6074,7 +6074,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6089,7 +6089,7 @@ dependencies = [
[[package]]
name = "pallet-whitelist"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6103,7 +6103,7 @@ dependencies = [
[[package]]
name = "pallet-xcm"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bounded-collections",
"frame-benchmarking",
@@ -6127,7 +6127,7 @@ dependencies = [
[[package]]
name = "pallet-xcm-benchmarks"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6432,7 +6432,7 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
[[package]]
name = "polkadot"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_cmd",
"color-eyre",
@@ -6449,7 +6449,7 @@ dependencies = [
[[package]]
name = "polkadot-approval-distribution"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
@@ -6474,7 +6474,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"bitvec",
@@ -6499,7 +6499,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"derive_more",
@@ -6528,7 +6528,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"env_logger 0.9.0",
@@ -6557,7 +6557,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"clap 4.0.15",
"frame-benchmarking-cli",
@@ -6585,7 +6585,7 @@ dependencies = [
[[package]]
name = "polkadot-client"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"async-trait",
"frame-benchmarking",
@@ -6629,7 +6629,7 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"always-assert",
"assert_matches",
@@ -6658,7 +6658,7 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -6669,7 +6669,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -6701,7 +6701,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"criterion",
"parity-scale-codec",
@@ -6715,7 +6715,7 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -6742,7 +6742,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"always-assert",
"assert_matches",
@@ -6771,7 +6771,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"parity-scale-codec",
@@ -6790,7 +6790,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -6829,7 +6829,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"bitvec",
@@ -6858,7 +6858,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"bitvec",
@@ -6884,7 +6884,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"polkadot-node-subsystem",
@@ -6900,7 +6900,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -6924,7 +6924,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"maplit",
@@ -6943,7 +6943,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"futures",
@@ -6964,7 +6964,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"fatality",
@@ -6992,7 +6992,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"async-trait",
"futures",
@@ -7008,7 +7008,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"fatality",
@@ -7029,7 +7029,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"always-assert",
"assert_matches",
@@ -7057,6 +7057,7 @@ dependencies = [
"sp-maybe-compressed-blob",
"sp-tracing",
"sp-wasm-interface",
+ "substrate-build-script-utils",
"tempfile",
"test-parachain-adder",
"test-parachain-halt",
@@ -7067,7 +7068,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf-checker"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"futures-timer",
@@ -7090,7 +7091,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"lru 0.9.0",
@@ -7111,7 +7112,7 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"lazy_static",
"log",
@@ -7128,7 +7129,7 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_cmd",
"bs58",
@@ -7155,7 +7156,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"async-trait",
"derive_more",
@@ -7177,7 +7178,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bounded-vec",
"futures",
@@ -7200,7 +7201,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -7209,7 +7210,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"async-trait",
"futures",
@@ -7227,7 +7228,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"async-trait",
"derive_more",
@@ -7249,7 +7250,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -7290,7 +7291,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -7316,7 +7317,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bounded-collections",
"derive_more",
@@ -7332,7 +7333,7 @@ dependencies = [
[[package]]
name = "polkadot-performance-test"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"env_logger 0.9.0",
"kusama-runtime",
@@ -7347,7 +7348,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"hex-literal",
@@ -7372,7 +7373,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives-test-helpers"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"polkadot-primitives",
"rand 0.8.5",
@@ -7384,7 +7385,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"jsonrpsee",
"mmr-rpc",
@@ -7415,7 +7416,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -7512,7 +7513,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -7562,7 +7563,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-constants"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -7575,7 +7576,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-metrics"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bs58",
"parity-scale-codec",
@@ -7586,7 +7587,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"bitflags",
@@ -7639,7 +7640,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -7755,7 +7756,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"arrayvec 0.5.2",
"assert_matches",
@@ -7786,7 +7787,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -7795,7 +7796,7 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures",
"parity-scale-codec",
@@ -7821,7 +7822,7 @@ dependencies = [
[[package]]
name = "polkadot-test-malus"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"async-trait",
@@ -7849,7 +7850,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"frame-election-provider-support",
@@ -7914,7 +7915,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -7968,7 +7969,7 @@ dependencies = [
[[package]]
name = "polkadot-voter-bags"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"clap 4.0.15",
"generate-bags",
@@ -8108,11 +8109,10 @@ dependencies = [
[[package]]
name = "prioritized-metered-channel"
-version = "0.4.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3caef72a78ca8e77cbdfa87dd516ebb79d4cbe5b42e3b8435b463a8261339ff"
+checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
dependencies = [
- "async-channel",
"coarsetime",
"crossbeam-queue",
"derive_more",
@@ -8446,23 +8446,26 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.7.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
dependencies = [
+ "autocfg",
+ "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.11.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
+ "lazy_static",
"num_cpus",
]
@@ -8595,7 +8598,7 @@ dependencies = [
[[package]]
name = "remote-ext-tests-bags-list"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"clap 4.0.15",
"frame-system",
@@ -8706,7 +8709,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"binary-merkle-tree",
"frame-benchmarking",
@@ -8799,7 +8802,7 @@ dependencies = [
[[package]]
name = "rococo-runtime-constants"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -9014,7 +9017,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"log",
"sp-core",
@@ -9025,7 +9028,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -9053,7 +9056,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"futures-timer",
@@ -9076,7 +9079,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -9091,7 +9094,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"memmap2",
"sc-chain-spec-derive",
@@ -9110,7 +9113,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -9121,7 +9124,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"chrono",
@@ -9161,7 +9164,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"fnv",
"futures",
@@ -9187,7 +9190,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"hash-db",
"kvdb",
@@ -9213,7 +9216,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -9238,7 +9241,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"fork-tree",
@@ -9277,7 +9280,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"jsonrpsee",
@@ -9299,7 +9302,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-trait",
@@ -9334,7 +9337,7 @@ dependencies = [
[[package]]
name = "sc-consensus-beefy-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"jsonrpsee",
@@ -9353,7 +9356,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -9366,7 +9369,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ahash 0.8.2",
"array-bytes",
@@ -9406,7 +9409,7 @@ dependencies = [
[[package]]
name = "sc-consensus-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"finality-grandpa",
"futures",
@@ -9426,7 +9429,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -9449,7 +9452,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"lru 0.8.1",
"parity-scale-codec",
@@ -9473,7 +9476,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"sc-allocator",
"sp-maybe-compressed-blob",
@@ -9486,7 +9489,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"log",
"sc-allocator",
@@ -9499,7 +9502,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"anyhow",
"cfg-if",
@@ -9517,7 +9520,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ansi_term",
"futures",
@@ -9533,7 +9536,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-trait",
@@ -9548,7 +9551,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-channel",
@@ -9592,7 +9595,7 @@ dependencies = [
[[package]]
name = "sc-network-bitswap"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"cid",
"futures",
@@ -9612,7 +9615,7 @@ dependencies = [
[[package]]
name = "sc-network-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-trait",
@@ -9640,7 +9643,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ahash 0.8.2",
"futures",
@@ -9659,7 +9662,7 @@ dependencies = [
[[package]]
name = "sc-network-light"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"futures",
@@ -9681,7 +9684,7 @@ dependencies = [
[[package]]
name = "sc-network-sync"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-trait",
@@ -9715,7 +9718,7 @@ dependencies = [
[[package]]
name = "sc-network-transactions"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"futures",
@@ -9735,7 +9738,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"bytes",
@@ -9766,7 +9769,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"libp2p",
@@ -9779,7 +9782,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9788,7 +9791,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"jsonrpsee",
@@ -9818,7 +9821,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9837,7 +9840,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"http",
"jsonrpsee",
@@ -9852,7 +9855,7 @@ dependencies = [
[[package]]
name = "sc-rpc-spec-v2"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"futures",
@@ -9878,7 +9881,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"directories",
@@ -9944,7 +9947,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"log",
"parity-scale-codec",
@@ -9955,7 +9958,7 @@ dependencies = [
[[package]]
name = "sc-storage-monitor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"clap 4.0.15",
"fs4",
@@ -9971,7 +9974,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"jsonrpsee",
"parity-scale-codec",
@@ -9990,7 +9993,7 @@ dependencies = [
[[package]]
name = "sc-sysinfo"
version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"libc",
@@ -10009,7 +10012,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"chrono",
"futures",
@@ -10028,7 +10031,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ansi_term",
"atty",
@@ -10059,7 +10062,7 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10070,7 +10073,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -10097,7 +10100,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -10111,7 +10114,7 @@ dependencies = [
[[package]]
name = "sc-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-channel",
"futures",
@@ -10549,7 +10552,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
[[package]]
name = "slot-range-helper"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -10626,7 +10629,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"hash-db",
"log",
@@ -10644,7 +10647,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"Inflector",
"blake2",
@@ -10658,7 +10661,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10671,7 +10674,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10685,7 +10688,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10698,7 +10701,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10710,7 +10713,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"log",
@@ -10728,7 +10731,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -10743,7 +10746,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10761,7 +10764,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"merlin",
@@ -10784,7 +10787,7 @@ dependencies = [
[[package]]
name = "sp-consensus-beefy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"lazy_static",
"parity-scale-codec",
@@ -10803,7 +10806,7 @@ dependencies = [
[[package]]
name = "sp-consensus-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"finality-grandpa",
"log",
@@ -10821,7 +10824,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10833,7 +10836,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -10846,7 +10849,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"base58",
@@ -10889,7 +10892,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"blake2b_simd",
"byteorder",
@@ -10903,7 +10906,7 @@ dependencies = [
[[package]]
name = "sp-core-hashing-proc-macro"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro2",
"quote",
@@ -10914,7 +10917,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"kvdb",
"parking_lot 0.12.1",
@@ -10923,7 +10926,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro2",
"quote",
@@ -10933,7 +10936,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10944,7 +10947,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10959,7 +10962,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"bytes",
"ed25519",
@@ -10984,7 +10987,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"lazy_static",
"sp-core",
@@ -10995,7 +10998,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures",
@@ -11012,7 +11015,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"thiserror",
"zstd",
@@ -11021,7 +11024,7 @@ dependencies = [
[[package]]
name = "sp-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ckb-merkle-mountain-range",
"log",
@@ -11039,7 +11042,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11053,7 +11056,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"sp-api",
"sp-core",
@@ -11063,7 +11066,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"backtrace",
"lazy_static",
@@ -11073,7 +11076,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"rustc-hash",
"serde",
@@ -11083,7 +11086,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"either",
"hash256-std-hasher",
@@ -11105,7 +11108,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -11123,7 +11126,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -11135,7 +11138,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11149,7 +11152,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11161,7 +11164,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"hash-db",
"log",
@@ -11181,12 +11184,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
[[package]]
name = "sp-storage"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11199,7 +11202,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"futures-timer",
@@ -11214,7 +11217,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -11226,7 +11229,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"sp-api",
"sp-runtime",
@@ -11235,7 +11238,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"log",
@@ -11251,7 +11254,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ahash 0.8.2",
"hash-db",
@@ -11274,7 +11277,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11291,7 +11294,7 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"proc-macro2",
@@ -11302,7 +11305,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"anyhow",
"impl-trait-for-tuples",
@@ -11316,7 +11319,7 @@ dependencies = [
[[package]]
name = "sp-weights"
version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -11367,7 +11370,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "staking-miner"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_cmd",
"clap 4.0.15",
@@ -11536,7 +11539,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"platforms",
]
@@ -11544,7 +11547,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"frame-system-rpc-runtime-api",
"futures",
@@ -11563,7 +11566,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"hyper",
"log",
@@ -11575,7 +11578,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-client"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"jsonrpsee",
@@ -11588,7 +11591,7 @@ dependencies = [
[[package]]
name = "substrate-state-trie-migration-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"jsonrpsee",
"log",
@@ -11607,7 +11610,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"array-bytes",
"async-trait",
@@ -11633,7 +11636,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"futures",
"substrate-test-utils-derive",
@@ -11643,7 +11646,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -11654,7 +11657,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"ansi_term",
"build-helper",
@@ -11802,7 +11805,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16"
[[package]]
name = "test-parachain-adder"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"dlmalloc",
"parity-scale-codec",
@@ -11815,7 +11818,7 @@ dependencies = [
[[package]]
name = "test-parachain-adder-collator"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"clap 4.0.15",
"futures",
@@ -11841,14 +11844,14 @@ dependencies = [
[[package]]
name = "test-parachain-halt"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"substrate-wasm-builder",
]
[[package]]
name = "test-parachain-undying"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"dlmalloc",
"log",
@@ -11862,7 +11865,7 @@ dependencies = [
[[package]]
name = "test-parachain-undying-collator"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"clap 4.0.15",
"futures",
@@ -11888,7 +11891,7 @@ dependencies = [
[[package]]
name = "test-parachains"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"parity-scale-codec",
"sp-core",
@@ -11899,7 +11902,7 @@ dependencies = [
[[package]]
name = "test-runtime-constants"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -12296,7 +12299,7 @@ dependencies = [
[[package]]
name = "tracing-gum"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"polkadot-node-jaeger",
"polkadot-primitives",
@@ -12306,7 +12309,7 @@ dependencies = [
[[package]]
name = "tracing-gum-proc-macro"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"expander 0.0.6",
@@ -12455,7 +12458,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.40#ba87188cce8c0a11c9542d7363cd5ddd46db2740"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#980eb16791bab5d63b47c07657bb9dc198d9307b"
dependencies = [
"async-trait",
"clap 4.0.15",
@@ -13397,7 +13400,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -13494,7 +13497,7 @@ dependencies = [
[[package]]
name = "westend-runtime-constants"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"polkadot-primitives",
@@ -13794,7 +13797,7 @@ dependencies = [
[[package]]
name = "xcm"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"bounded-collections",
"derivative",
@@ -13812,7 +13815,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"assert_matches",
"frame-support",
@@ -13837,7 +13840,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"environmental",
"frame-benchmarking",
@@ -13856,7 +13859,7 @@ dependencies = [
[[package]]
name = "xcm-executor-integration-tests"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"frame-system",
@@ -13876,7 +13879,7 @@ dependencies = [
[[package]]
name = "xcm-procedural"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"Inflector",
"proc-macro2",
@@ -13886,7 +13889,7 @@ dependencies = [
[[package]]
name = "xcm-simulator"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -13902,7 +13905,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-example"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"frame-support",
"frame-system",
@@ -13928,7 +13931,7 @@ dependencies = [
[[package]]
name = "xcm-simulator-fuzzer"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"arbitrary",
"frame-support",
@@ -13997,7 +14000,7 @@ dependencies = [
[[package]]
name = "zombienet-backchannel"
-version = "0.9.40"
+version = "0.9.41"
dependencies = [
"futures-util",
"lazy_static",
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
index 2dd3869f72..370695d797 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix
@@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
- version = "0.9.40";
+ version = "0.9.41";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
- hash = "sha256-gwifWhGsStC8vhMxc+LWSvs/av8c04cdWv7iszIQ/k8=";
+ hash = "sha256-wjV/+2n9B617S6MxC48vtpbBBKGCWBEjRj7K6m630Mo=";
# the build process of polkadot requires a .git folder in order to determine
# the git commit hash that is being built and add it to the version string.
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "binary-merkle-tree-4.0.0-dev" = "sha256-YxCAFrLWTmGjTFzNkyjE+DNs2cl4IjAlB7qz0KPN1vE=";
+ "binary-merkle-tree-4.0.0-dev" = "sha256-ngtW11MGs+fcuCp9J5NH+dYJeK4YM5vWpRk0OuLYHus=";
"sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix
index 4886720218..b21e945b1a 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix
@@ -2,22 +2,54 @@
, fetchFromGitHub
, lib
, rustPlatform
-, IOKit
-, Security
-, AppKit
-, pkg-config
+, darwin
, udev
-, zlib
, protobuf
+, libcxx
+, rocksdb
+, pkg-config
+, openssl
+, nix-update-script
+# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
+, solanaPkgs ? [
+ "solana"
+ "solana-bench-tps"
+ "solana-faucet"
+ "solana-gossip"
+ "solana-install"
+ "solana-keygen"
+ "solana-log-analyzer"
+ "solana-net-shaper"
+ "solana-sys-tuner"
+ "rbpf-cli"
+ "solana-validator"
+ "solana-ledger-tool"
+ "cargo-build-bpf"
+ "cargo-test-bpf"
+ "solana-dos"
+ "solana-install-init"
+ "solana-stake-accounts"
+ "solana-test-validator"
+ "solana-tokens"
+ "solana-watchtower"
+ "cargo-test-sbf"
+ "cargo-build-sbf"
+] ++ [
+ # XXX: Ensure `solana-genesis` is built LAST!
+ # See https://github.com/solana-labs/solana/issues/5826
+ "solana-genesis"
+ ]
}:
let
- pinData = lib.importJSON ./pin.json;
- version = pinData.version;
- sha256 = pinData.sha256;
- cargoSha256 = pinData.cargoSha256;
+ version = "1.14.17";
+ sha256 = "sha256-pYbnEF8MgF7fCBf/MOPT//UCeOQj9tuIkDj8UIVFz3E=";
+ cargoSha256 = "sha256-n9nuBiKV3FCgq5fJ5BuqIIAp1yZ6IO+zHjrMaUBfgzs=";
+
+ inherit (darwin.apple_sdk_11_0) Libsystem;
+ inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
in
rustPlatform.buildRustPackage rec {
- pname = "solana-testnet-cli";
+ pname = "solana-cli";
inherit version cargoSha256;
src = fetchFromGitHub {
@@ -27,35 +59,52 @@ rustPlatform.buildRustPackage rec {
inherit sha256;
};
- buildAndTestSubdir = "cli";
+ strictDeps = true;
+ verifyCargoDeps = true;
+ cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
- nativeBuildInputs = lib.optionals stdenv.isLinux [ protobuf pkg-config ];
- buildInputs = lib.optionals stdenv.isLinux [ udev zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit Security AppKit ];
-
- # check phase fails
- # on darwin with missing framework System. This framework is not available in nixpkgs
- # on linux with some librocksdb-sys compilation error
+ # Even tho the tests work, a shit ton of them try to connect to a local RPC
+ # or access internet in other ways, eventually failing due to Nix sandbox.
+ # Maybe we could restrict the check to the tests that don't require an RPC,
+ # but judging by the quantity of tests, that seems like a lengthty work and
+ # I'm not in the mood ((ΦωΦ))
doCheck = false;
- # all the following are needed for the checkphase
- # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ];
- # Needed to get openssl-sys to use pkg-config.
- # OPENSSL_NO_VENDOR = 1;
- # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
- # OPENSSL_DIR="${lib.getDev openssl}";
- # LLVM_CONFIG_PATH="${llvm}/bin/llvm-config";
- # LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
+ nativeBuildInputs = [ protobuf pkg-config ];
+ buildInputs = [ openssl rustPlatform.bindgenHook ]
+ ++ lib.optionals stdenv.isLinux [ udev ]
+ ++ lib.optionals stdenv.isDarwin [
+ libcxx
+ IOKit
+ Security
+ AppKit
+ System
+ Libsystem ];
+
+ postInstall = ''
+ mkdir -p $out/bin/sdk/bpf
+ cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
+ '';
+
# Used by build.rs in the rocksdb-sys crate. If we don't set these, it would
# try to build RocksDB from source.
- # ROCKSDB_INCLUDE_DIR="${rocksdb}/include";
- # ROCKSDB_LIB_DIR="${rocksdb}/lib";
+ ROCKSDB_LIB_DIR="${rocksdb}/lib";
+
+ # Require this on darwin otherwise the compiler starts rambling about missing
+ # cmath functions
+ CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
+ LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib";
+
+ # If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
+ OPENSSL_NO_VENDOR = 1;
meta = with lib; {
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
homepage = "https://solana.com";
license = licenses.asl20;
- maintainers = with maintainers; [ happysalada ];
+ maintainers = with maintainers; [ netfox happysalada ];
platforms = platforms.unix;
};
- passthru.updateScript = ./update.sh;
+
+ passthru.updateScript = nix-update-script { };
}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana/pin.json b/third_party/nixpkgs/pkgs/applications/blockchains/solana/pin.json
deleted file mode 100644
index 34ef479795..0000000000
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana/pin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "version": "1.10.9",
- "sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
- "cargoSha256": "sha256-7EULmmztt+INvSdluvvX5xbE2hWKAmHiW0MEYIPNPw4="
-}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/solana/update.sh
deleted file mode 100755
index ffd8b0010c..0000000000
--- a/third_party/nixpkgs/pkgs/applications/blockchains/solana/update.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
-
-# TODO set to `verbose` or `extdebug` once implemented in oil
-shopt --set xtrace
-# we need failures inside of command subs to get the correct cargoSha256
-shopt --unset inherit_errexit
-
-const directory = $(dirname $0 | xargs realpath)
-const owner = "solana-labs"
-const repo = "solana"
-const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
- jq -r '.tag_name')
-const latest_version = $(echo $latest_rev | sd 'v' '')
-const current_version = $(jq -r '.version' $directory/pin.json)
-if ("$latest_version" === "$current_version") {
- echo "solana is already up-to-date"
- return 0
-} else {
- const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
- const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
-
- jq ".version = \"$latest_version\" | \
- .\"sha256\" = \"$tarball_hash\" | \
- .\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
-
- const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
- tail -n 2 | \
- head -n 1 | \
- sd '\s+got:\s+' '')
-
- jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
-}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix
index d7f1963a3c..eecc313af6 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix
@@ -16,15 +16,16 @@
, openimajgrabber
, hwi
, imagemagick
+, gzip
}:
let
pname = "sparrow";
- version = "1.7.3";
+ version = "1.7.6";
src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
- sha256 = "sha256-/tKct73v0zWAjY4kTllnb/+SB/8ENgVl8Yh/LErKTxY=";
+ sha256 = "01ksl790i8swvj8nvl2r27bbd8kad80shsbw3di39925841dp8z3";
};
launcher = writeScript "sparrow" ''
@@ -93,7 +94,7 @@ let
sparrow-modules = stdenv.mkDerivation {
pname = "sparrow-modules";
inherit version src;
- nativeBuildInputs = [ makeWrapper gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ];
+ nativeBuildInputs = [ makeWrapper gzip gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ];
buildPhase = ''
# Extract Sparrow's JIMAGE and generate a list of them.
@@ -143,9 +144,9 @@ let
# Replace the embedded Tor binary (which is in a Tar archive)
# with one from Nixpkgs.
- cp ${torWrapper} ./tor
- tar -cJf tor.tar.xz tor
- cp tor.tar.xz modules/netlayer.jpms/native/linux/x64/tor.tar.xz
+ gzip -c ${torWrapper} > tor.gz
+ cp tor.gz modules/kmp.tor.binary.linuxx64/kmptor/linux/x64/tor.gz
+ find modules
'';
installPhase = ''
@@ -158,7 +159,8 @@ let
};
in
stdenv.mkDerivation rec {
- inherit pname version src;
+ inherit version src;
+ pname = "sparrow-unwrapped";
nativeBuildInputs = [ makeWrapper copyDesktopItems ];
desktopItems = [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/fhsenv.nix
index a82b975227..ae14e6e4a5 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/fhsenv.nix
@@ -1,9 +1,9 @@
{ lib
-, buildFHSUserEnv
+, buildFHSEnv
, sparrow-unwrapped
}:
-buildFHSUserEnv {
+buildFHSEnv {
name = "sparrow";
runScript = "${sparrow-unwrapped}/bin/sparrow";
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh
index bda8b0765a..7a520b351a 100755
--- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/update.sh
@@ -23,4 +23,4 @@ sha256sum -c --ignore-missing manifest.txt
sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname")
popd
-update-source-version sparrow "$version" "$sha256"
+update-source-version sparrow-unwrapped "$version" "$sha256"
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix
index f333fcd05d..d181493f7b 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/ton/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, cmake
, git
+, pkg-config
, gperf
, libmicrohttpd
, openssl
@@ -12,25 +13,22 @@
stdenv.mkDerivation rec {
pname = "ton";
- version = "2023.01";
+ version = "2023.04";
src = fetchFromGitHub {
owner = "ton-blockchain";
repo = "ton";
rev = "v${version}";
- sha256 = "sha256-wb96vh0YcTBFE8EzBItdTf88cvRMLW2XxcGJpNetOi8=";
+ sha256 = "sha256-3HQF0wKk0iRV5fKzuCTv7X7MC+snMDrodgqScCZQVY4=";
fetchSubmodules = true;
};
- postPatch = ''
- # without this fails on aarch64-darwin with clang-11: error: the clang compiler does not support '-mcpu=apple-m1'
- substituteInPlace CMakeLists.txt \
- --replace 'set(TON_ARCH "apple-m1")' ""
- '';
+ outputs = [ "out" "dev" ];
nativeBuildInputs = [
cmake
git
+ pkg-config
];
buildInputs = [
@@ -44,6 +42,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A fully decentralized layer-1 blockchain designed by Telegram";
homepage = "https://ton.org/";
+ changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md";
license = licenses.lgpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ misuzu ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
index 418745ffb4..7560f5191e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix
@@ -2,7 +2,7 @@
{ alsa-lib
, bash
-, buildFHSUserEnv
+, buildFHSEnv
, cacert
, coreutils
, dbus
@@ -178,7 +178,7 @@ let
# Android Studio downloads prebuilt binaries as part of the SDK. These tools
# (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS
# environment is used as a work around for that.
- fhsEnv = buildFHSUserEnv {
+ fhsEnv = buildFHSEnv {
name = "${drvName}-fhs-env";
multiPkgs = pkgs: [
ncurses5
diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
index 664199553d..260f71ea64 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }:
+{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -6,21 +6,18 @@ let
fontDirectories = [];
};
inherit (gnome2) GConf gnome_vfs;
- inherit buildFHSUserEnv;
+ inherit buildFHSEnv;
inherit tiling_wm;
};
stableVersion = {
- version = "2022.1.1.20"; # "Android Studio Electric Eel (2022.1.1) Patch 1"
- sha256Hash = "sha256-UX7aOpTM23S7NBPNAz/fKEyK/dqWpok0NnpX9wck6p4=";
+ version = "2022.2.1.18"; # "Android Studio Flamingo (2022.2.1)"
+ sha256Hash = "sha256-zdhSxEmbX3QC30Tfxp6MpBj/yaaEyqs0BHR2/SyyTvw=";
};
betaVersion = {
- version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1"
- sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc=";
- };
- latestVersion = { # canary & dev
- version = "2022.3.1.1"; # "Android Studio Girrafe (2022.3.1) Canary 1"
- sha256Hash = "I7Zc4DDByUB6XOnk7v+91ccpNI7eX/T4d3vH60ih8ec=";
+ version = "2022.3.1.12"; # "Android Studio Giraffe (2022.3.1) Beta 1"
+ sha256Hash = "sha256-Wy5iifscL1Ko7ZInx/uAvyJyM4cS6LfTYWxdJbZk6po=";
};
+ latestVersion = betaVersion;
in {
# Attributes are named by their corresponding release channels
diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
index ddbf234aee..55c5aabaa3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
- version = "1.190.1";
+ version = "1.192.0";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
- hash = "sha256-JnFvbCSDRkw2/BXoSCB9IcB5hwrhB+hvS1xLj5eAQbs=";
+ hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
index 6e8086a543..43400ed2c2 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json
@@ -11,28 +11,28 @@
},
"ATFlatControls": {
"owner": "Alexey-T",
- "rev": "2023.03.22",
- "hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs="
+ "rev": "2023.04.26",
+ "hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0="
},
"ATSynEdit": {
"owner": "Alexey-T",
- "rev": "2023.04.08",
- "hash": "sha256-FBrb/2VwmpM6FCUvHXZTJCsn/a9r3qPNBYVWyN5CS5o="
+ "rev": "2023.04.26",
+ "hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE="
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
- "rev": "2023.04.08",
- "hash": "sha256-xm2fMAm0DF0hILxBQ2m+OSodQQgl5a4rkW0pgTDjuoo="
+ "rev": "2023.04.26",
+ "hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk="
},
"EControl": {
"owner": "Alexey-T",
- "rev": "2023.04.04",
- "hash": "sha256-BLj37uTHB4T0ek97u7hYqxbUjW71efGBKGG35CEyLR8="
+ "rev": "2023.04.18",
+ "hash": "sha256-Eb8ynxZP3OQ7TGFZMbw8r0HXXvaoR6yotwnwK6nwZxg="
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
- "rev": "2023.04.04",
- "hash": "sha256-bqNq1tzZjzwMw3I6G5kuFeh7qp33DGo4gu4BVd4pONk="
+ "rev": "2023.04.17",
+ "hash": "sha256-ZCRoKuwU+DtXEEZEL2QhhwMfewQMhw+/20vVRgHpHf4="
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix
index 7773c1e75f..46642d6755 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -2,7 +2,7 @@
, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
, makeWrapper, perl, ... }:
-{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }:
+{ name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
stdenv.mkDerivation rec {
inherit name src;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
categories = [ "Development" ];
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper perl ];
buildInputs = [
fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
libXrender libXtst libsecret zlib
@@ -38,14 +38,13 @@ stdenv.mkDerivation rec {
# settings in ~/.eclipse/org.eclipse.platform_ rather
# than ~/.eclipse/org.eclipse.platform__.
productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
- productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
--prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
+ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"
# Create desktop item.
mkdir -p $out/share/applications
@@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
# ensure eclipse.ini does not try to use a justj jvm, as those aren't compatible with nix
- ${perl}/bin/perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin\n||' $out/eclipse/eclipse.ini
+ perl -i -p0e 's|-vm\nplugins/org.eclipse.justj.*/jre/bin.*\n||' $out/eclipse/eclipse.ini
''; # */
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
index a0b0fa56de..686ec36811 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix
@@ -10,15 +10,15 @@
# find the downloads needed for new versions
#
# to test:
-# $ for e in cpp modeling platform sdk java jee committers rcp; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done
+# for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done
let
platform_major = "4";
- platform_minor = "26";
- year = "2022";
- month = "12"; #release month
- buildmonth = "11"; #sometimes differs from release month
- timestamp = "${year}${buildmonth}231800";
+ platform_minor = "27";
+ year = "2023";
+ month = "03"; #release month
+ buildmonth = "03"; #sometimes differs from release month
+ timestamp = "${year}${buildmonth}020300";
gtk = gtk3;
arch = if stdenv.hostPlatform.isx86_64 then
"x86_64"
@@ -27,11 +27,13 @@ let
else throw "don't know what platform suffix for ${stdenv.hostPlatform.system} will be";
in rec {
- buildEclipse = callPackage ./build-eclipse.nix {
+ # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
+ buildEclipseUnversioned = callPackage ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
makeWrapper;
};
+ buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });
### Eclipse CPP
@@ -42,8 +44,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw==";
- aarch64 = "sha512-kmeNH6F8oK72LtrYtiJVLKhy6Q1HwnU+Bh+mpXdXSrfj9KtqzHQkJ0kTnnJkGYLtpi+zyXDwsxzyjh6pPyDRJA==";
+ x86_64 = "sha256-MBng3ETarHMlUUPpVvMIZxVqpe9JW5xNHonnN6CHRcw=";
+ aarch64 = "sha256-7FgpPzp5MY/fB6Q/wvrvi+Lpcm3tmH7bUTLh7q2Rjek=";
}.${arch};
};
};
@@ -57,8 +59,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q==";
- aarch64 = "sha512-F63f2o9u/p7hhrxI+Eu6NiL4sPccIYw876Nnj8mfSZ7bozs1OVNWftZj+xbdLLbr0bVz3WKnt4BHzcLUA6QG7g==";
+ x86_64 = "sha256-BXofrKElgCG3+WUCanpX1sGLhirj2pLi+pi24Z+WjBk=";
+ aarch64 = "sha256-CdePRa6jmWlt3Wismt3RahGzYOm1ZDwQRt82kRVXSdM=";
}.${arch};
};
};
@@ -72,8 +74,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw==";
- aarch64 = "sha512-BvUkOdCsjwtscPeuBXG7ZpitOr8EQK5JL8nSGpw/RhhBEFz46nsc7W18l0aYjdzRHh2ie55RylS2PEQELkS/hQ==";
+ x86_64 = "sha256-aprXjNv2NMoIDCNkFxwmMKcGUt2ssRonzTZ/hH57Mig=";
+ aarch64 = "sha256-Aq9PDVo/9zTeQ2j6q5bf1aIKjKM7oonIr1mEQ7rX48Y=";
}.${arch};
};
};
@@ -81,9 +83,10 @@ in rec {
### Eclipse Scala SDK
eclipse-scala-sdk =
- (buildEclipse.override { jdk = jdk8; gtk = gtk2; } {
+ (buildEclipseUnversioned.override { jdk = jdk8; gtk = gtk2; } {
name = "eclipse-scala-sdk-4.7.0";
description = "Eclipse IDE for Scala Developers";
+ productVersion = "4.7";
src =
fetchurl {
url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz";
@@ -103,8 +106,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ==";
- aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw==";
+ x86_64 = "sha256-39DXU7wIsdxkUpNKnYPT7+qPJ2DrF7G7UJqPfhEDGGs=";
+ aarch64 = "sha256-7GwKGNHWPZ3uOFyzQj1dftFFz/3oa2j8XWkRn0wnllY=";
}.${arch};
};
};
@@ -118,8 +121,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ==";
- aarch64 = "sha512-KOQ6BZuQJeVpbMQVxF67M3F/KXMmDhmZQBNq0yWM+/8+d0DiBRkwJtqPYsnTqrax8FSunn2yy+CzlfyHSoNvpg==";
+ x86_64 = "sha256-zNBzFHmNaxUutzMh/5pOglJiKh5NAvSVwvPYyA6RVr4=";
+ aarch64 = "sha256-RtLXB9kgpLERfhpvDTaJG84qVyN1Puud1PTZtk/WIO0=";
}.${arch};
};
};
@@ -133,8 +136,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ==";
- aarch64 = "sha512-iaoTB/Pinoj1weiGBBv0plQ4jGNdFs2JiBG7S/icUoAX5O6jTGAgJvOwh7Nzn+0N6YL6+HPWaV24a6lM43y8Og==";
+ x86_64 = "sha256-vpvmKZKVl6ubfq8QMDr0xprXYMWl576hu+ovvREN4ak=";
+ aarch64 = "sha256-5Yqxgl4kkN3Bb7hsTnd9q5TsCpVBVkEVvqPbL5MYEyg=";
}.${arch};
};
};
@@ -148,8 +151,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q==";
- aarch64 = "sha512-B866dFJcsTkq+h0RZ61CxXE83TWvCf8ZAbGeIC385PpPR3i/gZnRjN2oRrDP22CNR5XXA+PfXKxqvERhJB5ebA==";
+ x86_64 = "sha256-4SAiEZWSUaiK8QO2Hg39FBcj1aYRtbOJkeF1W1AMQBo=";
+ aarch64 = "sha256-+KGDlo6QK3o/n2vSiD0HpIkBwqwIiMXzdFUpfE48gps=";
}.${arch};
};
};
@@ -163,8 +166,8 @@ in rec {
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz";
hash = {
- x86_64 = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU=";
- aarch64 = "sha256-sMB6a3f0fiL6ZentIjJTMi59ZOh7dizXrkMQuIRbds0=";
+ x86_64 = "sha256-bhcpzsS9cci3Y3Pk9DOrtPonKjRg/vzDqDr3Be/xfks=";
+ aarch64 = "sha256-YCb4leFWRtx4VPwK/5vgwwDH3/f0/0OWEy4ueAS7sUw=";
}.${arch};
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
index 5ae155f39f..a8a248804b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,13 +254,13 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
- # find current version at https://www.eclipse.org/cdt/downloads.php
- version = "11.0.0";
+ # find current version at https://github.com/eclipse-cdt/cdt/releases
+ version = "11.1.1";
src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
- hash = "sha256-2rt9crMqNFevIHFIdOGWDq+j0ZJPVt1a9Z7P9HG58Ks=";
+ hash = "sha256-k78QKPIb3Lr0Wcg2tTlX1abdpcvxspjaxJiP2Hrgb4A=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index 141851a56a..18a2204c50 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -475,10 +475,10 @@
elpaBuild {
pname = "boxy";
ename = "boxy";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/boxy-1.1.2.tar";
- sha256 = "0gqfs8rwqb3clwqgvv9wibl2mfx0njkdcpwl662p4bwnapl4hsi9";
+ url = "https://elpa.gnu.org/packages/boxy-1.1.3.tar";
+ sha256 = "1z153lccj6rgix9kj5xk8xzdc44ixq8flia7ppjxpj7c0slr3sm2";
};
packageRequires = [ emacs ];
meta = {
@@ -569,10 +569,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
- version = "0.13";
+ version = "0.15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/cape-0.13.tar";
- sha256 = "1rd4ja5dlg9jnh75h24a475cfn8v6icxljya190yfp44vwl5q9v0";
+ url = "https://elpa.gnu.org/packages/cape-0.15.tar";
+ sha256 = "1gy99a7zg8kbh7f4fqqq7cpwjmq7af066m6z6c1wrv438sfsd3kz";
};
packageRequires = [ compat emacs ];
meta = {
@@ -832,10 +832,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
- version = "0.33";
+ version = "0.34";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/consult-0.33.tar";
- sha256 = "0v84v61hc5w9z71i11bglp4m2fvjpp4l9xp9j731aj6psdhahd8a";
+ url = "https://elpa.gnu.org/packages/consult-0.34.tar";
+ sha256 = "12dljbs0x5gbayibzb0mb3bn78wlfx9078b8l0fyfpvbhd9lxhfl";
};
packageRequires = [ compat emacs ];
meta = {
@@ -907,10 +907,10 @@
elpaBuild {
pname = "counsel";
ename = "counsel";
- version = "0.13.4";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/counsel-0.13.4.tar";
- sha256 = "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031";
+ url = "https://elpa.gnu.org/packages/counsel-0.14.0.tar";
+ sha256 = "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj";
};
packageRequires = [ emacs ivy swiper ];
meta = {
@@ -1312,10 +1312,10 @@
elpaBuild {
pname = "doc-toc";
ename = "doc-toc";
- version = "1.1";
+ version = "1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/doc-toc-1.1.tar";
- sha256 = "145k0w84nda1gq5g8zd9510kxhqqqk72ladi3av6hpydvym6bszz";
+ url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar";
+ sha256 = "0vz2jyqgx0sf3mhxnnm0fl395a9mcd9fg661pp3mz0pywpl3ymax";
};
packageRequires = [ emacs ];
meta = {
@@ -1487,10 +1487,10 @@
elpaBuild {
pname = "eglot";
ename = "eglot";
- version = "1.13";
+ version = "1.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eglot-1.13.tar";
- sha256 = "1yg6ddldd2qnnhlhc2r5rq7rjc0pigqjgzpvnqqb33nssw1lkw82";
+ url = "https://elpa.gnu.org/packages/eglot-1.14.tar";
+ sha256 = "0aw28gdx90k87czxf436r9bva58bal55cdnp90ga36c89wzdjznj";
};
packageRequires = [
eldoc
@@ -1531,10 +1531,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/eldoc-1.13.0.tar";
- sha256 = "0c05dzrs7vrhibj46jpz625482ah6xywji7way6wcvwc711y74fz";
+ url = "https://elpa.gnu.org/packages/eldoc-1.14.0.tar";
+ sha256 = "15bg61nbfb6l51frlsn430ga3vscns2651wvi6377vlyra7kgn39";
};
packageRequires = [ emacs ];
meta = {
@@ -1591,10 +1591,10 @@
elpaBuild {
pname = "embark";
ename = "embark";
- version = "0.21.1";
+ version = "0.22.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/embark-0.21.1.tar";
- sha256 = "157km8r8lrvp81l90vqrhvisd794qf0rsqfazl5r47gg1ba7szv5";
+ url = "https://elpa.gnu.org/packages/embark-0.22.1.tar";
+ sha256 = "0dxbvrp057a0kyydnf8vfwnf4m3q3jy4180agcmizlr64lm2pmh1";
};
packageRequires = [ compat emacs ];
meta = {
@@ -1636,10 +1636,10 @@
elpaBuild {
pname = "ement";
ename = "ement";
- version = "0.8.1";
+ version = "0.8.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ement-0.8.1.tar";
- sha256 = "0h5xqi5szmfxrs6hl85vkd363mrkrzi1niph3v3aybisffxlfyxg";
+ url = "https://elpa.gnu.org/packages/ement-0.8.3.tar";
+ sha256 = "074ah73y2v285rlgzn3q2kcqmbra2qdz4hmjs8xd5hpk7za53c7w";
};
packageRequires = [
emacs
@@ -1665,10 +1665,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
- version = "14";
+ version = "15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/emms-14.tar";
- sha256 = "0525vmi397q604z8i35zld3c4fkwbvxwir5lf4f1ji1bbvkzqavc";
+ url = "https://elpa.gnu.org/packages/emms-15.tar";
+ sha256 = "0kd9qx93cgcxyqsnbp95xx414s08rd5bb35aif3c7qyab5w05yi6";
};
packageRequires = [ cl-lib nadvice seq ];
meta = {
@@ -1880,10 +1880,10 @@
elpaBuild {
pname = "flymake";
ename = "flymake";
- version = "1.2.2";
+ version = "1.3.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/flymake-1.2.2.tar";
- sha256 = "04pa6mayyqrhrijk0rmmrd7k7al9caqyrb5qzkzwbna9ykb1j4zp";
+ url = "https://elpa.gnu.org/packages/flymake-1.3.4.tar";
+ sha256 = "0gm08rj83if9cs0jz7zig363zfqp809j6lgaqdb0apzh48fbznkd";
};
packageRequires = [ eldoc emacs project ];
meta = {
@@ -2489,10 +2489,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
- version = "0.13.4";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.13.4.tar";
- sha256 = "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v";
+ url = "https://elpa.gnu.org/packages/ivy-0.14.0.tar";
+ sha256 = "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv";
};
packageRequires = [ emacs ];
meta = {
@@ -2504,10 +2504,10 @@
elpaBuild {
pname = "ivy-avy";
ename = "ivy-avy";
- version = "0.13.4";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-avy-0.13.4.tar";
- sha256 = "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi";
+ url = "https://elpa.gnu.org/packages/ivy-avy-0.14.0.tar";
+ sha256 = "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9";
};
packageRequires = [ avy emacs ivy ];
meta = {
@@ -2534,10 +2534,10 @@
elpaBuild {
pname = "ivy-hydra";
ename = "ivy-hydra";
- version = "0.13.5";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-hydra-0.13.5.tar";
- sha256 = "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x";
+ url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.0.tar";
+ sha256 = "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n";
};
packageRequires = [ emacs hydra ivy ];
meta = {
@@ -2614,10 +2614,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
- version = "0.4";
+ version = "0.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/jinx-0.4.tar";
- sha256 = "1jxgj419rc4aha133c6zggzgzvr2zdx6mi6x4ipydk3x2l19k5lr";
+ url = "https://elpa.gnu.org/packages/jinx-0.7.tar";
+ sha256 = "0kfi5sjzrbxkbcql3h5qi0gd4dsbrxbjg5wldid8vjgqm9cnzvw4";
};
packageRequires = [ compat emacs ];
meta = {
@@ -2644,10 +2644,10 @@
elpaBuild {
pname = "js2-mode";
ename = "js2-mode";
- version = "20220710";
+ version = "20230408";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/js2-mode-20220710.tar";
- sha256 = "1wvkqkfbnk3qanbz9167z8dik3667ihgyca8brbkh2b1ld10f9yq";
+ url = "https://elpa.gnu.org/packages/js2-mode-20230408.tar";
+ sha256 = "1rzlbqddvaa51dz13did5ylj0ggwqnl0wii8735sylfcv6b82241";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -2959,10 +2959,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
- version = "1.1";
+ version = "1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/marginalia-1.1.tar";
- sha256 = "1pldbgsjs9xsrp3y9rp8yz8p67xbhb3gy80sv5q215f6mwhphjqm";
+ url = "https://elpa.gnu.org/packages/marginalia-1.2.tar";
+ sha256 = "1hhq09ghc8pcphgjhp5mc81i7j4xkkf5sc0swd6xr6mrxd044fnj";
};
packageRequires = [ compat emacs ];
meta = {
@@ -3264,10 +3264,10 @@
elpaBuild {
pname = "nano-agenda";
ename = "nano-agenda";
- version = "0.2.1";
+ version = "0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/nano-agenda-0.2.1.tar";
- sha256 = "0j29fwc273mjdlj83h1a46sb7z3j066qqnp2i78kn2pmgjg27szb";
+ url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar";
+ sha256 = "1ip21vjapcrla6j0qbjkcrdhs6xq773cswmwbhnsxb3xpzsa1z7x";
};
packageRequires = [ emacs ];
meta = {
@@ -3523,10 +3523,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "9.6.2";
+ version = "9.6.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-9.6.2.tar";
- sha256 = "0sgf2c6pl3ldyv47kpz0180frayxipv6z9zafmdd97bkbl82aarz";
+ url = "https://elpa.gnu.org/packages/org-9.6.4.tar";
+ sha256 = "1g0yi308bviw9fypikx67n2g4hvr63cin4pxnhv8s70np7754kf2";
};
packageRequires = [ emacs ];
meta = {
@@ -3688,10 +3688,10 @@
elpaBuild {
pname = "osm";
ename = "osm";
- version = "0.10";
+ version = "0.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/osm-0.10.tar";
- sha256 = "1lpbc98ais0wrrpj9cmra3ha8jnja4d3pqzw1kdml91drhqifpmw";
+ url = "https://elpa.gnu.org/packages/osm-0.11.tar";
+ sha256 = "17bll1p3s5gkhaiisab8w5q9ygsmqgmzfq5irghl71vlac0r2gsk";
};
packageRequires = [ compat emacs ];
meta = {
@@ -3838,10 +3838,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
- version = "0.4.44";
+ version = "0.4.46";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/phps-mode-0.4.44.tar";
- sha256 = "0xzhigj8dvhaqj87wk1z9lhbhjsk944ydp4h6pn4lqa9lgb0kfkl";
+ url = "https://elpa.gnu.org/packages/phps-mode-0.4.46.tar";
+ sha256 = "128pbn2ndqwvaxxagwz23xa9adr3m5dac1cid7dichddsis849z8";
};
packageRequires = [ emacs ];
meta = {
@@ -3868,10 +3868,10 @@
elpaBuild {
pname = "plz";
ename = "plz";
- version = "0.4";
+ version = "0.5.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/plz-0.4.tar";
- sha256 = "05139hmgh35qibb6i9qdyxalw66ghcpvpqbs4ai8x98s8c5vl509";
+ url = "https://elpa.gnu.org/packages/plz-0.5.4.tar";
+ sha256 = "0dmjza49135x3baczk6q0lv9ib8lvfkdbbw4ps5hkr45wfxr64vc";
};
packageRequires = [ emacs ];
meta = {
@@ -4003,10 +4003,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
- version = "5.3.1";
+ version = "5.3.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/pyim-5.3.1.tar";
- sha256 = "0lkshw52xdrcbdrgmjb665bpyga61qlk29rrzrrj7s82n09bq9kv";
+ url = "https://elpa.gnu.org/packages/pyim-5.3.2.tar";
+ sha256 = "13irkmhlfq99glyy0vhj559si5672cqcysjxlxn7lvckxr298vzc";
};
packageRequires = [ async emacs xr ];
meta = {
@@ -4108,10 +4108,10 @@
elpaBuild {
pname = "rcirc-color";
ename = "rcirc-color";
- version = "0.4.4";
+ version = "0.4.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rcirc-color-0.4.4.tar";
- sha256 = "1jwx9fd3m7zl6c7q91v185iy7b8q1bncvif80xi6hbi2srz9rlfg";
+ url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar";
+ sha256 = "0j2bcx2dplcy5zgh9zdhla8i12rq916ilbnw4ns83xdg7k0dwncf";
};
packageRequires = [ emacs ];
meta = {
@@ -4684,10 +4684,10 @@
elpaBuild {
pname = "sml-mode";
ename = "sml-mode";
- version = "6.11";
+ version = "6.12";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sml-mode-6.11.tar";
- sha256 = "05vga709kphbx6jacqh57cq5gyicwrxxf81gask5lbq7vzfzlbfc";
+ url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar";
+ sha256 = "19wyxsnw60lmjbb7ijislpv9vzk9996rh1b0iw7wyrqszfxy2p20";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -4883,10 +4883,10 @@
elpaBuild {
pname = "substitute";
ename = "substitute";
- version = "0.1.7";
+ version = "0.1.8";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/substitute-0.1.7.tar";
- sha256 = "1mgpmc5ndsqv32zlsz96gnahg2x2329r0mxn45ajqsjf3b4pyxi6";
+ url = "https://elpa.gnu.org/packages/substitute-0.1.8.tar";
+ sha256 = "1xa1ny4iblifrylxkj2i99vnayrxh669dlbpcbk4rb7alvv1npnz";
};
packageRequires = [ emacs ];
meta = {
@@ -4958,10 +4958,10 @@
elpaBuild {
pname = "swiper";
ename = "swiper";
- version = "0.13.4";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/swiper-0.13.4.tar";
- sha256 = "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v";
+ url = "https://elpa.gnu.org/packages/swiper-0.14.0.tar";
+ sha256 = "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms";
};
packageRequires = [ emacs ivy ];
meta = {
@@ -4969,6 +4969,21 @@
license = lib.licenses.free;
};
}) {};
+ switchy-window = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
+ elpaBuild {
+ pname = "switchy-window";
+ ename = "switchy-window";
+ version = "1.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar";
+ sha256 = "1ax63fksjmjsgai7xxzm1mj5bhbc7dzk7c389abd280g637z2cy7";
+ };
+ packageRequires = [ compat emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/switchy-window.html";
+ license = lib.licenses.free;
+ };
+ }) {};
sxhkdrc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sxhkdrc-mode";
@@ -5282,10 +5297,10 @@
elpaBuild {
pname = "triples";
ename = "triples";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
- sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
+ url = "https://elpa.gnu.org/packages/triples-0.2.7.tar";
+ sha256 = "1p980liprsnir4wqvf0ixzykv61iaaprkc6wc0vi7a4q2pj7ra6f";
};
packageRequires = [ emacs seq ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index d1f9dbd3a4..08d96268e7 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -106,7 +106,9 @@ self: let
};
});
- jinx = super.jinx.overrideAttrs (old: {
+ jinx = super.jinx.overrideAttrs (old: let
+ libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
+ in {
dontUnpack = false;
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
@@ -117,12 +119,12 @@ self: let
postBuild = ''
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
- $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
+ $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2
'';
postInstall = (old.postInstall or "") + "\n" + ''
outd=$out/share/emacs/site-lisp/elpa/jinx-*
- install -m444 -t $outd jinx-mod.so
+ install -m444 -t $outd jinx-mod${libExt}
rm $outd/jinx-mod.c $outd/emacs-module.h
'';
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index b58465e20e..cf33780fa3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -13,8 +13,6 @@ in
agda2-mode = callPackage ./manual-packages/agda2-mode { };
- bqn-mode = callPackage ./manual-packages/bqn-mode { };
-
cask = callPackage ./manual-packages/cask { };
control-lock = callPackage ./manual-packages/control-lock { };
@@ -25,8 +23,6 @@ in
emacspeak = callPackage ./manual-packages/emacspeak { };
- ement = callPackage ./manual-packages/ement { };
-
ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
evil-markdown = callPackage ./manual-packages/evil-markdown { };
@@ -51,6 +47,8 @@ in
jam-mode = callPackage ./manual-packages/jam-mode { };
+ ligo-mode = callPackage ./manual-packages/ligo-mode { };
+
llvm-mode = callPackage ./manual-packages/llvm-mode { };
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix
deleted file mode 100644
index 6430e56ef7..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib
-, trivialBuild
-, fetchFromGitHub
-}:
-
-trivialBuild {
- pname = "bqn-mode";
- version = "0.pre+date=2022-09-14";
-
- src = fetchFromGitHub {
- owner = "museoa";
- repo = "bqn-mode";
- rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
- hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
- };
-
- meta = with lib; {
- description = "Emacs mode for BQN programming language";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ sternenseemann AndersonTorres ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
index 7473a85879..894f8b75cc 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
@@ -2,11 +2,11 @@
trivialBuild rec {
pname = "ebuild-mode";
- version = "1.61";
+ version = "1.63";
src = fetchurl {
url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
- sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk=";
+ sha256 = "sha256-Ar11zz0IVMu0g9+PN9dXvj8yeKnUGi8M+CTJfGP3bd4=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix
deleted file mode 100644
index c43d0d7765..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ trivialBuild
-, lib
-, fetchFromGitHub
-, plz
-, cl-lib
-, ts
-, magit-section
-, taxy-magit-section
-, taxy
-, svg-lib
-}:
-
-trivialBuild {
- pname = "ement";
- version = "unstable-2022-09-01";
-
- src = fetchFromGitHub {
- owner = "alphapapa";
- repo = "ement.el";
- rev = "4ec2107e6a90ed962ddd3875d47caa523eb466b9";
- sha256 = "sha256-zKkBpaOj3qb/Oy89rt7BxmWZDZzDzMIJjjOm+1rrnnc=";
- };
-
- packageRequires = [
- plz
- cl-lib
- ts
- magit-section
- taxy-magit-section
- taxy
- svg-lib
- ];
-
- patches = [
- ./handle-nil-images.patch
- ];
-
- meta = {
- description = "Ement.el is a Matrix client for Emacs";
- license = lib.licenses.gpl3Only;
- platforms = lib.platforms.all;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch
deleted file mode 100644
index 271e1cd2db..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ement/handle-nil-images.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ement-lib.el b/ement-lib.el
-index f0b2738..025a191 100644
---- a/ement-lib.el
-+++ b/ement-lib.el
-@@ -644,14 +644,15 @@ can cause undesirable underlining."
- "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT.
- IMAGE should be one as created by, e.g. `create-image'."
- ;; It would be nice if the image library had some simple functions to do this sort of thing.
-- (let ((new-image (cl-copy-list image)))
-- (when (fboundp 'imagemagick-types)
-- ;; Only do this when ImageMagick is supported.
-- ;; FIXME: When requiring Emacs 27+, remove this (I guess?).
-- (setf (image-property new-image :type) 'imagemagick))
-- (setf (image-property new-image :max-width) max-width
-- (image-property new-image :max-height) max-height)
-- new-image))
-+ (when image
-+ (let ((new-image (cl-copy-list image)))
-+ (when (fboundp 'imagemagick-types)
-+ ;; Only do this when ImageMagick is supported.
-+ ;; FIXME: When requiring Emacs 27+, remove this (I guess?).
-+ (setf (image-property new-image :type) 'imagemagick))
-+ (setf (image-property new-image :max-width) max-width
-+ (image-property new-image :max-height) max-height)
-+ new-image)))
-
- (defun ement--room-alias (room)
- "Return latest m.room.canonical_alias event in ROOM."
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix
new file mode 100644
index 0000000000..a81ffcc37e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, melpaBuild
+, fetchFromGitLab
+, writeText
+, unstableGitUpdater
+}:
+
+let
+ pname = "ligo-mode";
+ version = "20230302.1616";
+ commit = "d1073474efc9e0a020a4bcdf5e0c12a217265a3a";
+in
+melpaBuild {
+ inherit pname version commit;
+
+ src = fetchFromGitLab {
+ owner = "ligolang";
+ repo = "ligo";
+ rev = commit;
+ hash = "sha256-wz9DF9mqi8WUt1Ebd+ueUTA314rKkdbjmoWF8cKuS8I=";
+ };
+
+ packageRequires = [ ];
+
+ buildInputs = [ ];
+
+ checkInputs = [ ];
+
+ recipe = writeText "recipe" ''
+ (ligo-mode :fetcher gitlab
+ :repo "ligolang/ligo"
+ :files ("tools/emacs/ligo-mode.el"))
+ '';
+
+ passthru.updateScript = unstableGitUpdater { };
+
+ meta = {
+ description = "A major mode for editing LIGO source code";
+ homepage = "https://gitlab.com/ligolang/ligo";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index bdfe1ed2c8..a199e841dd 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -16,7 +16,7 @@
}:
let
- rev = "c5dc02f6bd47039c320083b3befac0e569c0efa4";
+ rev = "7e1e6a4c349e720d75c892cd7230b29c35148342";
python = python3.withPackages (ps: with ps; [
epc
orjson
@@ -26,13 +26,13 @@ let
in
melpaBuild {
pname = "lsp-bridge";
- version = "20230311.1648"; # 16:48 UTC
+ version = "20230424.1642"; # 16:42 UTC
src = fetchFromGitHub {
owner = "manateelazycat";
repo = "lsp-bridge";
inherit rev;
- sha256 = "sha256-vbSVGPFBjAp4VRbJc6a2W0d2IqOusNa+rk4X6jRcjRI=";
+ sha256 = "sha256-e0XVQpsyjy8HeZN6kLRjnoTpyEefTqstsgydEKlEQ1c=";
};
commit = rev;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 1f37004420..f23e46466c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -125,7 +125,7 @@ let
ligo-mode =
if super.ligo-mode.version == "0.3"
then markBroken super.ligo-mode
- else super.ligo-mode;
+ else null; # auto-updater is failing; use manual one
# upstream issue: missing file header
link = markBroken super.link;
@@ -314,7 +314,9 @@ let
ivy-rtags = fix-rtags super.ivy-rtags;
- jinx = super.jinx.overrideAttrs (old: {
+ jinx = super.jinx.overrideAttrs (old: let
+ libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
+ in {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config
];
@@ -324,14 +326,14 @@ let
postBuild = ''
pushd working/jinx
NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE"
- $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2
+ $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2
popd
'';
postInstall = (old.postInstall or "") + "\n" + ''
pushd source
outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*)
- install -m444 --target-directory=$outd jinx-mod.so
+ install -m444 --target-directory=$outd jinx-mod${libExt}
rm $outd/jinx-mod.c $outd/emacs-module.h
popd
'';
@@ -341,6 +343,28 @@ let
};
});
+ sqlite3 = super.sqlite3.overrideAttrs (old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ];
+
+ postBuild = ''
+ pushd working/sqlite3
+ make
+ popd
+ '';
+
+ postInstall = (old.postInstall or "") + "\n" + ''
+ pushd source
+ outd=$out/share/emacs/site-lisp/elpa/sqlite3-*
+ install -m444 -t $outd sqlite3-api.so
+ rm $outd/*.c $outd/*.h
+ popd
+ '';
+
+ meta = old.meta // {
+ maintainers = [ lib.maintainers.DamienCassou ];
+ };
+ });
+
libgit = super.libgit.overrideAttrs(attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index d68d91c809..366e38f14d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -156,10 +156,10 @@
elpaBuild {
pname = "autothemer";
ename = "autothemer";
- version = "0.2.14";
+ version = "0.2.18";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.14.tar";
- sha256 = "14y8b807d75qym1qviiqy1s85495z9g7jvvfqqz42ngdnk87l3qb";
+ url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar";
+ sha256 = "1gn7n8xd07sks49xirwah1y039s2hn02p0y1j4lmqh7m47l0fvl2";
};
packageRequires = [ dash emacs ];
meta = {
@@ -261,10 +261,10 @@
elpaBuild {
pname = "buttercup";
ename = "buttercup";
- version = "1.30";
+ version = "1.31";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/buttercup-1.30.tar";
- sha256 = "152w8f6yy7jd6vawq4dh3fnmlxm2x3i99w9hd6kv4bs7c2y2dkj8";
+ url = "https://elpa.nongnu.org/nongnu/buttercup-1.31.tar";
+ sha256 = "1aw9k3dfscqpq2jkk1yqh6i3682yjs85fnm7rzc5i9qawrl9db6h";
};
packageRequires = [ emacs ];
meta = {
@@ -605,10 +605,10 @@
elpaBuild {
pname = "eat";
ename = "eat";
- version = "0.6.1";
+ version = "0.8";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/eat-0.6.1.tar";
- sha256 = "0gs7cg4liz2qy3x82z8f5hddixvsh5nqvc3xkzvqqvvrwqbhf6za";
+ url = "https://elpa.nongnu.org/nongnu/eat-0.8.tar";
+ sha256 = "1nvwd8iryjdcbm3v2xjgnf4ifcbs4d8hxn7xydxw6i7c5l8vya9f";
};
packageRequires = [ emacs ];
meta = {
@@ -1874,10 +1874,10 @@
elpaBuild {
pname = "minibar";
ename = "minibar";
- version = "0.2";
+ version = "0.3";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/minibar-0.2.tar";
- sha256 = "0idb91vp0pbichv2gfs314av6cgx5mkrn9w3yxwj81if1bvsmw0h";
+ url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar";
+ sha256 = "1mgkkjaav9hkg1c0lvn887armxv18hn99zd3dy1dx2lnjv2kfdcp";
};
packageRequires = [ emacs ];
meta = {
@@ -2728,10 +2728,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/subed-1.2.1.tar";
- sha256 = "09a3ggnqsm4lxqhj0z9z3df6qzibvv9lpwqij2gpiifbb4lkvj4b";
+ url = "https://elpa.nongnu.org/nongnu/subed-1.2.2.tar";
+ sha256 = "1xlh4kqa8516rvmzy67pzs0ghk9rc919nq5b2sywd5mvzi5spxnh";
};
packageRequires = [ emacs ];
meta = {
@@ -2989,10 +2989,10 @@
elpaBuild {
pname = "undo-fu-session";
ename = "undo-fu-session";
- version = "0.4";
+ version = "0.5";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.4.tar";
- sha256 = "1p9qr9hzqiv1kgnglskny7m7lh2f8r4l0cf53431nf8hrp806qah";
+ url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.5.tar";
+ sha256 = "002srqa08kpgzsp171n88k1bz7qin16lpr7yafg13i29x37v6yzq";
};
packageRequires = [ emacs ];
meta = {
@@ -3197,10 +3197,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
- version = "23.8.20230331200914";
+ version = "23.10.20230407101020";
src = fetchurl {
- url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-23.8.20230331200914.tar";
- sha256 = "0zh7h04zy014ss36bzz820574jj2xnx7yb3rnl02m9vynrss2i3m";
+ url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-23.10.20230407101020.tar";
+ sha256 = "1gdzl5s80hhfnskngjsw1wy18rs6k5hr5cvnj7pdli9ai10alx9y";
};
packageRequires = [ emacs ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index b96aeb0861..48849984ca 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -302,14 +302,14 @@
},
{
"ename": "abs-mode",
- "commit": "aabccc4061e7764069796e12ee9688b67651cf70",
- "sha256": "148y99iaxcnjaacw017chwq0sq05ywgy5jx1lhp9ly7innrl9i1k",
+ "commit": "96e62d39a15aa739712f178da2889a2cc96bfaf7",
+ "sha256": "0q8alfwpd9pn0kml4r5czynms1md0mhpapvxwg9jhqqkjrjvpdbr",
"fetcher": "github",
"repo": "abstools/abs-mode",
"unstable": {
"version": [
- 20230330,
- 1616
+ 20230419,
+ 1429
],
"deps": [
"erlang",
@@ -317,21 +317,22 @@
"maude-mode",
"yasnippet"
],
- "commit": "42f37e1628ee00b8603a6d20f8d1dddcec0d1ba3",
- "sha256": "151j65zamkbczlw9aa6w255s2aanzxacd2rgzwnxdraxdcchwkd7"
+ "commit": "ce3bab5a6b2ec22810a20a6bd8aa2c014a5938a1",
+ "sha256": "1rihlgl3w4rc0riqm03p279ysyq2yp7dg2v1zi2gmhb5w2vac2a0"
},
"stable": {
"version": [
1,
- 5
+ 6
],
"deps": [
"erlang",
"flymake",
- "maude-mode"
+ "maude-mode",
+ "yasnippet"
],
- "commit": "a9a512992f681669dc59fe9ca86f12b9688b5454",
- "sha256": "0v6d7cxnj4mil7c7y4m1csiznl6rmzxg9snwhhv6wdqfw112kn8j"
+ "commit": "e6edb867b5cc68b5c9c112a51f51f7c1d22554dc",
+ "sha256": "1h355815bk4bs7wmmjkchb3c5v2fd5sfw7cqcxf4dgll3jpnphkv"
}
},
{
@@ -1841,11 +1842,11 @@
"repo": "bbatsov/adoc-mode",
"unstable": {
"version": [
- 20230315,
- 1147
+ 20230413,
+ 800
],
- "commit": "9e7af55e7eb8c1b19ac46139ce0f79110d1452d4",
- "sha256": "1a02sqg4h09nhy3g2hjh06qh2l9bm1dyg95dgk5hf1hn7wjiiy44"
+ "commit": "a7691c8b9a738fd724007a2a283ed2c20684a7e5",
+ "sha256": "0zhdxhpak23pq2r0dcf27a22kclhl4pn4abm5c6y8pi78g5ncjh3"
},
"stable": {
"version": [
@@ -1912,14 +1913,14 @@
"repo": "minad/affe",
"unstable": {
"version": [
- 20230314,
- 1552
+ 20230411,
+ 441
],
"deps": [
"consult"
],
- "commit": "4f9763413beab8d8866e6f0d9c02599f3ba0c852",
- "sha256": "0h81d476iw6697fkyn1sj3w0vphbdgb8m5548zjlxjc7fa8rhmg3"
+ "commit": "ae3169ac4bbd64520d165b4ce4806b7a34b972dc",
+ "sha256": "12h3ydjg294iqb255za703inix182qbjhf8vrky02fpry66ba000"
},
"stable": {
"version": [
@@ -2332,11 +2333,11 @@
"repo": "jgkamat/alda-mode",
"unstable": {
"version": [
- 20210705,
- 654
+ 20230406,
+ 1927
],
- "commit": "ae08444d16bd1859a06c8ed6a3e7ae2e9ad397ed",
- "sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx"
+ "commit": "580f6e94c93aead91406d00a42ccf9040a898cb8",
+ "sha256": "1zqlq63kdzq8swiwdzpn7419bz0h7a2d2fnx32w2ack7z0yqkxri"
},
"stable": {
"version": [
@@ -2617,14 +2618,14 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20220424,
- 1027
+ 20230412,
+ 1516
],
"deps": [
"all-the-icons"
],
- "commit": "0c7221366ceddbf122073ecd07dd86e1baf032ff",
- "sha256": "1zb8ginhgjdyf571laysqqhnh1cf7n4h06diqkjdz5gmdq3yyzv6"
+ "commit": "12cf4c0852dd299974508451b99fdb0660629cb6",
+ "sha256": "0p3sx50n47b74px2y6271xgqwbp42sack2nvxj2219ivv6wyrw1v"
},
"stable": {
"version": [
@@ -2679,15 +2680,15 @@
"repo": "seagle0128/all-the-icons-ivy-rich",
"unstable": {
"version": [
- 20230314,
- 1559
+ 20230420,
+ 1234
],
"deps": [
"all-the-icons",
"ivy-rich"
],
- "commit": "1bae2c95e5bf865af55d219d50baf4ee9ce5e7c6",
- "sha256": "0xf6ra63ja2mz2aaf9qpn3fxbvk1s8k258amk1imc6y0ps6nhc2x"
+ "commit": "c098cc85123a401b0ab8f2afd3a25853e61d7d28",
+ "sha256": "0vplr6zxx7xqjh7641fmnnmdhs2rll8l375a9kw0dn87gyhyjdh2"
},
"stable": {
"version": [
@@ -2884,15 +2885,16 @@
"url": "https://repo.or.cz/amread-mode.git",
"unstable": {
"version": [
- 20230401,
- 320
+ 20230409,
+ 1018
],
"deps": [
"cl-lib",
+ "hydra",
"pyim"
],
- "commit": "36e1c893e9e4fb7bad13e7cbcd07b11a649fbc0d",
- "sha256": "0k248vw9pk8fngy3jfrr43xhsxvbhzwiplx6sk85pgzpyvwsxvji"
+ "commit": "b8622ae7b05f27d6f84c4e5d724bc79163ba9ce3",
+ "sha256": "1xjm3bqv517v95lcjjncw2yb6vamjc4la6xdw6afc6dwyq0cy19l"
}
},
{
@@ -2918,14 +2920,14 @@
"repo": "DarwinAwardWinner/amx",
"unstable": {
"version": [
- 20210305,
- 118
+ 20230413,
+ 1210
],
"deps": [
"s"
],
- "commit": "37f9c7ae55eb0331b27200fb745206fc58ceffc0",
- "sha256": "0h1cxqqf0hixh25j679r57bq9dv0b20icf268wbnsim5xp88ngf8"
+ "commit": "1c2428d21e9d2ee8bee944b572a39ca8c91ca13b",
+ "sha256": "11fkcn8w8z8ck5zdhw0y682p9b45rz1p1xd32xyi13q6r5g9c3ia"
},
"stable": {
"version": [
@@ -3689,11 +3691,11 @@
"repo": "radian-software/apheleia",
"unstable": {
"version": [
- 20230329,
- 2135
+ 20230420,
+ 1333
],
- "commit": "23c8b7d1ca3d855b38b8fe8bee760fa1234b6143",
- "sha256": "0675pqlq674143l77qysw6ks0y1y6nh54fzr2ycfbfbm0shm4z29"
+ "commit": "49890c3762cd9591f572b6d48c53b03f3caf1725",
+ "sha256": "12slpv91qxwss60rka25vpxivvpca83a294c2dq0mgxy6av0a3b8"
},
"stable": {
"version": [
@@ -3849,11 +3851,11 @@
"repo": "waymondo/apropospriate-theme",
"unstable": {
"version": [
- 20230310,
- 2249
+ 20230410,
+ 2107
],
- "commit": "99e492804de96a0bb98fa058c4c86908132b4cf7",
- "sha256": "1fmg5b5jdan4mfmli452rf385icl603mpsrs76zd3rml45bil2r8"
+ "commit": "1ac38ed16dc7a8d8a9d1617aeaecb8e988750348",
+ "sha256": "0zxr1lm5f74w0ga7rwb61j82zd247xm3w0m55icmqnha0174i6vp"
},
"stable": {
"version": [
@@ -5673,26 +5675,26 @@
"repo": "jasonm23/autothemer",
"unstable": {
"version": [
- 20220905,
- 1550
+ 20230414,
+ 1419
],
"deps": [
"dash"
],
- "commit": "87a21019ed4f41a487a8af34467e0ebff19f365e",
- "sha256": "0jxlfwcfqdjr3da2xzjnigmckarhjbn6b1i1x4pdzb5djjcz00qc"
+ "commit": "8f72afc6dba5ad7cc3a201a084fd20571f945d2e",
+ "sha256": "15f7i39937riswpwjpc1ryg2v0rqj944pwf7rp2ry56rbx4vgl97"
},
"stable": {
"version": [
0,
2,
- 14
+ 17
],
"deps": [
"dash"
],
- "commit": "87a21019ed4f41a487a8af34467e0ebff19f365e",
- "sha256": "0jxlfwcfqdjr3da2xzjnigmckarhjbn6b1i1x4pdzb5djjcz00qc"
+ "commit": "d4bd4427f541b7a0803a9ef849cc935c0f86df17",
+ "sha256": "13lj0igrsdycsr8ldv2hilj2x79c888g4lx2ixqn7w29lw6cb44g"
}
},
{
@@ -6466,14 +6468,14 @@
"stable": {
"version": [
1,
- 0,
- 4
+ 1,
+ 0
],
"deps": [
"seq"
],
- "commit": "5773a2639471db7ce0ecea7bb2b6f797c7fcad9a",
- "sha256": "1pkaw96y9j6zmyzizhzccix4sdx98q4fjwrvfl68ss82x1swi6k5"
+ "commit": "2971591510f08ab1645ed8a238b6ad086750f994",
+ "sha256": "0x7jar59xj7n678x13k2v2z5rnyi9hrpy4vzh23g1pnfsi1v4knf"
}
},
{
@@ -6568,11 +6570,11 @@
"repo": "bazelbuild/emacs-bazel-mode",
"unstable": {
"version": [
- 20221105,
- 2049
+ 20230417,
+ 1342
],
- "commit": "68d58547dd1df92adc91715f97c3dcd125b00810",
- "sha256": "1khb0mrhfajr5dv93867mlr7k0csc8f4w12wp5f2rfdxfr9fgi61"
+ "commit": "4f084ed7988a6d178e0659e16ae0ce60ba3c7ea7",
+ "sha256": "14fzxvqz61qmpm0w9gpvd7wp59p28kp3zy26ggb6nl179z1hak3y"
}
},
{
@@ -8140,14 +8142,14 @@
"repo": "kyleam/bog",
"unstable": {
"version": [
- 20201030,
- 357
+ 20230411,
+ 644
],
"deps": [
"cl-lib"
],
- "commit": "af929c164c4ffaee0c33ba97c06733f0ce9431d4",
- "sha256": "0qq3a48650brpif3j8kwg9lm2bk5izv1bm9ff1mk7x0anjkcv1hy"
+ "commit": "006fe4d345b70a896213322871ccf08073b14c85",
+ "sha256": "0i5rsg1m2jvzjjmbjvm2wapd0i7c0s4j7c8p6sdqa8035jzi17sv"
},
"stable": {
"version": [
@@ -8313,16 +8315,16 @@
"repo": "jyp/boon",
"unstable": {
"version": [
- 20230304,
- 1502
+ 20230410,
+ 1115
],
"deps": [
"dash",
"expand-region",
"multiple-cursors"
],
- "commit": "1e85d6a11a756519dd4632b1bb2029a1e9c61f5a",
- "sha256": "1dkhlmx567c1qys6c2bi18aqj0iqikhicb3phkjhwri340rkr40x"
+ "commit": "9b4260fbab2d3cc6f58a5c1360a235a03de4f0e1",
+ "sha256": "11k9ij15v58pf0as3qn2lg1hyblawj0gapvmp1vnk5w37x8958k5"
},
"stable": {
"version": [
@@ -8506,11 +8508,22 @@
"repo": "museoa/bqn-mode",
"unstable": {
"version": [
- 20230326,
- 2100
+ 20230421,
+ 1553
],
- "commit": "eb39528fd8023fbe541918baf4ac64320d39b97a",
- "sha256": "0p2c8ylfaknbjzdxm6brqicasxbcv5za6vxpri7z7n2dg9plim3z"
+ "commit": "54fa67ac172f220d61773b2d2257fadf098454d7",
+ "sha256": "1n14wdhb4pbrm7b9nw7mcyfqizm0p1iab7s7bx0bz4cfs3agvpq0"
+ },
+ "stable": {
+ "version": [
+ 2023,
+ -4,
+ 4,
+ -4,
+ 21
+ ],
+ "commit": "5ce39f697a4ea8c3c2b00003c477f3d2fa2739ea",
+ "sha256": "0hqs096x28jiax99ns5d9gkplqmhv0zi2829fmix36bjgl9005h8"
}
},
{
@@ -8578,11 +8591,11 @@
"repo": "Michael-Allan/Breccia.Emacs",
"unstable": {
"version": [
- 20230322,
- 1406
+ 20230406,
+ 1547
],
- "commit": "41a83edda400c34857aca5e91b651f2dfb0b8009",
- "sha256": "0i7zr352sdzwcmm1kw045iy7lwid9yrzadabq6n2s5xjkhx47906"
+ "commit": "a1d519bd592d34c05f3fbaa2c209249969823fb6",
+ "sha256": "0rphi8dai5hdjbkdi0a0rhnlm6a2rw03mqvs8s3m50hssisl9mmm"
}
},
{
@@ -9518,19 +9531,19 @@
"repo": "jorgenschaefer/emacs-buttercup",
"unstable": {
"version": [
- 20230309,
- 2206
+ 20230418,
+ 819
],
- "commit": "c6693d3667a71e88f459002fecf61df74d9e18ac",
- "sha256": "1zr1jlfwr8yp9168yvkrhif1mr1r40fr1j1v1iv11ryn2zjcm9yn"
+ "commit": "30c703d215b075aaede936a2c424f65b5f7b6391",
+ "sha256": "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh"
},
"stable": {
"version": [
1,
- 30
+ 31
],
- "commit": "c6693d3667a71e88f459002fecf61df74d9e18ac",
- "sha256": "1zr1jlfwr8yp9168yvkrhif1mr1r40fr1j1v1iv11ryn2zjcm9yn"
+ "commit": "30c703d215b075aaede936a2c424f65b5f7b6391",
+ "sha256": "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh"
}
},
{
@@ -10215,25 +10228,25 @@
"repo": "minad/cape",
"unstable": {
"version": [
- 20230326,
- 1643
+ 20230417,
+ 1825
],
"deps": [
"compat"
],
- "commit": "f953ea80f1a7ee628064a8478d94383f2763c262",
- "sha256": "0m98yd8pwaqdwjjhqh207iz9wbybny5pk1n5hksfrdw7jpclrn3v"
+ "commit": "db3059af52718c7f55485ef183bdad3e40f58df9",
+ "sha256": "1aivq3v00l17lmq7fmdzhc6lczi9ky2wl0ayab13vkdcidl5j1kd"
},
"stable": {
"version": [
0,
- 13
+ 15
],
"deps": [
"compat"
],
- "commit": "3e796a862d42743d33cd56fca041b6f2194db095",
- "sha256": "0nvmqfp9rv2mrisyvwfr285yww22c6wb5by3s25c83ay2ivpi8ya"
+ "commit": "db3059af52718c7f55485ef183bdad3e40f58df9",
+ "sha256": "1aivq3v00l17lmq7fmdzhc6lczi9ky2wl0ayab13vkdcidl5j1kd"
}
},
{
@@ -10254,10 +10267,10 @@
"version": [
0,
10,
- 3
+ 4
],
- "commit": "a16468f296a9584f4068072efecdee8a9eb9c2ed",
- "sha256": "0nj0s1n7a98kn1597lskv32piba6cy5ifgw102y52mphl0h55c22"
+ "commit": "a91ec65323c2577732224d0cf6f5bf1e79d3a724",
+ "sha256": "0zz1w35fbldwd9b6sgr9759jh4v8cyfia6vvicyqqq5jbjfk36z3"
}
},
{
@@ -10392,11 +10405,11 @@
"repo": "peterstuart/cargo-transient",
"unstable": {
"version": [
- 20230120,
- 1431
+ 20230421,
+ 1252
],
- "commit": "f0295aee41404ffb2e8532948becf78d405e4ee9",
- "sha256": "1x1nkcsc41niljpm9mf84r1lyiavy3nybpgzglhw8f7xwvr7b6x5"
+ "commit": "30ed1c8abcfd949cf2620c73061ef741ee0ada3d",
+ "sha256": "14910mcs7vy90fmkqxq3m8biqas6npbrilig4575q3hfx3s6ciif"
}
},
{
@@ -10592,11 +10605,11 @@
"repo": "catppuccin/emacs",
"unstable": {
"version": [
- 20230401,
- 622
+ 20230418,
+ 948
],
- "commit": "fa9e421b5e041217d4841bea27384faa194deff6",
- "sha256": "026h50xh18ypgd3ixmm9v1z0p3hsbs5z5wpiqawszd5f4vmxhjxd"
+ "commit": "0327e59a8b027cd326ee881f56e9c2f8d93d3437",
+ "sha256": "1p8b731mbqd499vdq4096mdvcfjc504y49y72wsqjg7vhrqshwm3"
},
"stable": {
"version": [
@@ -10609,6 +10622,21 @@
"sha256": "1dzfashhjig06m9zs4w2ns64h3hzck93p4ddfwnr9zaxz0gmkp4s"
}
},
+ {
+ "ename": "cats",
+ "commit": "0b4c6aba65bc533303c6f4d820bde38fbad85de6",
+ "sha256": "0ikpagxdmmsl9g5mr2gl8y8pv7vh9kvbj5jr61hpi3l7za94j8gl",
+ "fetcher": "github",
+ "repo": "Fuco1/emacs-cats",
+ "unstable": {
+ "version": [
+ 20230407,
+ 1316
+ ],
+ "commit": "7fc70db0eeb2c33ffba5c13c4cdc0f31c7b95537",
+ "sha256": "1h23nkl6mjdisw8grb635j0wq0imqd3gw5rpnf6r6ayw59b9gz6a"
+ }
+ },
{
"ename": "cbm",
"commit": "f28dbc97dc23cdb0b4c74f8805775c787635871e",
@@ -10740,11 +10768,11 @@
"repo": "cdominik/cdlatex",
"unstable": {
"version": [
- 20220829,
- 1533
+ 20230411,
+ 748
],
- "commit": "ac024ce29318cab812a743ad132a531c855c27a5",
- "sha256": "12ccd724fl5p2kbflkkcd0xa2241ay4hjmgnbwm893d2psl8wgws"
+ "commit": "692142603c6229e5aa5c8285eb797e401cef9ac3",
+ "sha256": "1avdm5pgsbhp796mq0nxm175r26gxxfrpmqhrzbnnd10zjbgrrpz"
},
"stable": {
"version": [
@@ -10972,20 +11000,20 @@
"repo": "nbarrientos/cern-ldap.el",
"unstable": {
"version": [
- 20230325,
- 843
+ 20230418,
+ 1249
],
- "commit": "ebb546221eed36616669ea4e42d35aa8b167202c",
- "sha256": "1mkms3ykkp2lzmm2j8ain6db93yha62vk6vs2ngl1a6xdcr9xvdl"
+ "commit": "7a2dfa4c5ec9d05ec0c4e90caedae8508a96196c",
+ "sha256": "1n6v8mii8j625fp4kp7iwvlgvlnw0f9mvicrqfh3smg5008mq49a"
},
"stable": {
"version": [
0,
0,
- 3
+ 4
],
- "commit": "4add5e1b9a713bba351922780cad84ff64fef6a5",
- "sha256": "1lyaz1psq6gq9zbsck25khsymmzmrj3asqz268fjxdjxqgkchqsh"
+ "commit": "ebb546221eed36616669ea4e42d35aa8b167202c",
+ "sha256": "1mkms3ykkp2lzmm2j8ain6db93yha62vk6vs2ngl1a6xdcr9xvdl"
}
},
{
@@ -11717,11 +11745,11 @@
"repo": "galdor/chroma",
"unstable": {
"version": [
- 20230327,
- 1634
+ 20230417,
+ 1705
],
- "commit": "ace854e577a126f830443de89f617e5ff4b4cfce",
- "sha256": "0k68jmk9sqs0dywmp3sn8kgxsvbqnqhgxqrs21apy2yps7dpr0i7"
+ "commit": "6d5fb9f28cb171e083a3a529e26a3c1426accc74",
+ "sha256": "1s2hd2zfc1f5zpvg26w5yhdk7x95v3cj9llhpiliq4g2hfg0wwxi"
},
"stable": {
"version": [
@@ -11919,8 +11947,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20230323,
- 709
+ 20230413,
+ 743
],
"deps": [
"clojure-mode",
@@ -11930,8 +11958,8 @@
"sesman",
"spinner"
],
- "commit": "f39e0b52014913f5acc1dc28ad94c68385c0834e",
- "sha256": "0jqjgygdvny1vhjbx7k0l492fhamwndsjcbb2mccwp9j47k4qar9"
+ "commit": "969a66a14df4c6356be91b01cff1a7e585a967c5",
+ "sha256": "0shxd5d3piw9gnzvabbrx59h9lslzjrymb3fhw56sb7bjvbdpr85"
},
"stable": {
"version": [
@@ -12263,16 +12291,16 @@
"repo": "pprevos/citar-denote",
"unstable": {
"version": [
- 20230322,
- 844
+ 20230403,
+ 1038
],
"deps": [
"citar",
"dash",
"denote"
],
- "commit": "8b741f7b29d95cc98dcbec5afdcb88fd14a537fd",
- "sha256": "1b697ki2jgm15c72p4w7hyzwvrk48x3l9w7mwn6071jnxniq0mk4"
+ "commit": "327c7f386e8660c63b48568d23315cbebf95d151",
+ "sha256": "19ifw6vp0jwlwblps0240hzghniqqvnnha562y35mybmibwnv87i"
},
"stable": {
"version": [
@@ -12328,28 +12356,28 @@
"repo": "emacs-citar/citar-org-roam",
"unstable": {
"version": [
- 20230330,
- 1401
+ 20230404,
+ 1225
],
"deps": [
"citar",
"org-roam"
],
- "commit": "509239241036043957cb673d780bde3542285e65",
- "sha256": "0iv0yf91lid2wi6gl2yjcg0inad0kp0zfh4xipmprsiy8wjm537a"
+ "commit": "761eed66782fdbb6d65749098caa42ba43e8441d",
+ "sha256": "0iwhwfllbcd938qkvh5m5cn6s8pn01xb02yjbv1hl4jpiayianqa"
},
"stable": {
"version": [
0,
5,
- 0
+ 1
],
"deps": [
"citar",
"org-roam"
],
- "commit": "451f004a96058f37608bfbe97496293bb19ef845",
- "sha256": "0h1lrx5fg51qpyxh3lrb7x392a5rr8q5a7dihscfzhr38ba1pfh6"
+ "commit": "761eed66782fdbb6d65749098caa42ba43e8441d",
+ "sha256": "0iwhwfllbcd938qkvh5m5cn6s8pn01xb02yjbv1hl4jpiayianqa"
}
},
{
@@ -12562,6 +12590,24 @@
"sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl"
}
},
+ {
+ "ename": "clause",
+ "commit": "668db1dd1695ce8a864a4fc5f5e9daca2770da0f",
+ "sha256": "0ag09asq10ln2m0qznn5vnx5y7nv48lh7bwgwd30yjwp8ldw7v84",
+ "fetcher": "codeberg",
+ "repo": "martianh/clause.el",
+ "unstable": {
+ "version": [
+ 20230405,
+ 1235
+ ],
+ "deps": [
+ "mark-thing-at"
+ ],
+ "commit": "0ea166fa218618c1b80b60c995f927310c25b02a",
+ "sha256": "0v5xf51f1imricf9rn9f3iwz37cljk3iwq50dad1wzm1pamggzw1"
+ }
+ },
{
"ename": "clean-aindent-mode",
"commit": "ee9dac7c10e652f026643620418dfea9237a0d23",
@@ -12833,14 +12879,14 @@
"repo": "jpe90/emacs-clj-deps-new",
"unstable": {
"version": [
- 20221007,
- 1014
+ 20230413,
+ 1833
],
"deps": [
"transient"
],
- "commit": "e1cf65eb040f5a2e9a3eca970044ba71cc53fb27",
- "sha256": "03db3l5klc20wgdaj44scgjfi2mha85bip07ls6pwbi039ls7rvx"
+ "commit": "72f25d86bbd9cd6cb4aa431e70bda38f35b19262",
+ "sha256": "0sakkm3wqfwvn0d6d25szsa078smr751wvc90n0px0pghcl07ka8"
}
},
{
@@ -13331,15 +13377,15 @@
"repo": "magit/closql",
"unstable": {
"version": [
- 20230224,
- 1619
+ 20230407,
+ 2158
],
"deps": [
"compat",
"emacsql"
],
- "commit": "0a7226331ff1f96142199915c0ac7940bac4afdd",
- "sha256": "1769a96nkfxlczx4sbzqab1xnn2540mwbwrcrcaxq72h3akrciq8"
+ "commit": "c3b34a6ec438d2e73309eed7bda26768b9a50335",
+ "sha256": "14ljfx8zibxd634xbqavpydwwb7nr44lmghyfyiq43f80j5v0rx1"
},
"stable": {
"version": [
@@ -13524,20 +13570,20 @@
"url": "https://gitlab.kitware.com/cmake/cmake.git",
"unstable": {
"version": [
- 20230329,
- 1819
+ 20230404,
+ 1329
],
- "commit": "bef6a27531dc7ce2da8c89a2182cf6ac54c7886a",
- "sha256": "1is3vlycpxlyc0f3hj1g5cpfq960m10vc824mvqpnkqp2kipvsbq"
+ "commit": "9831bb160ac94a92ce3f3a4ebea0948971f62f98",
+ "sha256": "1ydarkcip148jxpfvabfxncka758qflrgib0ipshxmjynjgl9nm7"
},
"stable": {
"version": [
3,
26,
- 2
+ 3
],
- "commit": "bef6a27531dc7ce2da8c89a2182cf6ac54c7886a",
- "sha256": "1is3vlycpxlyc0f3hj1g5cpfq960m10vc824mvqpnkqp2kipvsbq"
+ "commit": "624461526f4707a2406ebbd40245a605b6bd41fa",
+ "sha256": "0l1x2skvrsbn32hw5m7ziby6xbhc31ppp90maclsv5b5jbz2jl5n"
}
},
{
@@ -13605,20 +13651,20 @@
"repo": "tumashu/cnfonts",
"unstable": {
"version": [
- 20230228,
- 631
+ 20230412,
+ 132
],
- "commit": "ca8ea16ac3a6faec4ff4cd20514e7d2cffdd70a2",
- "sha256": "1xxdwvphz2nk08k92g0xaxj0g77hj2b3myp13gw129np7czpdr3d"
+ "commit": "5115f53366bd6118dce3673ddec5ff428534ce67",
+ "sha256": "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv"
},
"stable": {
"version": [
1,
1,
- 0
+ 1
],
- "commit": "f42f417e84af020e6dfd51ebb4b1c605001b96b6",
- "sha256": "156qj5dkipa5a3f3scldf1mcfvmp1g199ds2wyi6jk5gqfv73zsd"
+ "commit": "5115f53366bd6118dce3673ddec5ff428534ce67",
+ "sha256": "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv"
}
},
{
@@ -13696,6 +13742,27 @@
"sha256": "072d5vldjfg9mj4a86bw8xmxl3hmywsnx4f2k6nayqy4whry5fmq"
}
},
+ {
+ "ename": "code-compass",
+ "commit": "8c7b3fb6e3a312d582e15eb8203cb7e90dc8a39c",
+ "sha256": "1pm4fmbyxc9qaadz93iapixciaxzwyrrmrxnnb67xjvfp5psvl7h",
+ "fetcher": "github",
+ "repo": "ag91/code-compass",
+ "unstable": {
+ "version": [
+ 20230411,
+ 1032
+ ],
+ "deps": [
+ "async",
+ "dash",
+ "s",
+ "simple-httpd"
+ ],
+ "commit": "ffd26ff116d18c4459eb491824553668ba1227b3",
+ "sha256": "1gkvl1dd8ahspyjn50hh2klgy8b9vcv55m7fsrsmknqfdjs0559g"
+ }
+ },
{
"ename": "code-library",
"commit": "197bdc508c4fd9712125553a108ca6c9fedcaefc",
@@ -13961,14 +14028,14 @@
"repo": "ankurdave/color-identifiers-mode",
"unstable": {
"version": [
- 20230302,
- 226
+ 20230405,
+ 527
],
"deps": [
"dash"
],
- "commit": "1bc474bdbb1086a73638effde51f37a9da748173",
- "sha256": "113nnfi8jdxp7a8m7jjsn0ww2fqymk2ai4nzfdxzdfsk0q0bp49y"
+ "commit": "c4060d1bca6fa2acfe449e086171d4efee62863f",
+ "sha256": "1b5zn42gl08v39xcym09ihwfi7zfgzgjsv1ndvfqv0av1kb9xwrj"
},
"stable": {
"version": [
@@ -14548,11 +14615,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20230303,
- 2331
+ 20230416,
+ 2034
],
- "commit": "83c408b187b957f5939ee814de68d46993247d4f",
- "sha256": "1h2k8vq1sv75ga17i4lr1iiq9g3csjg65fbqqna4scv7vhkqkbw1"
+ "commit": "8a78f320019574bc35b5727f95b052b27918da20",
+ "sha256": "1rmxcv5nfvp6j26zcv5fb563mzwf205s5417yqmfyc44v8j905i7"
},
"stable": {
"version": [
@@ -15102,17 +15169,16 @@
"repo": "jcs-elpa/company-fuzzy",
"unstable": {
"version": [
- 20221231,
- 1708
+ 20230416,
+ 2129
],
"deps": [
"company",
"ht",
- "list-utils",
"s"
],
- "commit": "eff3b5429d7e8d0eb2d62fb352ae843fe1a99ac2",
- "sha256": "05f2lfn5ivg3pp1avllfy8z5j6q7i9mb143p5299kqwlfk83fcq2"
+ "commit": "049ba8ff49a86f3657522801d8d142dda1626b19",
+ "sha256": "0q2am6d0bb00bb3ywql1mfnnkszkzdhyr5ia0yssvs6xzszf16h8"
},
"stable": {
"version": [
@@ -16766,25 +16832,25 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20230330,
- 1104
+ 20230421,
+ 837
],
"deps": [
"compat"
],
- "commit": "16ec34dd12a734b231bcc0fa03a1ab40a86def93",
- "sha256": "0cg8r7ynf44qcinax5hrchmphi5s6ghp6dnvmmfif0xlfgn93pxi"
+ "commit": "ada407fa9a815b1bfd45cba31c62bca5f45db1fc",
+ "sha256": "0kcb5rwn0drfncan6jhapr3plg0ncsawaf6p0pykkg2mjw0jgjkp"
},
"stable": {
"version": [
0,
- 33
+ 34
],
"deps": [
"compat"
],
- "commit": "fd00979d2fbfad66960c621e9fc140eb8c6a06f3",
- "sha256": "116b1fi5wp48wbh0srfl999f08bcz10nxgrb7sliy9r4igqqmvd6"
+ "commit": "38af775c837ab09d9d2a77059386eb09c4254a4e",
+ "sha256": "1ggbvc5ylsw430w05fjl4vk1hmim45mwah7cyr94g03rwjhng1sc"
}
},
{
@@ -16854,15 +16920,15 @@
"repo": "mohkale/consult-company",
"unstable": {
"version": [
- 20220830,
- 1834
+ 20230403,
+ 1911
],
"deps": [
"company",
"consult"
],
- "commit": "5d8275bff131ce2aaa678dd46aac345eb4fc8b27",
- "sha256": "0rg5n4yilkm5c137xv5pnk0f24rci00yxgs8xa08vispmzrx3lyd"
+ "commit": "24559103a77210c0178b95a842ad13b555be3d43",
+ "sha256": "0dnfpavfmx96zkjfi1qc87cd3vy52n3wi2jhdgm8nmfbsakjdih4"
}
},
{
@@ -16957,15 +17023,15 @@
"repo": "minad/consult-flycheck",
"unstable": {
"version": [
- 20230212,
- 26
+ 20230411,
+ 445
],
"deps": [
"consult",
"flycheck"
],
- "commit": "c371996c571b7139ef4d9a8db142bf37a7ee826b",
- "sha256": "0i8ihvj64vdgf4lrna09nys65srpg87fg3y45qpg89g6962m0wr8"
+ "commit": "fda630411ad9219f45136310f671b44eaefafcab",
+ "sha256": "0wq8qsdiq6m83pfa0jzxxb0rp81y867w0yjh6nxyjlhs56qv4206"
},
"stable": {
"version": [
@@ -17139,16 +17205,16 @@
"repo": "mclear-tools/consult-notes",
"unstable": {
"version": [
- 20230401,
- 1922
+ 20230419,
+ 357
],
"deps": [
"consult",
"dash",
"s"
],
- "commit": "941325a3484782017c27e3ffe5ddb3b9151b8740",
- "sha256": "100v7bvj2hwln0jfvwfmi6rlx69x1m06k0f2yxg7w3s79jjlspy7"
+ "commit": "4fce058f668945a0a532c49d585be763fa29deda",
+ "sha256": "12v8sj72krjff8cdqv98h1p4d27vng05h314wvmcxf8sgdxr334r"
}
},
{
@@ -17490,30 +17556,26 @@
"repo": "emacs-php/emacs-auto-deployment",
"unstable": {
"version": [
- 20200616,
- 518
+ 20230402,
+ 1829
],
"deps": [
- "cl-lib",
- "f",
- "s"
+ "compat"
],
- "commit": "811c8fe638c5616b6471525421e61a4470be3b52",
- "sha256": "0j205ky9djlzhgrgjw4562lz2gnpi48las66w7ll8z20zkk4ylnm"
+ "commit": "370b1586feb2690d3c72185bd4f17c31ce03673a",
+ "sha256": "0zidyfvjzi5ymbi4cfkqkvrhnf4c7nmxfy9qwqs0bz36l4adla5x"
},
"stable": {
"version": [
0,
- 0,
- 5
+ 1,
+ 0
],
"deps": [
- "cl-lib",
- "f",
- "s"
+ "compat"
],
- "commit": "5af6d5fcc35ddf9050eada96fd5f334bf0661b62",
- "sha256": "1q9liby1dmwwmg2jz13gx2ld47bpcqb9c7vx4qgky75wb5c2q1xz"
+ "commit": "370b1586feb2690d3c72185bd4f17c31ce03673a",
+ "sha256": "0zidyfvjzi5ymbi4cfkqkvrhnf4c7nmxfy9qwqs0bz36l4adla5x"
}
},
{
@@ -17707,28 +17769,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20230327,
- 1216
+ 20230410,
+ 1815
],
"deps": [
"ivy",
"swiper"
],
- "commit": "8df9516ae6d2e86ec6104b6783ad380fa3945dec",
- "sha256": "0s0cx5lsaz6c9qz2dpgb7fflh6ziv729mv9njcrfp5fp5f4fwpk2"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
},
"stable": {
"version": [
0,
- 13,
- 4
+ 14,
+ 0
],
"deps": [
"ivy",
"swiper"
],
- "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
- "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
}
},
{
@@ -17911,16 +17973,16 @@
"repo": "tyler-dodge/counsel-edit-mode",
"unstable": {
"version": [
- 20210824,
- 1504
+ 20230411,
+ 1740
],
"deps": [
"counsel",
"ht",
"s"
],
- "commit": "00ee3fd5cb88021fc4a58b038407e21398607c3c",
- "sha256": "0bcln83whxh1ykxqj351diwhzxsfp838ny10ibl8bs7vmj83s687"
+ "commit": "8ff508a864d0fe4cac32c6868420df2ad77f041b",
+ "sha256": "17g2hpcp8aybmxk04gsp32jqhwp2mab5bwp0xlqdq76v2qp1c4x4"
},
"stable": {
"version": [
@@ -19085,15 +19147,15 @@
"repo": "neeasade/ct.el",
"unstable": {
"version": [
- 20220610,
- 1146
+ 20230410,
+ 233
],
"deps": [
"dash",
"hsluv"
],
- "commit": "dd883e2315aba099e32fba9f1039437551b96ef3",
- "sha256": "0qky9zjp0hy1335brkr16sifcjgy2w7nmffiqf5i501kkjy3z53c"
+ "commit": "86fe88af88b4accef559e8ae6e2bf2400e68a5ee",
+ "sha256": "1skw61ifs1w5xrrlw7bsxffhlgzlmmviw530vc7j8a29njhj41gy"
}
},
{
@@ -20041,9 +20103,9 @@
},
{
"ename": "darkman",
- "commit": "4f44720c122daf7e5dafb74effeb690b00b8167f",
- "sha256": "0vg7bg06y7hxrxmcf3qkzglpbl4pddczmw9n90gv7pzd21wj3mh4",
- "fetcher": "github",
+ "commit": "1f7eb81678da7452682ce060754fc18bfdf58f03",
+ "sha256": "11f2sc4qr5ww8lxiwjk1rxx9y8iq4fzx25vjvlj8q97h0fnp5m9l",
+ "fetcher": "sourcehut",
"repo": "grtcdr/darkman.el",
"unstable": {
"version": [
@@ -20191,11 +20253,11 @@
"repo": "magnars/dash.el",
"unstable": {
"version": [
- 20230304,
- 2223
+ 20230415,
+ 2324
],
- "commit": "bdf4a5d868618532d34c7b5bae6ac382c3b58f67",
- "sha256": "1sdl55xwbbzmrc4c1ql4d7zihhrrlfpkwhlc2pc0gyc9ni4fsc3q"
+ "commit": "b6eef1a24dfbe57ba72d5eb1613fc05ff92e8e92",
+ "sha256": "0nszzq37iqycyf3x81bg13pw4pvar81ga328q90f32x43k9bhkla"
},
"stable": {
"version": [
@@ -20692,16 +20754,16 @@
"repo": "Wilfred/deadgrep",
"unstable": {
"version": [
- 20230310,
- 1634
+ 20230412,
+ 1859
],
"deps": [
"dash",
"s",
"spinner"
],
- "commit": "aed448bf4c8bdf94564b775aac2429be6ed028b9",
- "sha256": "0bg30xnf4h8wm7fnzhr25qb8dcndax55a6jc0nyz07gj6956mvsm"
+ "commit": "f65a20d5c3d42aa649314f13976bc18020a9fc2a",
+ "sha256": "134nc1h029w8b9h5bnqlq5hv8d3cgpz9j75jd9bwx52s5x6y1li3"
},
"stable": {
"version": [
@@ -21290,11 +21352,11 @@
"repo": "DamienCassou/desktop-environment",
"unstable": {
"version": [
- 20230118,
- 820
+ 20230403,
+ 1823
],
- "commit": "3b1fe3816ffaef16d210939dc74bd19e0024ff64",
- "sha256": "06zkgm638gy3cpp5b40cjvws09lkyqdsqxjpj2yscdrmw45r623h"
+ "commit": "530035e567a95830f1a8b265e026b76d163c7367",
+ "sha256": "07bxbyfizglfrmx05jpdsp2625qpjqp7nfyrjdsn5f8kr3ajwd6h"
},
"stable": {
"version": [
@@ -21646,14 +21708,14 @@
"repo": "dgutov/diff-hl",
"unstable": {
"version": [
- 20230218,
- 2323
+ 20230416,
+ 140
],
"deps": [
"cl-lib"
],
- "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5",
- "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s"
+ "commit": "ee1c899351f175a8d774c4aeeb1c834682a98037",
+ "sha256": "1dr1czcxpvnkx6s9bx2f9b0f88a76f0z3xhq4pjy3n0yplp524zd"
},
"stable": {
"version": [
@@ -22378,6 +22440,30 @@
"sha256": "04jlaxrqfx5k9pra6iv6fb1zw6jrdck9nn25imxj5643z7dl248r"
}
},
+ {
+ "ename": "dired-gitignore",
+ "commit": "568355d42b9ad3c8aaf142b0d9b9aa77d3c9d54b",
+ "sha256": "0ka3vl9n3spxnjk06xhvlbzcrkpvr8ahb7bw084v0ccqhsv0al1b",
+ "fetcher": "github",
+ "repo": "johannes-mueller/dired-gitignore.el",
+ "unstable": {
+ "version": [
+ 20230419,
+ 1730
+ ],
+ "commit": "3069757356f1b18a4cdf0ea03cc8578731dd61c0",
+ "sha256": "1gdm7cfxhy4k20rpyag50y9l3s86pnncgm46736iavwxqjmszr9x"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 1,
+ 0
+ ],
+ "commit": "b72b65cba49d29586a67a620e533ea6572c667db",
+ "sha256": "11xzmgd42sry9hj22fhr8zwvx91j2an3dga5zyi4vmq8a3dxawdg"
+ }
+ },
{
"ename": "dired-hacks-utils",
"commit": "568e524b7bdf91b31655bdbb30fe9481d7a0ffbf",
@@ -24234,28 +24320,28 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20230306,
- 250
+ 20230418,
+ 1545
],
"deps": [
"compat",
"shrink-path"
],
- "commit": "236fa330c631228e9a513dea2f4598a29b7e8444",
- "sha256": "0ng90jbgvf19npkslz2jah4dvy387wfczm2xyv2ja1v9bqbaw78k"
+ "commit": "63eb9d3548c7d4be1774b50cdc2169262dd43100",
+ "sha256": "1z5cqn33v7sjihs05ycz1yzi5wcg90yn3cy09qj9g5g8pjs8qdki"
},
"stable": {
"version": [
3,
- 3,
- 2
+ 4,
+ 0
],
"deps": [
"compat",
"shrink-path"
],
- "commit": "aa0e2ddbaa5703d85a8ffea85979aa9a2db9eeb5",
- "sha256": "1v24hiqs4zbq613vanixgng9cx697di63jpafpmjlsripjfvk1qp"
+ "commit": "63eb9d3548c7d4be1774b50cdc2169262dd43100",
+ "sha256": "1z5cqn33v7sjihs05ycz1yzi5wcg90yn3cy09qj9g5g8pjs8qdki"
}
},
{
@@ -24535,11 +24621,11 @@
"repo": "dracula/emacs",
"unstable": {
"version": [
- 20230118,
- 1201
+ 20230405,
+ 1844
],
- "commit": "be1dd97ef3968bef25b9de89e7dc1251f5aaee10",
- "sha256": "0y8qr8rcsqmlr48z3qn50im1vr6qnpqxa6yxdc349gq552mja2l0"
+ "commit": "54c26402555ab5b8b7cfd8ee2488c57b2fa5d32a",
+ "sha256": "0ksn7z43zvw95na7abg32s8fm6p30z1brrzaxns09hkxkqiwvgly"
},
"stable": {
"version": [
@@ -24777,8 +24863,8 @@
"repo": "dtk01/dtk",
"unstable": {
"version": [
- 20230402,
- 411
+ 20230406,
+ 1321
],
"deps": [
"cl-lib",
@@ -24786,8 +24872,8 @@
"s",
"seq"
],
- "commit": "7a476a22be3fb5a7b61b2e7a123b3d3afc159400",
- "sha256": "189qwnbavy02ra02pwhs7lzk1h797vq4mh7a612p8y6127bfh1g1"
+ "commit": "3fc8f3bb8f39840cc5030aca3e3f5c74346d77f2",
+ "sha256": "078cpwn9815a6b3lm4plzz7qfwlyb41sgs0vi0mjd0g6a67jgcg7"
}
},
{
@@ -24944,20 +25030,22 @@
"repo": "ocaml/dune",
"unstable": {
"version": [
- 20230217,
- 1444
+ 20230402,
+ 1815
],
- "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd",
- "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8"
+ "commit": "e53368337be3c353fd654bdbead322605fc875c5",
+ "sha256": "1x3z9wr1zfncd39ya3bqlfbq54hsv6a1kik8x1snsr6qbsy1an79"
},
"stable": {
"version": [
3,
- 7,
- 0
+ 8,
+ 0,
+ -3,
+ 1
],
- "commit": "d3d628f2eda2278bd2df6e37452d8693f367fcfd",
- "sha256": "07gs70d46fg8dxm2fqwpgl1zi91smj0d9wxa3y3yax0vih5csyb8"
+ "commit": "187886f250818a39839f3dffeade7d341d5a4ca9",
+ "sha256": "1s8v9haa4g06yf7x19csa8hnjfb23gglkv2pznd1bll94kkljnmc"
}
},
{
@@ -25051,11 +25139,11 @@
"repo": "xenodium/dwim-shell-command",
"unstable": {
"version": [
- 20230209,
- 2234
+ 20230419,
+ 1621
],
- "commit": "078fb50b15cd024a9ce252ef69b58794df392be0",
- "sha256": "1f49lhpmlz00pia4cs5i0hsijckc5ya39ibqnxlgmw9warcz1j9i"
+ "commit": "681d259ac4b731d6d4992e47fef4f7cea8e3fb78",
+ "sha256": "07px2s072v0l9zhhsjs18lkhprgwc59y1953s7k0pyinsqhfy1hl"
}
},
{
@@ -26266,14 +26354,14 @@
"repo": "editorconfig/editorconfig-emacs",
"unstable": {
"version": [
- 20230329,
- 118
+ 20230415,
+ 2312
],
"deps": [
"nadvice"
],
- "commit": "cd5799a6b728cfb9995605cdceffb5bf7c97622d",
- "sha256": "0zjpwfhsi9hdcipl7yqlp0yihxafqhg9j5v0w3kfl81nwbzvhp8q"
+ "commit": "541ae8f957a28507f43715a385cfc5e22f9a29f9",
+ "sha256": "0jcs3znj9flp76krdvl2amfb8cxhjhbpiymnkw02q22fs19bvw0v"
},
"stable": {
"version": [
@@ -26881,14 +26969,14 @@
"repo": "ahyatt/ekg",
"unstable": {
"version": [
- 20230304,
- 619
+ 20230413,
+ 32
],
"deps": [
"triples"
],
- "commit": "f19f25279cab76d025f710ce3d373b92f9fad0ca",
- "sha256": "1lmh6f0bnil197lr9pr7rka84b0ja5b42khnvqlzw30gd1b446n6"
+ "commit": "4d86dac060439f5197dbfcaebd18a227bdce5e1d",
+ "sha256": "0l1zvv68q4waqxpqcsadm6wm8sxy51ir4ri21gz228nxnbn13286"
},
"stable": {
"version": [
@@ -27090,11 +27178,11 @@
"repo": "radian-software/el-patch",
"unstable": {
"version": [
- 20230312,
- 851
+ 20230409,
+ 2156
],
- "commit": "c2be85bc1ffdf680a9c796dacb177e4b0cabef6f",
- "sha256": "0iba47aypdpy7wriqx01kk78840662nip5mz81b29h7v4xcl7yly"
+ "commit": "7dfbd374f9de256de03516d777146e7f8aba1cef",
+ "sha256": "06zzl4m4mszyxv7xcyvlv6h5iyz7yg041m324faxyyml10jyfbj4"
},
"stable": {
"version": [
@@ -27445,20 +27533,20 @@
"repo": "casouri/eldoc-box",
"unstable": {
"version": [
- 20230331,
- 1901
+ 20230417,
+ 2019
],
- "commit": "11535ac497344ae79476e8a7e8096d4cbb71319c",
- "sha256": "1l2d9xak2ab3pbxr43fnpswdfzspri9j9m4ghrzhwggqlcv2wvq8"
+ "commit": "6a0b1bd0ade038c5926ea97f966609cba9c852aa",
+ "sha256": "19bkrbk33bzm47sbnp96ncrc472jz3jdrhac35djzqvwlx6ashiv"
},
"stable": {
"version": [
1,
- 9,
+ 10,
1
],
- "commit": "8aa2b6d35a557864ff64762774fd5b4960cbeff0",
- "sha256": "08h42a3mrhcn4qi77fz2s8yz5sbsfcm8vxyc707lhj8cvl8qp9c2"
+ "commit": "143d7c5eff5ded45d1e1b9462c93f2a4e603089e",
+ "sha256": "076bbn2nnrx02zk2hs4b39q0w3s7afbgfdxnwk2y2s8lkq1l6l87"
}
},
{
@@ -27507,15 +27595,15 @@
"url": "https://repo.or.cz/eldoc-overlay.git",
"unstable": {
"version": [
- 20221007,
- 212
+ 20230406,
+ 959
],
"deps": [
"inline-docs",
"quick-peek"
],
- "commit": "5ae9e062295ea2a2855569826b770f3469f73e2f",
- "sha256": "1awxac30162p4vk17jnazf4qz48zz7asfgpcj8ivw8x3njr8crsh"
+ "commit": "14a9e141918c2e18a107920e8631e622c580b3ef",
+ "sha256": "1x5ydhq94cf3amc0fykhq3qdhv81wpj8zf3rcn8ckncj3bhjvcd1"
}
},
{
@@ -27890,15 +27978,15 @@
"repo": "fasheng/elfeed-protocol",
"unstable": {
"version": [
- 20220524,
- 336
+ 20230413,
+ 443
],
"deps": [
"cl-lib",
"elfeed"
],
- "commit": "b813574faefc1ac4825da19b40f620339b6badff",
- "sha256": "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2"
+ "commit": "557841e122fe0dd50ec0bdd3ba4b657e16edb779",
+ "sha256": "0qqp8sjm0r418sbi867az5p3f9v21avz7ggfjqs0j89q02ndhzwd"
},
"stable": {
"version": [
@@ -27922,26 +28010,26 @@
"repo": "sp1ff/elfeed-score",
"unstable": {
"version": [
- 20220702,
- 1548
+ 20230419,
+ 1416
],
"deps": [
"elfeed"
],
- "commit": "ac938fdc617d489eb25f1d8c0bd800bb7693c588",
- "sha256": "0d1yh4wv81n5mnrzdi88z0vbs94m7j3q20r5fc1wk35r4hrl3xqw"
+ "commit": "93c3b467859b57a353e84f0abd2607b64373eaa3",
+ "sha256": "0slbmmcsf5pqbiq3nmna7wx9jvfgdgjp272qdqvmrv99jdj92cq6"
},
"stable": {
"version": [
1,
2,
- 4
+ 5
],
"deps": [
"elfeed"
],
- "commit": "ac938fdc617d489eb25f1d8c0bd800bb7693c588",
- "sha256": "0d1yh4wv81n5mnrzdi88z0vbs94m7j3q20r5fc1wk35r4hrl3xqw"
+ "commit": "93c3b467859b57a353e84f0abd2607b64373eaa3",
+ "sha256": "0slbmmcsf5pqbiq3nmna7wx9jvfgdgjp272qdqvmrv99jdj92cq6"
}
},
{
@@ -28305,15 +28393,15 @@
"repo": "Wilfred/elisp-refs",
"unstable": {
"version": [
- 20230309,
- 1638
+ 20230419,
+ 405
],
"deps": [
"dash",
"s"
],
- "commit": "6973912994ade71a3e13a24425f1cc648d8b94bb",
- "sha256": "0c2vm9dhnp9m5wc26b5hy7gb0xablig0yrjr9avqab9fhg5b0hny"
+ "commit": "bf3cca8f74065b1b31036f461e3a093b162311bd",
+ "sha256": "1wrfxbd45dxjfqf0fx0ij7hlrhxc5wmg7820vxvsvrphdkqxfkpc"
},
"stable": {
"version": [
@@ -28407,14 +28495,14 @@
"repo": "wkirschbaum/elixir-ts-mode",
"unstable": {
"version": [
- 20230321,
- 1458
+ 20230403,
+ 823
],
"deps": [
"heex-ts-mode"
],
- "commit": "0d4ef4794655a2a3c5324e07eef46dc4766ad65d",
- "sha256": "114nc0fa5bl73kd0xlj2gh7xxjv6haj85p15bbw0xgjsxzz3f7jn"
+ "commit": "6671c0ffe0e59d82b99948b08d200bd744cc9d26",
+ "sha256": "01cmapzx87z0vnk8jkbwcw2s3nrichi5rg1dsax1jgswsr38wlv6"
}
},
{
@@ -28843,8 +28931,8 @@
"repo": "jorgenschaefer/elpy",
"unstable": {
"version": [
- 20220922,
- 2253
+ 20230402,
+ 1946
],
"deps": [
"company",
@@ -28853,8 +28941,8 @@
"s",
"yasnippet"
],
- "commit": "ae7919d94659eb26d4146d4c3422c5f4c3610837",
- "sha256": "0hr0wyxh4phlj7fv8qvpmnrcrip4krc0lvb9z392rzg0rajbkp7j"
+ "commit": "840713f23af99b83d04034c3703f7e73c3baa7dc",
+ "sha256": "1crkqy3dyvmqbyzyzl4sknhv34jckvw5lrgr9ryyxicbbhxm20nz"
},
"stable": {
"version": [
@@ -29250,11 +29338,11 @@
"repo": "magit/emacsql",
"unstable": {
"version": [
- 20230228,
- 1040
+ 20230417,
+ 1448
],
- "commit": "415dbfd846f46d921a70a351695f0d0e8f75da35",
- "sha256": "01px4ybaywc4yl3cgry6f6anl8j4wgzr72ii7bqzvhc8yv5ml4g6"
+ "commit": "64012261f65fcdd7ea137d1973ef051af1dced42",
+ "sha256": "1x9r0pg2dv6n8dn1lwrvs9xfkxskr5pgw0sigspfqj3ycbpyz1ks"
},
"stable": {
"version": [
@@ -29396,14 +29484,14 @@
"repo": "magit/emacsql",
"unstable": {
"version": [
- 20230224,
- 1201
+ 20230409,
+ 1847
],
"deps": [
"emacsql"
],
- "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459",
- "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l"
+ "commit": "f25de357fee74aae7a538e8eae3d9be5eb55c20e",
+ "sha256": "1ff2qmgaxg3pfnb7avbbnqsmy3bl7spvx0g4dcdbmnlxvc2f0d5n"
}
},
{
@@ -29414,15 +29502,15 @@
"repo": "magit/emacsql",
"unstable": {
"version": [
- 20230224,
- 1201
+ 20230409,
+ 1847
],
"deps": [
"emacsql",
"sqlite3"
],
- "commit": "7c533fb6c27c3a10b6ab05bddf663e37c109e459",
- "sha256": "1jmcxj8hx7900pfg7hlpdfln3higvfl7as931ry5zb2wla5wc76l"
+ "commit": "f25de357fee74aae7a538e8eae3d9be5eb55c20e",
+ "sha256": "1ff2qmgaxg3pfnb7avbbnqsmy3bl7spvx0g4dcdbmnlxvc2f0d5n"
}
},
{
@@ -29529,14 +29617,14 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20230328,
- 1813
+ 20230420,
+ 1929
],
"deps": [
"compat"
],
- "commit": "846b3fd311d06dd0f9aa20f133907ae10855c9ae",
- "sha256": "18kyh2pfzyvy3nx60wln255x1qqbncr4hlnjq7fd82aklghcdjc6"
+ "commit": "c914efe881df2bc6a2bd35cc7ee975d3e9d4a418",
+ "sha256": "1l288w27wav0r71hprqi74r77042d1fx3p1zmi05vl6z6230h48b"
},
"stable": {
"version": [
@@ -29734,8 +29822,20 @@
"url": "https://git.savannah.gnu.org/git/emms.git",
"unstable": {
"version": [
- 20230329,
- 2020
+ 20230421,
+ 1501
+ ],
+ "deps": [
+ "cl-lib",
+ "nadvice",
+ "seq"
+ ],
+ "commit": "ff7221a367d326d023db523c2602969206d6027a",
+ "sha256": "1bjgh035yq3g6hnm2mh45k4x170a4bmz6lc635chigckbfncqh67"
+ },
+ "stable": {
+ "version": [
+ 15
],
"deps": [
"cl-lib",
@@ -29744,18 +29844,6 @@
],
"commit": "0f4bd0c551b6ec1debfa834464f28030ce9c287b",
"sha256": "1mlvpfm3phmcfna1jnmpjw3q0dxa6ah1dwbarjmgqq15rrjs1841"
- },
- "stable": {
- "version": [
- 14
- ],
- "deps": [
- "cl-lib",
- "nadvice",
- "seq"
- ],
- "commit": "ecd49294fdec8c7741a342acaf89cd408f0abf13",
- "sha256": "08wlrylv486pr8jyc3837qhlxck2hrjrywmlacmhshgha4w8sdxc"
}
},
{
@@ -30130,14 +30218,14 @@
"repo": "isamert/empv.el",
"unstable": {
"version": [
- 20230330,
- 1856
+ 20230409,
+ 2130
],
"deps": [
"s"
],
- "commit": "530a37cc0eafe13053c7ba02c3b0c3fb6b3b5a1b",
- "sha256": "1k5siakgglpsfqdismm0hida32h91f14kgxs17g2jq9bvnqgg8wj"
+ "commit": "af7def9dbb0156b2ec4e75c71ca29792b112768f",
+ "sha256": "1k1bsy2wjwrmcs60gbx0aprl5fr2v4sibm5djpfw2mjn1b4k5fpv"
},
"stable": {
"version": [
@@ -30390,6 +30478,40 @@
"sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5"
}
},
+ {
+ "ename": "environ",
+ "commit": "c12d6b141d8fba94d5e28f2947feb11b811d63b6",
+ "sha256": "0cndqj1blcrvc8dsv384mzsz459dqsqhc1li6vxgwqcbwlh4jcsv",
+ "fetcher": "github",
+ "repo": "cfclrk/environ",
+ "unstable": {
+ "version": [
+ 20230409,
+ 2033
+ ],
+ "deps": [
+ "dash",
+ "f",
+ "s"
+ ],
+ "commit": "8d48e206f72471c376bc874e1583661f651bccaa",
+ "sha256": "1hwl14p1x6s1dhf8wc512qq8kw8mh597sr6y8kniiykd7pifiqg2"
+ },
+ "stable": {
+ "version": [
+ 0,
+ 0,
+ 1
+ ],
+ "deps": [
+ "dash",
+ "f",
+ "s"
+ ],
+ "commit": "03e367b8887713be2662ede872bb9bb300bd7bbb",
+ "sha256": "0yc52a4agdmdifpn9xz5zcqy1cixxzp3akz2xh77n06dn5wx9b2c"
+ }
+ },
{
"ename": "envrc",
"commit": "f66883b0d6a49decde7d438d9d4bdfa107a3554e",
@@ -30411,14 +30533,14 @@
"stable": {
"version": [
0,
- 4
+ 5
],
"deps": [
"inheritenv",
"seq"
],
- "commit": "8a9a142cf9d35e62a70d9d100a946f78fe0b066a",
- "sha256": "0nqqx4qlw75lmbn0v927sg3xyjkk86ihw1q3rdbbn59va41grds4"
+ "commit": "1954e8c0b5c8440ea9852eeb7c046a677fa544f6",
+ "sha256": "0vjk8k5k9xsngk50nf611c4j0bikqn9l1y3m35s8y3knwqw22ii0"
}
},
{
@@ -30543,8 +30665,8 @@
"repo": "emacscollective/epkg",
"unstable": {
"version": [
- 20230312,
- 1644
+ 20230410,
+ 1928
],
"deps": [
"closql",
@@ -30552,8 +30674,8 @@
"emacsql",
"llama"
],
- "commit": "e2021f6cff73902bec79b19c492ea2c5930cdc50",
- "sha256": "0g1bfi9gr9zxj75bbdm82bzbfax1xv7za67qp9pbwsdgad2pkhpq"
+ "commit": "c5a29ca7cb816f94153efe3d9c48ab2b566f7506",
+ "sha256": "0qkqjn64b6p6r2famj17r1zqdya4dm46lcvkphjqhipla6cmrl67"
},
"stable": {
"version": [
@@ -31254,21 +31376,21 @@
"repo": "erlang/otp",
"unstable": {
"version": [
- 20230322,
- 848
+ 20230412,
+ 849
],
- "commit": "dac89a6acc1a93a615930ca18f1dbf4e9323b038",
- "sha256": "1xqzdqniv6af7cajd3agnqdi12n4fy644p8z07k7r24cp1lz7y03"
+ "commit": "1f897adc9df5e0de5d5a85633a8629a7e45ddeab",
+ "sha256": "00f11psvhvlrhx5p160dzix5kq5af8yqrixq2npc4dsgmv7wwlmi"
},
"stable": {
"version": [
26,
0,
-1,
- 2
+ 3
],
- "commit": "dac89a6acc1a93a615930ca18f1dbf4e9323b038",
- "sha256": "1xqzdqniv6af7cajd3agnqdi12n4fy644p8z07k7r24cp1lz7y03"
+ "commit": "1f897adc9df5e0de5d5a85633a8629a7e45ddeab",
+ "sha256": "00f11psvhvlrhx5p160dzix5kq5af8yqrixq2npc4dsgmv7wwlmi"
}
},
{
@@ -31870,19 +31992,19 @@
"repo": "akreisher/eshell-syntax-highlighting",
"unstable": {
"version": [
- 20220816,
- 2017
+ 20230409,
+ 655
],
- "commit": "1ba39a9ffb2298cd716a4314cf3f369028c7bafe",
- "sha256": "0w2f5a9cxa365hcc92c24b3kq5dwry3prig57jgnicwmjn5nkqlz"
+ "commit": "f38768bb3b557e884fdcc624daa3bce151279e0b",
+ "sha256": "147zas23irsx3d9f8cw6kqp3baavc73ab43phx1f46cykdg91qij"
},
"stable": {
"version": [
0,
- 3
+ 4
],
- "commit": "6dc15347a88e019e283fd98ec9e3ddd34d210b5c",
- "sha256": "1fb9aa85a3hx1rcmv71j6sc3y278452p1y4dabpwy07avb6apd0p"
+ "commit": "0ac5259d497a9794e147d2b9dc23edf5bc844e3c",
+ "sha256": "1ib46fs70grx7rmw45i817v1dyvcj0b8xdmndvaz7papiimf6vrj"
}
},
{
@@ -32213,11 +32335,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20230402,
- 42
+ 20230419,
+ 1527
],
- "commit": "5857bb020a208c1f4c244a51a1a85bf0ed5c0c31",
- "sha256": "0ir1abyn5nri26s3i1gqp6i8wyz0qhk6bzzhmy29sl6v63ajna51"
+ "commit": "5c4ae91cefa5c56fd13b204a9a996825af836a67",
+ "sha256": "0riv971cblala39kh5zz69833nh4ngpqdiz5ci7hjgyq8qcimgp3"
},
"stable": {
"version": [
@@ -32846,15 +32968,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20230322,
- 1818
+ 20230421,
+ 1417
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "c61bc34b40f1f0605a999e874e837d1e8bda85af",
- "sha256": "0bj3q800dxvqhqqvc8srwlq9gk2lwg3a8wkxk6gcibdf506ybk3l"
+ "commit": "23a20e364cb151d73373d886355508cb8a0d4539",
+ "sha256": "1ac3a0s9s0dbbs2hkabzrzi34r7sdkiwnc80gw41sllp65cccivs"
},
"stable": {
"version": [
@@ -33047,15 +33169,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20230312,
- 2309
+ 20230420,
+ 1435
],
"deps": [
"annalist",
"evil"
],
- "commit": "d9a70ef21942c208094acf1e5c65d7f8f0016aca",
- "sha256": "04zhli26w1czi1imjhcnarvl1czi84pk5fv5pxhi3sa8mp4qacxw"
+ "commit": "5092f5e04cfd0a31b1c5c46cb6b792a9e917c728",
+ "sha256": "05zn8al50vixkbvrq1sr4hmx74d7rbsdljfx3s0jydqnq168kwha"
},
"stable": {
"version": [
@@ -34585,8 +34707,8 @@
"repo": "ethan-leba/tree-edit",
"unstable": {
"version": [
- 20220425,
- 2355
+ 20230419,
+ 1753
],
"deps": [
"avy",
@@ -34595,8 +34717,8 @@
"tree-edit",
"tree-sitter"
],
- "commit": "eafee31ca4f532a9dbee326d3ec3bdd1e997223b",
- "sha256": "1p8ghpj83smh1bh38ydhlpyaxfdx0f83wp4sdgzv3zxdfydmb4n9"
+ "commit": "96631e26d96645172934011abb2a53ab1e5861d4",
+ "sha256": "12cihsgqwim2r7hyl5l3b5n3malnkmh26scf6d7bydpvd66d4ml2"
}
},
{
@@ -35166,15 +35288,15 @@
"repo": "md-arif-shaikh/expenses",
"unstable": {
"version": [
- 20220318,
- 842
+ 20230421,
+ 1053
],
"deps": [
"dash",
"ht"
],
- "commit": "e668666770858e92de83d8217c7e384de3ba1e34",
- "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv"
+ "commit": "00ba02d567b060688160df5d16ff055332c0d106",
+ "sha256": "1c8gmbbhpmv7wifjn3mmc3z1v4njp834vwp3hyp3gx4czan87r98"
},
"stable": {
"version": [
@@ -36342,11 +36464,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20230215,
- 1641
+ 20230417,
+ 1408
],
- "commit": "52da9715b0d046597cb322d3a98cb27ae6e5719e",
- "sha256": "1vkzgmxmghbsb7mk0dc3cl07f7isvbgc36vw7v16rmfr1av3z1lz"
+ "commit": "f351462ff9515abf9fbe08276c33006f8774cd29",
+ "sha256": "0hj9fx8lmsrvpnmb6zagkqic9l8w89l4faa7d2lgnicz10pa7h5r"
},
"stable": {
"version": [
@@ -37186,8 +37308,8 @@
"repo": "rolandwalker/fixmee",
"unstable": {
"version": [
- 20150223,
- 1355
+ 20230415,
+ 2027
],
"deps": [
"back-button",
@@ -37197,8 +37319,8 @@
"string-utils",
"tabulated-list"
],
- "commit": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084",
- "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic"
+ "commit": "54500aaa8ae019034dc170af33f43465f5f03123",
+ "sha256": "1cm5y6cjs561w3yq0bawnn2f524kk9w485dad9ap3088rrgv89qm"
},
"stable": {
"version": [
@@ -37393,11 +37515,11 @@
"repo": "nylar/fleetish-emacs-theme",
"unstable": {
"version": [
- 20230325,
- 1938
+ 20230407,
+ 1438
],
- "commit": "4e6747500af3e8b1ae4bc4986a86ff57d82c9103",
- "sha256": "10i7q7v0772a7d6y61x7c273qb7r30k9vsg7dc3yrw7wmpkz4s1d"
+ "commit": "482513562b6691c7f3440b62a31033d22378ed96",
+ "sha256": "1svfj3z9kiyw6743p18h4116wzzv23lwjaksrfbdlcy856akigbm"
}
},
{
@@ -37864,14 +37986,14 @@
"repo": "leotaku/flycheck-aspell",
"unstable": {
"version": [
- 20220411,
- 826
+ 20230408,
+ 957
],
"deps": [
"flycheck"
],
- "commit": "5ec0f9b28b1d86eec192b23bc24d9a33dfe51882",
- "sha256": "02qv8gxlnasak87gggfg1643m5281fzjh4snpq1gjwyv6biqlldz"
+ "commit": "45cd22c52b676abbdf405d9fe16b7073b954ed77",
+ "sha256": "0b4758l06sy9lp9knvcgz9gy283rsf0g2m3qgpg3aya8bnja14dr"
}
},
{
@@ -38881,15 +39003,15 @@
"repo": "flatwhatson/flycheck-guile",
"unstable": {
"version": [
- 20230322,
- 1348
+ 20230405,
+ 1154
],
"deps": [
"flycheck",
"geiser"
],
- "commit": "16c869ec2212dfaeb98f31710667199e4d702515",
- "sha256": "18rkkc7zdcdqp8zlpz6n4zhqky0svacf03arqw0b1whb62p44j9r"
+ "commit": "dd7bbdc48fd21cf8d270c913c56cd580f8ec3d03",
+ "sha256": "1klmd62hqfh7ajjm95vnib4hihgc1i79nsqmpwvg3l4i2cnrwx7x"
},
"stable": {
"version": [
@@ -39653,28 +39775,28 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20230330,
- 115
+ 20230417,
+ 1142
],
"deps": [
"flycheck",
"phpstan"
],
- "commit": "864e8faefc9cc351ec566b2b332438e54c1568a1",
- "sha256": "0qgnrdk32zkfssd9wv6y6z034i47jdw0xmn7s2kyja1m622dckzv"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
},
"stable": {
"version": [
0,
- 6,
- 0
+ 7,
+ 2
],
"deps": [
"flycheck",
"phpstan"
],
- "commit": "0869b152f82a76138daa53e953285936b9d558bd",
- "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
}
},
{
@@ -40492,11 +40614,11 @@
"repo": "leotaku/flycheck-aspell",
"unstable": {
"version": [
- 20230107,
- 748
+ 20230408,
+ 957
],
- "commit": "1c7fb66f6cb325ee1123094263a8def9bc071768",
- "sha256": "0wh2n3bb4l13qqbrdihrwrwlcil80kv0nkpripj1jw89gnvgrnfz"
+ "commit": "45cd22c52b676abbdf405d9fe16b7073b954ed77",
+ "sha256": "0b4758l06sy9lp9knvcgz9gy283rsf0g2m3qgpg3aya8bnja14dr"
}
},
{
@@ -40536,15 +40658,15 @@
"repo": "mohkale/flymake-collection",
"unstable": {
"version": [
- 20230311,
- 1746
+ 20230420,
+ 849
],
"deps": [
"flymake",
"let-alist"
],
- "commit": "0dc266c443bb9553f529a848c20a2b4c00cec649",
- "sha256": "03dw79yza3q8jhn9zl3l3ryqkqcbli23zxjq0dp1flbv959b4fna"
+ "commit": "16a41c45ea1837b96425dcb906b9209611e21280",
+ "sha256": "1n00ma1vz7nmg795mn0hfbds24csc2m0a5ymj7ysbpd6y4pmicgy"
},
"stable": {
"version": [
@@ -41358,26 +41480,26 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20210714,
- 1805
+ 20230417,
+ 1142
],
"deps": [
"phpstan"
],
- "commit": "0869b152f82a76138daa53e953285936b9d558bd",
- "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
},
"stable": {
"version": [
0,
- 6,
- 0
+ 7,
+ 2
],
"deps": [
"phpstan"
],
- "commit": "0869b152f82a76138daa53e953285936b9d558bd",
- "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
}
},
{
@@ -42446,8 +42568,8 @@
"repo": "magit/forge",
"unstable": {
"version": [
- 20230326,
- 2058
+ 20230410,
+ 1927
],
"deps": [
"closql",
@@ -42461,8 +42583,8 @@
"transient",
"yaml"
],
- "commit": "422881e552afd9df15e591dbf52aa36e2d481758",
- "sha256": "1zcg8rxndr684l23cm913py3a07s7v6jmbprzfg1pyifkr559njg"
+ "commit": "4dfbc3a0ca80101c7a3763df518485bd8106805f",
+ "sha256": "1vs8q0rcgw88frxhcj7p1s53ccrpqk8n8k58zizbicpc31x0rr2y"
},
"stable": {
"version": [
@@ -42662,14 +42784,14 @@
"repo": "rnkn/fountain-mode",
"unstable": {
"version": [
- 20221225,
- 1016
+ 20230421,
+ 909
],
"deps": [
"seq"
],
- "commit": "bfbd41a126f12abb4c0f279b087816d7dd483ff9",
- "sha256": "1i9x3jd0phrm4a1jgngpvnmjs5j3y4sfy5yzjv5wwbcp9b8hmidl"
+ "commit": "9b132767e209a558eed57206297c8a11e5eb1e98",
+ "sha256": "0rkbr0f1lj9vqbcmwbppax0592wlb97s9pqhkk1a3nz67gcr1wak"
},
"stable": {
"version": [
@@ -43108,11 +43230,11 @@
"repo": "pdo/frimacs",
"unstable": {
"version": [
- 20221127,
- 910
+ 20230409,
+ 1041
],
- "commit": "2aa343d743e70fa90ae06927fa2c7dabeca04fa2",
- "sha256": "1rvhxyzljpdv4h1mwi767jyz4ql61806vq6q9681ixvm9jzxs8p4"
+ "commit": "dfba4a1ca94b5f1d29659c3f786647dcdc315672",
+ "sha256": "1gfr8mrgsyqi010fldg30lwb6wkpr1x8ashbqmshdp1m5fyza2jr"
}
},
{
@@ -43666,11 +43788,11 @@
"repo": "bling/fzf.el",
"unstable": {
"version": [
- 20230224,
- 1236
+ 20230403,
+ 1304
],
- "commit": "f90ee73f9427ddce396fdca93a5be1ea04e56a1b",
- "sha256": "1zyqwd81mpc0xy63s5rkbj8r33ljd0i8bz2iqd5j7a7y26ym9r5z"
+ "commit": "3a55b983921c620fb5a2cc811f42aa4daaad8266",
+ "sha256": "1apf2w783gadbl93il6hwidwadnkw5wlkyby29gz3x1rg6v42x8h"
},
"stable": {
"version": [
@@ -43723,11 +43845,11 @@
"repo": "ShiroTakeda/gams-mode",
"unstable": {
"version": [
- 20230214,
- 1359
+ 20230413,
+ 1331
],
- "commit": "a50a290e5559e9f099e2bbbcecacac9e484ef4d9",
- "sha256": "0k1icyhyqa71d651vdb8mb9vg37nx50l3xs13whv3mq1kcbp0hxp"
+ "commit": "246c0bea5764e5d9d5607a1f76b4602109e66ba9",
+ "sha256": "0lmvblx5lwxlsxp6nnp7b64wsdlzf83pv49dx8316wakaid1f5yl"
},
"stable": {
"version": [
@@ -43830,11 +43952,11 @@
"repo": "godotengine/emacs-gdscript-mode",
"unstable": {
"version": [
- 20220721,
- 547
+ 20230421,
+ 620
],
- "commit": "d392e8aa7e7c6dd79ce52fb55d78f7acfa443194",
- "sha256": "1zwhcqh3zvblmqz7ipm8r4n4qs4rv1myv3xbg5fm4axba46hpa5y"
+ "commit": "30c4d48f81d5e52e8667cc10780e4af743e27f96",
+ "sha256": "1h7wjif5d9xg4w7s3b5kxa6ldirjl5ybg6n9qwq2ywahgl0pw5ql"
},
"stable": {
"version": [
@@ -45386,11 +45508,11 @@
"repo": "sshaw/git-link",
"unstable": {
"version": [
- 20230216,
- 300
+ 20230420,
+ 48
],
- "commit": "d3ba912079e0ca5fd727b1f617791c6ae1e0da82",
- "sha256": "14czzi9gi1zms1nnpjabn4b7cyahjj0xz8y4jxr6pn6gp20zzp0n"
+ "commit": "1727e9b7ec41a234a2cc14151b9ffd9c1c4f4b14",
+ "sha256": "075r2y8kip0kilhnszs1mfrn9rhrbcnffqlpy1h72qr9mxhyql65"
},
"stable": {
"version": [
@@ -45524,14 +45646,14 @@
"repo": "pidu/git-timemachine",
"unstable": {
"version": [
- 20221109,
- 2051
+ 20230413,
+ 620
],
"deps": [
"transient"
],
- "commit": "d8ffd0d7cc4ab3dd7de494c9ea36dfd99e2744fa",
- "sha256": "1vg29wwzpkd5qf3z2xsl34cfmyh1gq7pf2nz335ln5nfkzz4jnbc"
+ "commit": "13769fb603ae88c64566529eae4525ce88026e86",
+ "sha256": "0d1aj9xhcyksg115xl2yw0rd62hp53ig06y54jvii1l8vavb94jy"
},
"stable": {
"version": [
@@ -47449,7 +47571,7 @@
20230304,
644
],
- "commit": "cb8002277d44c6b548f7e924fa1715706b5f986a",
+ "commit": "dd3b2cecd861aa49d0053d79a7109db8baddc6bb",
"sha256": "1ca7pcvfzl69qc1zsvx2ifz2za88hb79vvckaw924pxqzabrcix9"
},
"stable": {
@@ -47457,7 +47579,7 @@
0,
4
],
- "commit": "923d117ab399a0598a496d3fab84188c6f460dae",
+ "commit": "c12fe8552259e8c8d4e41fd83ce444a94e17f5da",
"sha256": "1bhfd41x3i2gabvf50pdpmnvcdqg69ygslyjcg7jvf486b44gvfk"
}
},
@@ -47532,11 +47654,11 @@
"repo": "minad/goggles",
"unstable": {
"version": [
- 20230218,
- 1710
+ 20230410,
+ 1751
],
- "commit": "b715ff51e4b80c3c5487e7be6deadb1bb1497af6",
- "sha256": "0crll7r1qzpipimrahbfgk31f6rys58gzsbiwi65l0gqw49699sx"
+ "commit": "1bb04b55286dd6cb066d9609f228fc62817dbf56",
+ "sha256": "0wwpnya280wajzlxnxk2rpiaf3knjzagnvjkm5dd437qy8ccwm6l"
},
"stable": {
"version": [
@@ -47996,11 +48118,11 @@
"repo": "gitmux/goto-last-point",
"unstable": {
"version": [
- 20230324,
- 155
+ 20230406,
+ 1822
],
- "commit": "0b52576832c2393b161fe4ecb6d6871cd5d71667",
- "sha256": "1rqcfj57qfrwp0959ga0k83a92bh8fh7iz3dpgzn0rnq25y35sn6"
+ "commit": "2ad8ff095bc34b433803c824ec4f500ff51cd1b2",
+ "sha256": "177iymqn2qka15f66fv6na1cmk0lgwjsgwsfdraw2b23x4zxhg2k"
}
},
{
@@ -48149,26 +48271,26 @@
"repo": "karthink/gptel",
"unstable": {
"version": [
- 20230401,
- 237
+ 20230413,
+ 602
],
"deps": [
"transient"
],
- "commit": "f7ba368c38e0a8d9a67f7cf158741b41288a2cb9",
- "sha256": "19kym1g9qfvvrxb3b7k66g0rww81y7855jmr7cf1lwpgsccllbg6"
+ "commit": "a5be53d5e3733ed48023e4862b59ac12fa98be07",
+ "sha256": "1ymqx9m6ypxdqcc9y3d90ibs3d2n6lb9dg7fn7q30lz6qa5nsc94"
},
"stable": {
"version": [
0,
- 2,
+ 3,
5
],
"deps": [
"transient"
],
- "commit": "1c07a94e18a914ae69ea0061f81fda4bba29afd5",
- "sha256": "190nrxf6nqmfrsza3vyc51f02hw10wzydi45phkswydjkgsllkmp"
+ "commit": "a5be53d5e3733ed48023e4862b59ac12fa98be07",
+ "sha256": "1ymqx9m6ypxdqcc9y3d90ibs3d2n6lb9dg7fn7q30lz6qa5nsc94"
}
},
{
@@ -48495,11 +48617,11 @@
"repo": "davazp/graphql-mode",
"unstable": {
"version": [
- 20220716,
- 827
+ 20230411,
+ 1943
],
- "commit": "92136cf9b5a4dcd8c202c8dba9064b497776d2f7",
- "sha256": "0df2lsvmxzkpma3crw3y421divkmx8kr2lpx3066ihqwblphr6mi"
+ "commit": "0ad4ae0160cabad46109dfbb394297a185eb2525",
+ "sha256": "1cqyhdchnbkj2pdyw22g9vzp19wpgkmai1c8waazy506v8i1aakp"
}
},
{
@@ -48711,11 +48833,11 @@
"repo": "gugod/grey-paper-theme",
"unstable": {
"version": [
- 20220811,
- 2301
+ 20230415,
+ 1115
],
- "commit": "760e8d26f5b2aeaa56b91bf435e42b1e5d6f69d7",
- "sha256": "0wlf35yxd04xfjyyq2xp7bw6bqqz9l8b5cgq897rknjglwk867py"
+ "commit": "4e5b8a31f586e2aa5c5d9bd939f0f518d919522e",
+ "sha256": "13vnl4gm1id1r30wdn91czj24m12zq3nkzs2a4i7p5g8r2pvygdl"
}
},
{
@@ -49465,11 +49587,11 @@
"repo": "clarete/hackernews.el",
"unstable": {
"version": [
- 20210226,
- 1226
+ 20230127,
+ 1918
],
- "commit": "cea521750eddb3a70ccd38789d12b09bbdc7e906",
- "sha256": "0mc9v8az97kap11f8np55xkbrl4mbiy6jfg76jaagkdsfizqpx5a"
+ "commit": "dcb312194b60e9841a63455ba893d60856099c79",
+ "sha256": "1ga427kv77m5wr5pyjzag1mjqcyk2qh9avzn7qfmpdmfjrlrqhyb"
},
"stable": {
"version": [
@@ -50237,15 +50359,15 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20230401,
- 441
+ 20230419,
+ 650
],
"deps": [
"helm-core",
"popup"
],
- "commit": "88ae058c9763d66f820f3613e522aebbaa1d7a05",
- "sha256": "1k9y0vsmnfk48nal2z1s8jspgsq5rghhsqfkiwpf84pq37zq4jhn"
+ "commit": "b2d0738bab027748e97a54a8cb465ed73f180631",
+ "sha256": "1i8vs6g72garqmla1p9dhybxlad3ld1xxjk9cycw51q3rahv9mrc"
},
"stable": {
"version": [
@@ -50359,24 +50481,6 @@
"sha256": "0ml9yp3qaiwn7iixyxvsj3fxn7gw913qxisr47df57q4ka912law"
}
},
- {
- "ename": "helm-ag-r",
- "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165",
- "sha256": "00z4xg144axzha993iv3ci3wpsh4rbdbff9ywapfa19j4q76fb72",
- "fetcher": "github",
- "repo": "yuutayamada/helm-ag-r",
- "unstable": {
- "version": [
- 20131123,
- 1531
- ],
- "deps": [
- "helm"
- ],
- "commit": "67de4ebafe9b088db950eefa5ef590a6d78b4ac8",
- "sha256": "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa"
- }
- },
{
"ename": "helm-apt",
"commit": "5d3fec3e22c66091f0f71c2c9916755006b290f4",
@@ -51019,21 +51123,6 @@
"sha256": "015b8zxh91ljhqvn6z43gy08di54xcw9skw0i7frj3d7gk984qhl"
}
},
- {
- "ename": "helm-cmd-t",
- "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
- "sha256": "1w870ldq029wgicgv4cqm31zw2i8vkap3m9hsr9d0i3gv2virnc6",
- "fetcher": "github",
- "repo": "emacs-helm/helm-cmd-t",
- "unstable": {
- "version": [
- 20170125,
- 1459
- ],
- "commit": "7fa3d4a9f7271512e54c5de999079b27c9eec6bf",
- "sha256": "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak"
- }
- },
{
"ename": "helm-codesearch",
"commit": "0a992824e46a4170e2f0915f7a507fcb8a9ef0a6",
@@ -51415,27 +51504,6 @@
"sha256": "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110"
}
},
- {
- "ename": "helm-dirset",
- "commit": "855ea20024b606314f8590129259747cac0bcc97",
- "sha256": "1bwgv1pm047xafidq23mdqj3sdc5bvqlw74s80dj88ybp3vrpvlk",
- "fetcher": "github",
- "repo": "k1LoW/helm-dirset",
- "unstable": {
- "version": [
- 20151209,
- 12
- ],
- "deps": [
- "cl-lib",
- "f",
- "helm",
- "s"
- ],
- "commit": "eb30810cd26e1ee73d84a863e6b2667700e9aead",
- "sha256": "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb"
- }
- },
{
"ename": "helm-dogears",
"commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e",
@@ -52070,24 +52138,6 @@
"sha256": "1z5q47sly41amjiq5wcvdxf8slhl8wd24crgzpbn6m3lw2jk420r"
}
},
- {
- "ename": "helm-git-files",
- "commit": "23bfa0b94f242f9da06366b4aefdf6ece72561e7",
- "sha256": "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6",
- "fetcher": "github",
- "repo": "kenbeese/helm-git-files",
- "unstable": {
- "version": [
- 20141212,
- 1317
- ],
- "deps": [
- "helm"
- ],
- "commit": "43193960774069369ac6964bbf7c026900206fa8",
- "sha256": "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw"
- }
- },
{
"ename": "helm-git-grep",
"commit": "338d28c3fe201a7b2f15793be6d540f44819f4d8",
@@ -52461,16 +52511,16 @@
"repo": "yyoncho/helm-icons",
"unstable": {
"version": [
- 20210330,
- 1216
+ 20230412,
+ 1425
],
"deps": [
"dash",
"f",
"treemacs"
],
- "commit": "8d2f5e705c8b78a390677cf242024739c932fc95",
- "sha256": "0q220a0knzmm2xk7hjcz6wkdk39ni2qndvnnsrc2vg04r5k12lm7"
+ "commit": "9c816279b1a4206b42a71f41de080a0a306b5cc2",
+ "sha256": "1zhhmcjsqq9i3r0zwj7azwkrdwj1h1rs2bh2xdwrym27y3af8l95"
}
},
{
@@ -52773,14 +52823,14 @@
"repo": "emacs-helm/helm-ls-git",
"unstable": {
"version": [
- 20221118,
- 503
+ 20230408,
+ 1726
],
"deps": [
"helm"
],
- "commit": "c5893f0cd92b20dcdcd5dc89d9ba6200a95c3f80",
- "sha256": "0lh7xm295z6fahymxa16jb49pnb8d4fklilbvza8ckbnh422ga31"
+ "commit": "3d11ec67b00f0e37c982ce6c2f3847b1b0959ce8",
+ "sha256": "1n3l51anrn2bqx1chk5zas48ddgxywfiyqg0l0vsjva6kbbv0lqd"
},
"stable": {
"version": [
@@ -53043,14 +53093,14 @@
"repo": "emacs-helm/helm-mu",
"unstable": {
"version": [
- 20230102,
- 1148
+ 20230408,
+ 2126
],
"deps": [
"helm"
],
- "commit": "2422f57ed40d998ac6f085f93b24223c91cefaf7",
- "sha256": "1j6avadq1jn5bib1nr8sj08qn4f67psb39jdcn314n6r84xf4gam"
+ "commit": "d3c23b63281ae7d1be7bd6ac0ea66dd0739deed3",
+ "sha256": "08d5i50nm651ak0kng420s8abl7gx7l0dgzr2a3hakyds06c5vgv"
}
},
{
@@ -53815,25 +53865,6 @@
"sha256": "1gpy6jc932p4yiyglnwylriw3jk2f4bs7rrxbwc0z9xzjzzn4qnz"
}
},
- {
- "ename": "helm-rb",
- "commit": "7ba8e94755f5a96881bbf4c4ffbff67bec9b804a",
- "sha256": "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr",
- "fetcher": "github",
- "repo": "yuutayamada/helm-rb",
- "unstable": {
- "version": [
- 20131123,
- 1639
- ],
- "deps": [
- "helm",
- "helm-ag-r"
- ],
- "commit": "4949d646420a9849af234dacdd8eb34a77c662fd",
- "sha256": "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid"
- }
- },
{
"ename": "helm-rdefs",
"commit": "e1c7a20847513dc1153d54a3a700bc120f71dc6b",
@@ -55008,8 +55039,8 @@
"repo": "Wilfred/helpful",
"unstable": {
"version": [
- 20230323,
- 414
+ 20230419,
+ 406
],
"deps": [
"dash",
@@ -55017,8 +55048,8 @@
"f",
"s"
],
- "commit": "e9ec6fc2ae10db2b9b59ed656021845d11881a0a",
- "sha256": "1ysx4lwfiji998799ain0zfrcwbqqvaj1pi4dy0mzghwl636pn1l"
+ "commit": "8893e4ba49e4447b41ee08d93e58c23e07bc7514",
+ "sha256": "1ip8586rgwy12xr5yw3gjmdqs2hccz3bwp0smd40b82islq53jrl"
},
"stable": {
"version": [
@@ -55461,11 +55492,11 @@
"repo": "alphapapa/highlight-function-calls",
"unstable": {
"version": [
- 20170908,
- 500
+ 20230416,
+ 445
],
- "commit": "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787",
- "sha256": "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653"
+ "commit": "e2ed2da188aea5879b59ffffefdc5eca10e7ba83",
+ "sha256": "11i7ni7m6r08ziq9mk6r9wr5l1ky1yw30hpid6yk31sviik06jkz"
}
},
{
@@ -56280,14 +56311,11 @@
"repo": "emacs-pe/honcho.el",
"unstable": {
"version": [
- 20190623,
- 2120
+ 20230224,
+ 420
],
- "deps": [
- "sudo-edit"
- ],
- "commit": "d5e6206dd23ff9305d976c52845c750a064aca4b",
- "sha256": "0nh8n9rbd640rjpb3qz1mq3mgwj4dw5m98v4xypxpd954pr90afc"
+ "commit": "95846309c6a4ce45f29f215d43847beb510b6aca",
+ "sha256": "1ixwhf6an3jpdpg8my2i5g9yhbkpx1d2hnhp0ca46ys431zc1nyy"
}
},
{
@@ -57064,8 +57092,8 @@
"repo": "ushin/hyperdrive.el",
"unstable": {
"version": [
- 20230330,
- 606
+ 20230420,
+ 2324
],
"deps": [
"compat",
@@ -57073,8 +57101,8 @@
"persist",
"plz"
],
- "commit": "de2c62d48cf2eff4fb78c0549caf2c3fe70c17cf",
- "sha256": "0q999d97lky19yl5x5ri9jgvm97s06qfh8v3sprz4kwn1ladywdd"
+ "commit": "1eaa44253f70ad81c2d8936a61d649d4855e1725",
+ "sha256": "0hp02kbz7xhfdby4anrk98whhkwb0rcgx3m8zvdqg01xwab8ahpz"
}
},
{
@@ -58941,14 +58969,14 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20230326,
- 1946
+ 20230408,
+ 952
],
"deps": [
"clojure-mode"
],
- "commit": "8ad2242b75ea1a06fad391deb8f858a392408a94",
- "sha256": "14vdbl17phmg642csxm3plncm38k09arqbrvm08pl8r1hw9rwhz6"
+ "commit": "b153e5126419910c38691088aab569b7c281068c",
+ "sha256": "1v63lcrbqrpa9nnz5f5cq71cay0b2j71m6swrkzvn6q3fv7a0sb5"
},
"stable": {
"version": [
@@ -59446,11 +59474,11 @@
"repo": "ideasman42/emacs-theme-inkpot",
"unstable": {
"version": [
- 20230306,
- 3
+ 20230418,
+ 127
],
- "commit": "f30a84f3d98e5682ef123136394e5859752c5168",
- "sha256": "02752q789br4gk05k1b8mdb031cdplcqznkfja5s11vx92sxl628"
+ "commit": "8f0c4c85f69aeab53901c235b9c588689dea8f6c",
+ "sha256": "0n2fh7hn0m1bg341nfnj33pby5xiq2krcs8dnvflhm5764i036cx"
}
},
{
@@ -59485,11 +59513,11 @@
"url": "https://repo.or.cz/inline-docs.git",
"unstable": {
"version": [
- 20220210,
- 1402
+ 20230406,
+ 1002
],
- "commit": "cda596d9ff4c2aa5035692a97c430f6589eafbb1",
- "sha256": "0kc73qv3986n7fv8qrxr81zyg5lk14266v4rpwrib4nv5qwhzjza"
+ "commit": "8eb1c43b53a7f51cf74cb85529d108b5ce5efff5",
+ "sha256": "1pk7snxn5wdghslwlk09ycszv7kyv9ilfb60pwg08pfq6sd2w64n"
}
},
{
@@ -60356,20 +60384,20 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20230326,
- 1253
+ 20230410,
+ 1815
],
- "commit": "24a8262767b7917a91ed7ffc11298f28569e3087",
- "sha256": "1i185hbzax2p6vikyy13raczfp9bcz5lf1jzqkfwyszwr40gx2a7"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
},
"stable": {
"version": [
0,
- 13,
- 4
+ 14,
+ 0
],
- "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
- "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
}
},
{
@@ -60380,28 +60408,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20211021,
- 1602
+ 20230410,
+ 1815
],
"deps": [
"avy",
"ivy"
],
- "commit": "bb77cf058d9fbc0a64e73491179e88c32e0b0b47",
- "sha256": "10adm2ivma09kd8pss1fpphvdw3pir9iw3w869bmisz2hqfrcnhm"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
},
"stable": {
"version": [
0,
- 13,
- 4
+ 14,
+ 0
],
"deps": [
"avy",
"ivy"
],
- "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
- "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
}
},
{
@@ -60748,28 +60776,28 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20220402,
- 1348
+ 20230410,
+ 1815
],
"deps": [
"hydra",
"ivy"
],
- "commit": "40e017dc1bc4655f7c3cf4bbbe3a827ce2fff213",
- "sha256": "0znpz1dmhgdjs2k68lz46j0br1a0714z9crl6ff8vghpcw19fnn3"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
},
"stable": {
"version": [
0,
- 13,
- 4
+ 14,
+ 0
],
"deps": [
"hydra",
"ivy"
],
- "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
- "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
}
},
{
@@ -62059,25 +62087,25 @@
"repo": "minad/jinx",
"unstable": {
"version": [
- 20230331,
- 1134
+ 20230421,
+ 813
],
"deps": [
"compat"
],
- "commit": "6a8a282ba88dbb7167918fe7b66bccdfee7704ad",
- "sha256": "0ng3k4r3idg7jfhxjbws9dqcnh01iginybdj7w25lx72da9czkch"
+ "commit": "25a39dfc57b5819d9e5317ac61ecbdcd112234f7",
+ "sha256": "04srj9cn6jqlhj4qfhbm9874cn9wmx9kasmqi9kilpl22wf5nx4h"
},
"stable": {
"version": [
0,
- 4
+ 7
],
"deps": [
"compat"
],
- "commit": "68b579d715c4be5a255852130b9009151fb0c41e",
- "sha256": "0pqkz2h6yaizf8jihzkdlxhg883yg6h7v13q3kfvrsklx8ivnx5y"
+ "commit": "25a39dfc57b5819d9e5317ac61ecbdcd112234f7",
+ "sha256": "04srj9cn6jqlhj4qfhbm9874cn9wmx9kasmqi9kilpl22wf5nx4h"
}
},
{
@@ -62544,24 +62572,24 @@
"repo": "mooz/js2-mode",
"unstable": {
"version": [
- 20221028,
- 1819
+ 20230408,
+ 115
],
"deps": [
"cl-lib"
],
- "commit": "a297ec2c2d9aa50ddc6c06959bb5a054e17b692a",
- "sha256": "0h83xh7rwv42q8f81ywd45y6z2snrq65ygimqqyv04c6i0b76k9a"
+ "commit": "7d928272bc311b1dd6f38d3f6365c18153e28636",
+ "sha256": "1vwykla43315wlky52807pn2nm508dx6593alk7hnrl2qkl7852s"
},
"stable": {
"version": [
- 20220710
+ 20230408
],
"deps": [
"cl-lib"
],
- "commit": "841cfec9570ae06a67a131997e2aff32340e81d7",
- "sha256": "0whvhmgpv6yxqiljd1l4a880i0dhp0z0jxqaad7jjvwij07vvla4"
+ "commit": "7d928272bc311b1dd6f38d3f6365c18153e28636",
+ "sha256": "1vwykla43315wlky52807pn2nm508dx6593alk7hnrl2qkl7852s"
}
},
{
@@ -62941,10 +62969,10 @@
"repo": "iwahbe/jsonian",
"unstable": {
"version": [
- 20230305,
- 1915
+ 20230414,
+ 1851
],
- "commit": "8827918900f6c3e77846be0b4ad6fb42f670a84f",
+ "commit": "e6a6a8452fc84f77bf5644851306c8b8d63a3bc5",
"sha256": "1ay8ccpgifxlk41ik04b4870vvfyq42cib348wm06rpazwjv07vp"
}
},
@@ -63521,23 +63549,26 @@
"repo": "mhayashi1120/Emacs-kaesar",
"unstable": {
"version": [
- 20230212,
- 743
+ 20230221,
+ 108
],
- "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b",
- "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq"
+ "deps": [
+ "kaesar-pbkdf2"
+ ],
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
},
"stable": {
"version": [
0,
9,
- 0
+ 5
],
"deps": [
- "cl-lib"
+ "kaesar-pbkdf2"
],
- "commit": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea",
- "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
}
},
{
@@ -63548,26 +63579,26 @@
"repo": "mhayashi1120/Emacs-kaesar",
"unstable": {
"version": [
- 20230212,
- 743
+ 20230221,
+ 108
],
"deps": [
"kaesar"
],
- "commit": "d62b18e888d69d27b0b74cf47224a1ac204dfb0b",
- "sha256": "060zskrrr0m9bfccskl06knlly3zwy1s9dzyzn9l4n8rr487fqqq"
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
},
"stable": {
"version": [
0,
9,
- 0
+ 5
],
"deps": [
"kaesar"
],
- "commit": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea",
- "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
}
},
{
@@ -63578,27 +63609,26 @@
"repo": "mhayashi1120/Emacs-kaesar",
"unstable": {
"version": [
- 20230212,
- 755
+ 20230221,
+ 108
],
"deps": [
"kaesar"
],
- "commit": "48b7160a817cb1e430726e1d2243d921c3f0508f",
- "sha256": "0kxd9pl5d4nlbwpvyv0mnp2hd14z65b1mfksr24s1gih5df8ii2l"
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
},
"stable": {
"version": [
0,
9,
- 0
+ 5
],
"deps": [
- "cl-lib",
"kaesar"
],
- "commit": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea",
- "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8"
+ "commit": "75655238e0dcdb77a74d685cc4f3368fcd284020",
+ "sha256": "0bxmzh2my94jph2ydfx4p777xihzisvkgk9vwsnrdmfng5hfs8vv"
}
},
{
@@ -63778,28 +63808,28 @@
"repo": "ogdenwebb/emacs-kaolin-themes",
"unstable": {
"version": [
- 20230330,
- 2135
+ 20230402,
+ 1851
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "5756c94cf33ffad21057654981e7822f8babef4a",
- "sha256": "1q03q3jgqd2rnjnrqhs4n85z1yajp0acp42m3xx4scb5d4gwd2v2"
+ "commit": "facb2a08d3179103d4c3a9905b37c87831fe1665",
+ "sha256": "0r8lc175iswvwwqf2yqdc8sx07m8b8l0mylw0p1gxri45qd69hcq"
},
"stable": {
"version": [
1,
6,
- 7
+ 8
],
"deps": [
"autothemer",
"cl-lib"
],
- "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2",
- "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s"
+ "commit": "facb2a08d3179103d4c3a9905b37c87831fe1665",
+ "sha256": "0r8lc175iswvwwqf2yqdc8sx07m8b8l0mylw0p1gxri45qd69hcq"
}
},
{
@@ -64524,28 +64554,28 @@
"repo": "debanjum/khoj",
"unstable": {
"version": [
- 20230331,
- 1113
+ 20230417,
+ 1631
],
"deps": [
"dash",
"transient"
],
- "commit": "35aa06067fb2b35ac79344f1af407fcc6b34083d",
- "sha256": "1af2knabavkvhh24zn39g76pjl71xz1q6w12qb7yy9ygrps61ib9"
+ "commit": "62e6e09521e1ae74e34e036b1b28b2f274de634f",
+ "sha256": "0c71106gg2pjzkb8ks97rk9av7lkm976b4qmqcq06llg6l80nh36"
},
"stable": {
"version": [
0,
6,
- 0
+ 1
],
"deps": [
"dash",
"transient"
],
- "commit": "35aa06067fb2b35ac79344f1af407fcc6b34083d",
- "sha256": "1af2knabavkvhh24zn39g76pjl71xz1q6w12qb7yy9ygrps61ib9"
+ "commit": "62e6e09521e1ae74e34e036b1b28b2f274de634f",
+ "sha256": "0c71106gg2pjzkb8ks97rk9av7lkm976b4qmqcq06llg6l80nh36"
}
},
{
@@ -64785,14 +64815,14 @@
"repo": "benjaminor/kkp",
"unstable": {
"version": [
- 20230327,
- 1546
+ 20230403,
+ 2156
],
"deps": [
"compat"
],
- "commit": "584e2856a071523366f664147c4f06c8e7488efb",
- "sha256": "0zrmz3g0la93rzbnbv46pr5wnirq355p268k90hr7iqqbhsbsdd0"
+ "commit": "5652ba0bfa7a4c03daffc301c9ca4a9899c4f440",
+ "sha256": "0qm0pxzarn2hgim551gzjdh9r6a6i83hi96fslf6h2w85wp0zh6c"
}
},
{
@@ -65855,28 +65885,28 @@
"repo": "enricoflor/latex-table-wizard",
"unstable": {
"version": [
- 20230103,
- 2241
+ 20230413,
+ 1611
],
"deps": [
"auctex",
"transient"
],
- "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5",
- "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p"
+ "commit": "841bed109ef1acd757a815a51d65bc50ce312589",
+ "sha256": "04kay3hq26b3brv147320qbrcgbr1da3i4d6gzccz6nmy7kmjqzf"
},
"stable": {
"version": [
1,
- 2,
- 1
+ 3,
+ 0
],
"deps": [
"auctex",
"transient"
],
- "commit": "61fb455a1e6a28b93512e63c609ca7ad7dd5bec5",
- "sha256": "07fvyjm0invlw190iiy6v1zj772vr7y6lkqmhyng175xvhy3i62p"
+ "commit": "d5494445cfa449340d20b0793ea6f5244ca972ed",
+ "sha256": "1bwlmjwbznajak2x0b8s54wdcvy22a4pr9gzyspa50ymky7xvqcv"
}
},
{
@@ -66361,11 +66391,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20230323,
- 1050
+ 20230404,
+ 855
],
- "commit": "accaa8c4fff8cfc0a960e3e2cd6dca50f3a6ba4f",
- "sha256": "13k31kckcnzw77l32935z7ibvxmcfl9sx1xjhv0xxb2wvkqc2rs3"
+ "commit": "e74fe9e84f278cedc3b9fc661c243ab5e1bbf434",
+ "sha256": "12qiavxki128smzpyd040ldsb1h3b3ap0kz49is75wvvxm3j0344"
},
"stable": {
"version": [
@@ -66596,11 +66626,11 @@
"repo": "fniessen/emacs-leuven-theme",
"unstable": {
"version": [
- 20221228,
- 2143
+ 20230413,
+ 2003
],
- "commit": "2bbffb0555f49fd67a92a48415caca894109cbb6",
- "sha256": "086q97268s2j9cc98v0i44vl08iskqkav7hywz26girf5ca9dfsr"
+ "commit": "0c80179b7eda6724cd4dd4946176b5dc745f0a63",
+ "sha256": "1y73v7934jjwys04q05lwbg06mnn2pjp68w67vsxchybr63xr6x8"
},
"stable": {
"version": [
@@ -66708,11 +66738,11 @@
"repo": "Fuco1/emacs-lgr",
"unstable": {
"version": [
- 20230313,
- 2155
+ 20230407,
+ 1317
],
- "commit": "a46f7e6c58e0c343c81e464f4233acfaa0434b4f",
- "sha256": "08smxf427k9f3irpsa89jqxp8xds493fr0bdy8zh7mnkr18wf2k2"
+ "commit": "4ab6c22bcbc533acace3c854876f40fa9d2f7819",
+ "sha256": "17r1arvxbnllp5c0d67xf0m5d6qn2kmnfmrnc63v66n3d982v8pr"
}
},
{
@@ -67031,8 +67061,8 @@
"repo": "emacs-vs/line-reminder",
"unstable": {
"version": [
- 20230305,
- 2230
+ 20230420,
+ 142
],
"deps": [
"fringe-helper",
@@ -67040,8 +67070,8 @@
"indicators",
"ov"
],
- "commit": "ea916b5c040cbc7e39b46c1137b4d0bf5c19a241",
- "sha256": "1nwb775knpmg68432hb5y63vrajqk7kxy48rrgm26m0zmbvld83f"
+ "commit": "583bff387b361e1fe442f57e9ad1f6f8e87dedf4",
+ "sha256": "16shzyvvqwr83qdpwzwnyxabmgk4kz6jc4gk4yjs0mnakrgx6c0c"
},
"stable": {
"version": [
@@ -67189,14 +67219,14 @@
"repo": "noctuid/link-hint.el",
"unstable": {
"version": [
- 20221008,
- 1445
+ 20230405,
+ 1801
],
"deps": [
"avy"
],
- "commit": "1f9bb60289d87f31f92b86ed22d1f2c0a7af0222",
- "sha256": "1v2bj3arixy08fcyhszir7b1sm1fll3k2zfp5as510fh8j5302ba"
+ "commit": "36ce929331f2838213bcaa1145ece4b73ce84afe",
+ "sha256": "0154dls98zxpdjy8kzcrk9zp5i0aa180rsfr3hsmgq4ayq6v19yv"
}
},
{
@@ -67640,15 +67670,15 @@
"repo": "zzkt/litanizer",
"unstable": {
"version": [
- 20200211,
- 621
+ 20230419,
+ 917
],
"deps": [
"enlive",
"s"
],
- "commit": "ba73259e35b4649884ba56542d3a55f43bd3b80b",
- "sha256": "0147dqzhphnhxrcjxnbjk258j7g7y0rpbw6q3xrd340j9fk1q60k"
+ "commit": "a45902fa29c16ef9606229cb01a5441ea754f11b",
+ "sha256": "15911blwpsmxm6lr7ww8dz0z0ill1869k3rrw43321zr3nilk0hp"
},
"stable": {
"version": [
@@ -67877,20 +67907,20 @@
"repo": "donkirkby/live-py-plugin",
"unstable": {
"version": [
- 20230330,
- 58
+ 20230408,
+ 1602
],
- "commit": "4ea88695df456108adf37a547884cb37ea55438c",
- "sha256": "17akghld229pb0siv2vdhp5ddhzbwd7a611qc328p1gvvb49wmyn"
+ "commit": "0b5531b33ed7d89c363e5a130002c6b48ba32bc5",
+ "sha256": "0lm23p2m9pvp2229jh053dyi5phrb53v2hgsrcdfx08mvn6g28k4"
},
"stable": {
"version": [
4,
- 9,
- 1
+ 10,
+ 0
],
- "commit": "c02c7a5002d817d6e9cd4d7a1551c0ee412a65f1",
- "sha256": "0m5v46s4n4wq730pdzhmf26r4lxj23sg24l7yzf40dhsa7pfgh4p"
+ "commit": "0b5531b33ed7d89c363e5a130002c6b48ba32bc5",
+ "sha256": "0lm23p2m9pvp2229jh053dyi5phrb53v2hgsrcdfx08mvn6g28k4"
}
},
{
@@ -68976,28 +69006,28 @@
"repo": "gdkrmr/lsp-julia",
"unstable": {
"version": [
- 20211229,
- 1534
+ 20230414,
+ 2107
],
"deps": [
"julia-mode",
"lsp-mode"
],
- "commit": "e6ff5c09eb73c9b376bfbbd94f47c0366a01cf44",
- "sha256": "169f1h27qcnhph68793abz1bvdzsipphsn3c7vnyqi5313wgkrkx"
+ "commit": "c584f79c7fee6176bbb6120f4cb0f1001bcf8113",
+ "sha256": "0p32qjj9r7p423vpm7zyy4zrxbsical22yw4m2sv9lmbny5r4pzf"
},
"stable": {
"version": [
0,
7,
- 1
+ 2
],
"deps": [
"julia-mode",
"lsp-mode"
],
- "commit": "e6ff5c09eb73c9b376bfbbd94f47c0366a01cf44",
- "sha256": "169f1h27qcnhph68793abz1bvdzsipphsn3c7vnyqi5313wgkrkx"
+ "commit": "c584f79c7fee6176bbb6120f4cb0f1001bcf8113",
+ "sha256": "0p32qjj9r7p423vpm7zyy4zrxbsical22yw4m2sv9lmbny5r4pzf"
}
},
{
@@ -69038,14 +69068,14 @@
"repo": "emacs-languagetool/lsp-ltex",
"unstable": {
"version": [
- 20221231,
- 1658
+ 20230416,
+ 1826
],
"deps": [
"lsp-mode"
],
- "commit": "d1a599c8ec3748c2b81899d5831b6e7158255479",
- "sha256": "1y6l7wi216s6vpahp3wsmjrfafny2gsf043hx9rwiijwq324ilq3"
+ "commit": "c2faddc1197a360548aee7927b6512365e8c0d3a",
+ "sha256": "1mc5gsgw5m2sysi73jvrnnyyhpqdvwmhw843rwfh2djmiy6smwl9"
},
"stable": {
"version": [
@@ -69070,8 +69100,8 @@
"repo": "emacs-lsp/lsp-metals",
"unstable": {
"version": [
- 20230401,
- 1406
+ 20230406,
+ 755
],
"deps": [
"dap-mode",
@@ -69080,11 +69110,12 @@
"ht",
"lsp-mode",
"lsp-treemacs",
+ "posframe",
"scala-mode",
"treemacs"
],
- "commit": "6affc64252605f355d2bd16408a7e8436473a9f6",
- "sha256": "1v68n8ay823zgn9k6ixz2ya2dhhibk9gbvbnc2z5pw393ia3vn39"
+ "commit": "a11099b79f032aa2fc92a727d2c1e40987727d65",
+ "sha256": "147w698q6i393pcynwv0g0p7wwfsh6zcq7r8p3h9fk155gl7pwqc"
},
"stable": {
"version": [
@@ -69114,8 +69145,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20230401,
- 434
+ 20230420,
+ 1720
],
"deps": [
"dash",
@@ -69126,8 +69157,8 @@
"markdown-mode",
"spinner"
],
- "commit": "955b2805b4e3488189da9230382de27f74d20290",
- "sha256": "15g99f705wbpll9kipr805dy7pnhgd73hz2h59wbxiv0q39x2bqb"
+ "commit": "5c3ce8b795ca8a218b2301903395a629ae3523de",
+ "sha256": "0izmj3j8m4hdmr67q08qqqyxzp0dgk3ylajsldm9n6xrq3vj61nj"
},
"stable": {
"version": [
@@ -69441,15 +69472,15 @@
"repo": "merrickluo/lsp-tailwindcss",
"unstable": {
"version": [
- 20230309,
- 1037
+ 20230407,
+ 951
],
"deps": [
"f",
"lsp-mode"
],
- "commit": "f03b8f6030be14d7876006ff67a01263c22ef082",
- "sha256": "17nd3ypr6cpkvn8da5bs4laqfnw7hsix8058x2q8s9fjhpr5hd1n"
+ "commit": "6ade9cacd1db89da0e9c0941a86408a42091d479",
+ "sha256": "0mlr3f3j5vhzmaqd4g3nxvh9slh78bcgml8372cszn0h4f9xvm4v"
},
"stable": {
"version": [
@@ -70056,14 +70087,14 @@
},
{
"ename": "magit",
- "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953",
- "sha256": "0k40mk3q5a08ay4sqhh0lmfpjx6zn9van08yjhaw24ayi6l6a78w",
+ "commit": "40dc61c315a69179487aa14e93acd48aa24d0008",
+ "sha256": "0c3gkp4l3y10gj6231w3x6zg5ybkfal4dp7hvjynaspgq5qkfsx5",
"fetcher": "github",
"repo": "magit/magit",
"unstable": {
"version": [
- 20230401,
- 1245
+ 20230416,
+ 1739
],
"deps": [
"compat",
@@ -70073,8 +70104,8 @@
"transient",
"with-editor"
],
- "commit": "dd2e870b134bd292e470c830a42ce59a4396cdb7",
- "sha256": "14rwava30c1mg0d2mifb34k52qdblc59nznb7vdhqdy6fbl3f2dl"
+ "commit": "f59df798194d4213b5a2b2f43a2ee25b71cbbb90",
+ "sha256": "1cfnm27091csyrqrrq9ghlf27vagdyxcd2zxvi2m95j6ym55dpsb"
},
"stable": {
"version": [
@@ -70101,15 +70132,15 @@
"repo": "magit/magit-annex",
"unstable": {
"version": [
- 20230319,
- 2103
+ 20230407,
+ 1200
],
"deps": [
"cl-lib",
"magit"
],
- "commit": "f1bf48d79e51805a017e9c1501f4fb3698c3f310",
- "sha256": "0ajggvig6vrazfa5zyrzi7fws4fp6lgiz6qa4m8h0c411dr6hlxl"
+ "commit": "255e443e19a32e716ff414e09ad5e00f6f8bc8fb",
+ "sha256": "1l4fwvlgw8pfrvdws29b8pghk58yb70wfywh0rfvaw30ymv4v2n2"
},
"stable": {
"version": [
@@ -70133,14 +70164,14 @@
"repo": "ideasman42/emacs-magit-commit-mark",
"unstable": {
"version": [
- 20230214,
- 1821
+ 20230420,
+ 304
],
"deps": [
"magit"
],
- "commit": "6ed61986ae28c01d0f8c4f2bcff8ab70707488df",
- "sha256": "1fhz29rsyggfqjb140v96i52p7vmxqs0wcxiqjhpjmim4ks3kq31"
+ "commit": "8c0ea6c2e25ae0d47f15ae9067874a0605c00704",
+ "sha256": "09dh1jk54rpqyf10jxh9vcj4si18f3nsq7x32zsgm7lwngsgx6sy"
}
},
{
@@ -70771,21 +70802,21 @@
},
{
"ename": "magit-vcsh",
- "commit": "9ee290ad797511ccc4ee2e1d3d773672796da3f9",
- "sha256": "025ggdb40js7nmg0fqw3ncki4krswwyvl4q1m8250k09g5r57zij",
- "fetcher": "gitlab",
- "repo": "stepnem/magit-vcsh-el",
+ "commit": "6f503b0d55c1c833b503d68f2169ddda63dfa371",
+ "sha256": "005g4c1lwwfnqb8pnzj01z9ll151m9b2jbb3knp95xfbn8avkqs3",
+ "fetcher": "git",
+ "url": "https://git.smrk.net/magit-vcsh.el",
"unstable": {
"version": [
- 20190817,
- 2014
+ 20230402,
+ 1219
],
"deps": [
"magit",
"vcsh"
],
- "commit": "fcff128cdbe3ef547dc64f2496cb6405b8ee21ca",
- "sha256": "0x0dwl163qpws5d6h628if8iyzzxig9f7j1n7q6fxkbymx0js0vj"
+ "commit": "fd6c86c066b14bbf78644d38eca9711d6d9544a1",
+ "sha256": "0mq437z9ng2i2amkv26bw9ak7ddw40h2q4wmpf517bv2s7qxfgi1"
},
"stable": {
"version": [
@@ -71389,25 +71420,25 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20230317,
- 926
+ 20230421,
+ 841
],
"deps": [
"compat"
],
- "commit": "2633b2dee22261531f960e49106771e679102a98",
- "sha256": "17wsqdilaql1s8mffa245d7wqp15bm3cxacjwshm5cqr2x1scbbj"
+ "commit": "c21a8ea5da034e9f323b68f9d062d9374cd4ee7e",
+ "sha256": "0vr6kkgjr5iwcg9vzaxwcv5sxx8zj7khbk29y182iwrg0akhhl2y"
},
"stable": {
"version": [
1,
- 1
+ 2
],
"deps": [
"compat"
],
- "commit": "ccf573e2145d9deb9d734432351eefc87fc1bc16",
- "sha256": "0zi3q7dd9dgrhbz6ww270i43kkqs0ddk0vzs89mfvwa5pzw32d2q"
+ "commit": "4c7b852b183e10dc437c7e41a7ef37cf3ccd8db1",
+ "sha256": "0zf88pvjs3v231rpk4km03n19xyfx6hn0fny08y4pv42dz3xkcwg"
}
},
{
@@ -71515,11 +71546,11 @@
"repo": "jrblevin/markdown-mode",
"unstable": {
"version": [
- 20230331,
- 913
+ 20230412,
+ 126
],
- "commit": "ad3a816f7be97deb83fc0a7fa41305c79009bac5",
- "sha256": "1w22vbf8f5j0fx8yhh1d6k9x5gybv33cfj25fh8hdv8mc8l6iqm1"
+ "commit": "5d98592fe516748034d8baf92d7c0ba045e1f87a",
+ "sha256": "1ij2xj9c410wl5pgjz85cv6qz7458hbdbfj6920p6qf18fwz62wb"
},
"stable": {
"version": [
@@ -71845,16 +71876,16 @@
"repo": "martianh/mastodon.el",
"unstable": {
"version": [
- 20230401,
- 2008
+ 20230418,
+ 1659
],
"deps": [
"persist",
"request",
"ts"
],
- "commit": "e4ccc526baf011ad60ef978aef83de2ee2e9f506",
- "sha256": "13msakm7lpmpkpkm78v8ba11sjbhqxpjd9k6krdvx9wfd8z4kigl"
+ "commit": "e27a5d2c621be81e33a32b27d1f7cc79f82d8eb1",
+ "sha256": "0p2j5hr5wad04040rmm331c2fid3f4dr2an8yjv2y6q1pzrmg4xx"
},
"stable": {
"version": [
@@ -72005,11 +72036,11 @@
"url": "https://git.code.sf.net/p/matlab-emacs/src",
"unstable": {
"version": [
- 20230120,
- 1938
+ 20230408,
+ 1210
],
- "commit": "4cf540990f1f568c513162a0103b2b00c3d1ae43",
- "sha256": "0ypm3kl67025wr7wfvgl9l9ig00kz0kpr9544g4dw92yq4wp5504"
+ "commit": "bda900fd75ee2e507f56e411f54dc1512675559f",
+ "sha256": "15m8r5n2dslcpghxyc0pryirg4gx0si8mwhbnj8lr7kw2zrv7p03"
}
},
{
@@ -72534,11 +72565,11 @@
"repo": "meow-edit/meow",
"unstable": {
"version": [
- 20230327,
- 524
+ 20230421,
+ 1304
],
- "commit": "d80c2ff2f94333492dd7714c4210440162985b20",
- "sha256": "19cz5rfl4j656w9w3nzw1442vb17128lp0ipgjdd6ggc3w7sa9lp"
+ "commit": "5b51f87a8898cc225e2fb0f35d194d4a3f684dbc",
+ "sha256": "00ail3qs45ksniisynr3iv2w8c0n2q0pgzn09z20z2h2lf0vklsq"
},
"stable": {
"version": [
@@ -72970,25 +73001,25 @@
},
{
"ename": "mew",
- "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
- "sha256": "0yh1z3y58mrl053biy3awrawy4k94vz3gp0bl5h4mbxwkdvpjz65",
+ "commit": "40d2c8827d3c88cfaee8aa68888cc81368622534",
+ "sha256": "0li30xfxbxhhxyjvzlqbwxn640n9gpfsr16n9xnx9zbhvi2divj4",
"fetcher": "github",
"repo": "kazu-yamamoto/Mew",
"unstable": {
"version": [
- 20230209,
- 1231
+ 20230415,
+ 633
],
- "commit": "2f9143f5865cdbd31701be58093961b41def0edc",
- "sha256": "0535p05iggc20p168lniy42c5zlvj5j7gpny4yfm75b8b8h6zk11"
+ "commit": "47886a3b6bc64e5822546318e5a3dd0ff5eeb967",
+ "sha256": "0avzxdlj027pyfs3is8kj4kwgyrl2b6r2n7a0pcbag09f71f8nhi"
},
"stable": {
"version": [
6,
- 8
+ 9
],
- "commit": "6a5d6bb11e5e1a239ee7db114a0e76b40e5a247e",
- "sha256": "03sin2l8g8npz3j6019xv5r71j9gzmczb16cyvd5304kibwrwa0w"
+ "commit": "69a395ec481c66fece53ec07e6a02d82f9e403ee",
+ "sha256": "1y7l5d2c07dhq2rfq5rdpfd2zvpb1gv971sdwdc3m06iy6qrq9fs"
}
},
{
@@ -74187,11 +74218,11 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20230331,
- 1210
+ 20230421,
+ 1024
],
- "commit": "081093922d36b920b4e8a0ba0d5e70d1cefbf643",
- "sha256": "1hfinmjbwzk1pvwlc9adriwl7k29cpg4jf24q737s0s73lhwl6ds"
+ "commit": "b3f39e8d10cd18beb33190629821c2980703aa82",
+ "sha256": "1l5iq8sq4azb11fr95fhpvv11a1vn7d35msjsfhnhl9i0ji8h788"
},
"stable": {
"version": [
@@ -74378,11 +74409,11 @@
"repo": "ideasman42/emacs-mono-complete",
"unstable": {
"version": [
- 20230401,
- 258
+ 20230405,
+ 529
],
- "commit": "37036a643372960937b08b92675b2983809aea40",
- "sha256": "051wmv9xl4q997jk51b9hb0fv1nmfjybr9izym7aqlbc14yk3gyz"
+ "commit": "29436788b9ebe8a147b1deece6e86151528880f5",
+ "sha256": "1x423ga1p8svfwizaj3bd84q2f3qnvlq880zrni7r2fh3jizxwqf"
}
},
{
@@ -75522,16 +75553,16 @@
"repo": "lordpretzel/mu4e-views",
"unstable": {
"version": [
- 20220214,
- 358
+ 20230105,
+ 1443
],
"deps": [
"esxml",
"ht",
"xwidgets-reuse"
],
- "commit": "84a17bb3d725cb8b37cd700a6b88fbf98f5ca094",
- "sha256": "05ygjbr6vbkji5jh1vyyyxh8inc8qis95xwp9zdjwc57dzjb2kah"
+ "commit": "ba223d69fa9edf7b039bd728f4630c64b08c39ff",
+ "sha256": "0ss7ipp80wflrhxa1x974bb9gvc8fnrrcdzf8gzxzlabgw1qsjwl"
},
"stable": {
"version": [
@@ -76353,11 +76384,11 @@
"repo": "kenranunderscore/emacs-naga-theme",
"unstable": {
"version": [
- 20230304,
- 551
+ 20230418,
+ 1210
],
- "commit": "3b5a6eb800a78df66a8e1c08c2465110ec36c10c",
- "sha256": "0hzqzr1fdys4v0lad24ns9gj58ha69j2qlj5ir2l1gsa3c961dgc"
+ "commit": "5cf1ecaa052d3bdaee93ad5e98bb4f5346404b3f",
+ "sha256": "1vp5i7rvpjxmdz87yxajp426k0mlpg1pd90m8p2x7ifh50zjqdyq"
}
},
{
@@ -77048,6 +77079,39 @@
"sha256": "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0"
}
},
+ {
+ "ename": "nerd-icons",
+ "commit": "9f085398787d6175e4992d70bd6bd796b445865c",
+ "sha256": "19hazsj5qw702nq2si6ar11d6i0n28l0qwjm67rpbf4rjj5ksdji",
+ "fetcher": "github",
+ "repo": "rainstormstudio/nerd-icons.el",
+ "unstable": {
+ "version": [
+ 20230416,
+ 1842
+ ],
+ "commit": "2ff304882c1c809713fc2b904b0309bfdb507b7b",
+ "sha256": "0vh13pbpb3d56ayxm7sp5z2dzb2k2g2y17c3zqr75crf676xjjck"
+ }
+ },
+ {
+ "ename": "nerd-icons-ibuffer",
+ "commit": "af87c310b6efce1ec86ce05538f593bdf0c4fe18",
+ "sha256": "100m10m9ksj03xsg50aiqm1pp48gar5jy4b883wxafx5r64akz2h",
+ "fetcher": "github",
+ "repo": "seagle0128/nerd-icons-ibuffer",
+ "unstable": {
+ "version": [
+ 20230413,
+ 1926
+ ],
+ "deps": [
+ "nerd-icons"
+ ],
+ "commit": "a38ed22c1d69647705588467a0f42c3c50b9585b",
+ "sha256": "1278n7gbgck15p381dkk5cb4mxdij64bxhfmq3qnsn7xz0zv2c89"
+ }
+ },
{
"ename": "nerdtab",
"commit": "59bc273db1d34997ea5d51cc6adc33ec785bc7f3",
@@ -77349,11 +77413,11 @@
"repo": "nickel-lang/nickel-mode",
"unstable": {
"version": [
- 20230330,
- 1206
+ 20230406,
+ 910
],
- "commit": "b909b815949516f806a56d59a14ee5e43be02952",
- "sha256": "06s9i21i2v729gclsx5jx1k2078kqb97f6kfam1f3n7lixdb3kwj"
+ "commit": "fea2152d591e46e19e4be6a7aca7fb0b1de15dd0",
+ "sha256": "055vcf2b03s0mvyar9bp3hfkwqk831bm5yihgx3sxcm95a19jyyn"
}
},
{
@@ -77485,11 +77549,11 @@
"repo": "mrcnski/nimbus-theme",
"unstable": {
"version": [
- 20230219,
- 1337
+ 20230421,
+ 1419
],
- "commit": "b28256c3a3d3d316d09e63a1fdd0817db110c3ce",
- "sha256": "11cxg4n95kw1824mcaifgz2w6akhq37cy00xmrz2b94fwpnf3dml"
+ "commit": "e19ba253a277e164d3a579067c94a71ec65209ac",
+ "sha256": "1fzf0yg0brl98awhljianwahlj8hs0pa86i2cqa92cwnk4rrp0ki"
},
"stable": {
"version": [
@@ -77930,26 +77994,26 @@
"repo": "emacscollective/no-littering",
"unstable": {
"version": [
- 20230220,
- 1519
+ 20230420,
+ 2222
],
"deps": [
"compat"
],
- "commit": "b1ba75ab9296ada356219ff8ae26333a79871c61",
- "sha256": "0v1p6zwxkjfbk52l927wnlflnj0r25z7jyf2pjc1c39p9yg6gwl5"
+ "commit": "6db8c576bd5fe0516a5b91066a0f44cddce51eae",
+ "sha256": "1vkypj2mm428kmawxnyaqg3v5xpcs5hkbmyvjkib8ib02psshxd7"
},
"stable": {
"version": [
1,
- 2,
- 7
+ 3,
+ 0
],
"deps": [
- "cl-lib"
+ "compat"
],
- "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7",
- "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24"
+ "commit": "6db8c576bd5fe0516a5b91066a0f44cddce51eae",
+ "sha256": "1vkypj2mm428kmawxnyaqg3v5xpcs5hkbmyvjkib8ib02psshxd7"
}
},
{
@@ -78156,8 +78220,8 @@
20230311,
1131
],
- "commit": "f9c6ee5928250bc87834bb85e7fabd47b882ca84",
- "sha256": "0l6mpg7gcfg1474m7skfyglcfpaw6bghm442m6jfm8d2bz7ac1g9"
+ "commit": "5335a7e782fd4ea5b33cd630feae37d902709024",
+ "sha256": "144mxg8dialcn1q9skryrmqp5ipfnd1npm0jb5fzl5zw4pfnf3im"
},
"stable": {
"version": [
@@ -78169,6 +78233,30 @@
"sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711"
}
},
+ {
+ "ename": "nordic-night-theme",
+ "commit": "11254a9e0d387eb6a50a0a9cc09dccc7f667115d",
+ "sha256": "0wbpw6344ncpv2d578g7wqr1fvn057ryl3sp3mg9wpah36fi5g0v",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~ashton314/nordic-night",
+ "unstable": {
+ "version": [
+ 20230417,
+ 1414
+ ],
+ "commit": "689b124e60b56de7d3ad88d2b474c871bbadc6be",
+ "sha256": "1rjwylzb97fksxzl2v00cqd6szyck53wykvfvp0cp73y0nj3gc70"
+ },
+ "stable": {
+ "version": [
+ 1,
+ 0,
+ 0
+ ],
+ "commit": "689b124e60b56de7d3ad88d2b474c871bbadc6be",
+ "sha256": "1rjwylzb97fksxzl2v00cqd6szyck53wykvfvp0cp73y0nj3gc70"
+ }
+ },
{
"ename": "nordless-theme",
"commit": "a3645b08cb46e3d91081da7baa982b5283918447",
@@ -78448,14 +78536,14 @@
"url": "https://depp.brause.cc/nov.el.git",
"unstable": {
"version": [
- 20230327,
- 1739
+ 20230421,
+ 1548
],
"deps": [
"esxml"
],
- "commit": "6c992c2c5c4ad03a0f432a74fe4d0cde3b6da4bd",
- "sha256": "1lhb78hkpa7l0psqlcfdv114zvw8cqg52b64im18i307k4z2m8bw"
+ "commit": "58c35e677e11f5c04a702b42ac753c80c8955089",
+ "sha256": "1vzgbhfd2pz4khamgifhbfz7094kp9nf00d1v1d0smzdw4wgzawj"
},
"stable": {
"version": [
@@ -80263,15 +80351,15 @@
"repo": "xenodium/ob-swiftui",
"unstable": {
"version": [
- 20221231,
- 1941
+ 20230421,
+ 1542
],
"deps": [
"org",
"swift-mode"
],
- "commit": "0b453efeb8310311d7f722a0f2dce41c14d4090e",
- "sha256": "0y6yafam7zdhc89c4q76ipb8jmlw9rhvps4zp6l0wppdkyb520yf"
+ "commit": "da6bd8d13da6bf6b949c4c9b1d4754fecb0345c7",
+ "sha256": "0f8nshmllp8pp8za23kv5cyaim466v659rzwvykda75d08cv4pa8"
}
},
{
@@ -80477,11 +80565,11 @@
"repo": "ideasman42/emacs-theme-oblivion",
"unstable": {
"version": [
- 20230306,
- 1
+ 20230415,
+ 551
],
- "commit": "b1181a024a1c2295a42915c0110ac9816844aff6",
- "sha256": "1mivad94fkwgrydgpby3xzql5v4vrh2lf9a525ca5f4xvdqbx4sv"
+ "commit": "f0b180eeb5ed19bacbce9d6a39e3123f4751f54b",
+ "sha256": "03xr38xdsjxlcfbw2637wwiwadymhb60pc9ik0zzk69d2ks097k2"
}
},
{
@@ -80492,8 +80580,8 @@
"repo": "licht1stein/obsidian.el",
"unstable": {
"version": [
- 20221228,
- 1142
+ 20230420,
+ 1111
],
"deps": [
"dash",
@@ -80502,14 +80590,14 @@
"s",
"yaml"
],
- "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c",
- "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn"
+ "commit": "1214758b99037884c4c062e6d298b417200444cd",
+ "sha256": "0idxgfk2hcgnbjg31lvn1s2glfj1xy0calb8s3k32znnsyjz4kyb"
},
"stable": {
"version": [
1,
1,
- 10
+ 11
],
"deps": [
"dash",
@@ -80518,8 +80606,8 @@
"s",
"yaml"
],
- "commit": "d9fdc5e2b7ee6602ac99511d670a382c5586f14c",
- "sha256": "0h3503m4qygjshzmhijs9agpfgf1xyp412bp77sgpijyspln9mpn"
+ "commit": "1214758b99037884c4c062e6d298b417200444cd",
+ "sha256": "0idxgfk2hcgnbjg31lvn1s2glfj1xy0calb8s3k32znnsyjz4kyb"
}
},
{
@@ -80545,11 +80633,11 @@
"repo": "ocaml-ppx/ocamlformat",
"unstable": {
"version": [
- 20230306,
- 1907
+ 20230420,
+ 1458
],
- "commit": "651f767b48e14ba6b24db9421306942d9e51adcc",
- "sha256": "00jfipp5ibz6yp5ismwnhq0gqlgwnsb2i4k2i64h9drq30pdcdzz"
+ "commit": "ee9cdd7e19298dc025d77212cab11b3d97b9972f",
+ "sha256": "1wzb6p3kjzjv1dszvsyw7xhdc4g8pzj16yvxah2aiwwdwqqiywnk"
},
"stable": {
"version": [
@@ -80742,26 +80830,26 @@
"repo": "oer/oer-reveal",
"unstable": {
"version": [
- 20230313,
- 911
+ 20230403,
+ 1322
],
"deps": [
"org-re-reveal"
],
- "commit": "d281566d476229fabaab6bc127b6b5f6c26834b6",
- "sha256": "1sg15a4hb60jj3j5i8nr0b2w4gjd20n3msn5l667zmcsv8mwhl1v"
+ "commit": "f7b0d952c9ab0969dbb9c003df4f298ec9d3ee79",
+ "sha256": "0q1jsgfm7x4fwismbnjqss11bc4lvbniqfx6w5nvg403dz7g04aj"
},
"stable": {
"version": [
4,
10,
- 3
+ 5
],
"deps": [
"org-re-reveal"
],
- "commit": "d281566d476229fabaab6bc127b6b5f6c26834b6",
- "sha256": "1sg15a4hb60jj3j5i8nr0b2w4gjd20n3msn5l667zmcsv8mwhl1v"
+ "commit": "f7b0d952c9ab0969dbb9c003df4f298ec9d3ee79",
+ "sha256": "0q1jsgfm7x4fwismbnjqss11bc4lvbniqfx6w5nvg403dz7g04aj"
}
},
{
@@ -81658,20 +81746,20 @@
"repo": "rksm/org-ai",
"unstable": {
"version": [
- 20230330,
- 2333
+ 20230418,
+ 100
],
- "commit": "15b904dd58914d36a54df53c8ac1e1961a361fb4",
- "sha256": "0z9l9hm1bshy4aphnbawlbbj2xwrr59ndl2yh7x7pj96xj6gldza"
+ "commit": "a3daf1be29839752979fa983d3673e3321c197e1",
+ "sha256": "11pm51axwrsizcw4nmcqjx7f5d0clgj67v1004pmzf2pvvbimqij"
},
"stable": {
"version": [
0,
- 2,
+ 3,
2
],
- "commit": "0ea3dc9fec82de6bad1a4d880502783a06511e3d",
- "sha256": "1gxipqa7rr984pqm3qcr3gialkg12xn3wmqj29in1h3g2pkyb08k"
+ "commit": "a3daf1be29839752979fa983d3673e3321c197e1",
+ "sha256": "11pm51axwrsizcw4nmcqjx7f5d0clgj67v1004pmzf2pvvbimqij"
}
},
{
@@ -81966,11 +82054,11 @@
"repo": "charlesroelli/org-board",
"unstable": {
"version": [
- 20200619,
- 1016
+ 20230408,
+ 1041
],
- "commit": "1393bd46d11a81328ed4fb8471831415a3efe224",
- "sha256": "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b"
+ "commit": "500fe02bc114e5b535a2eb2ab73954d79428168f",
+ "sha256": "1mcghw9mmlyqsgxk97hd57495sfx8dp6ig7qgs5xn2b2k0ygv4vf"
},
"stable": {
"version": [
@@ -82108,14 +82196,14 @@
"repo": "dengste/org-caldav",
"unstable": {
"version": [
- 20230331,
- 11
+ 20230421,
+ 1620
],
"deps": [
"org"
],
- "commit": "618bf4cdc9be140ca1993901d017b7f18297f1b8",
- "sha256": "0prvf2qcb48a2c557bm79npihpgc46w7afr4sircg52v6qzdhbc6"
+ "commit": "1efb8affe65e70cb2a5437014df3bc8a29922e9f",
+ "sha256": "1mwcpqiw1myd7lv5fxww2a1lz8s88z4aywa6m1drqr8rhbbyxydl"
}
},
{
@@ -82993,8 +83081,8 @@
"repo": "Trevoke/org-gtd.el",
"unstable": {
"version": [
- 20230308,
- 1416
+ 20230420,
+ 1244
],
"deps": [
"f",
@@ -83003,8 +83091,8 @@
"org-edna",
"transient"
],
- "commit": "fdc13dc8a5336d933a8a3e8c1c3c4ac6f7838dc2",
- "sha256": "0d31b0yl8frswspghnd3k2iaan54cn4r6gyjdcp8kibjxc7zsynx"
+ "commit": "a6aca52a7dea498be515ec9fd9285a0dabe01ee5",
+ "sha256": "0cld61dihqsx0m0fc84acz9ch288pfgszih51plidsf5khclb6yc"
},
"stable": {
"version": [
@@ -83031,11 +83119,11 @@
"repo": "ml729/org-habit-stats",
"unstable": {
"version": [
- 20230210,
- 1859
+ 20230412,
+ 515
],
- "commit": "0e28b1c1ba330d7d07064a7272104f7e793be4ce",
- "sha256": "0mybc4vghyicvn1gmnhw9ljny56cbhmyk21mia5q478pin6krscl"
+ "commit": "9cb389f1c409d1f7aaea28378b4d7c7e975aefd4",
+ "sha256": "182xj29gsdl726rj1npgwyi7jycd2vzllm16nl111h0h8zkdcq26"
}
},
{
@@ -83200,14 +83288,14 @@
"repo": "shg/org-inline-anim.el",
"unstable": {
"version": [
- 20211101,
- 413
+ 20230331,
+ 1048
],
"deps": [
"org"
],
- "commit": "1808574ff04ed66b7382247f3f13815fae2a4929",
- "sha256": "1h1ha5njzv2ibp11dbka8lqx6d3q4hqjz11vzi4yi4x4ksiczqrc"
+ "commit": "9316fe78319fa18c7282993bd547cd33fda1b8ee",
+ "sha256": "1513rdzbdl6f1gdf5xf65514361ni2jjcbmygsk4l16hnbdbzdhl"
},
"stable": {
"version": [
@@ -83298,16 +83386,16 @@
"repo": "ahungry/org-jira",
"unstable": {
"version": [
- 20230329,
- 1527
+ 20230413,
+ 441
],
"deps": [
"cl-lib",
"dash",
"request"
],
- "commit": "2ca5df517ca6f47703408b056fde14ac0340cc9e",
- "sha256": "0haznsyyx9y3k43kjcdb11jn9izmyq7hkv3zq5z66qb9wxr2rd8b"
+ "commit": "63a74d4458f512f0825e9f55491baad3ee4e9c4b",
+ "sha256": "0hk1w0bsf100qc3wvfa2a90qi98g0fz9hw1lpp34m71cig1wz5lj"
},
"stable": {
"version": [
@@ -83485,14 +83573,14 @@
"url": "https://repo.or.cz/org-link-beautify.git",
"unstable": {
"version": [
- 20230311,
- 1220
+ 20230415,
+ 158
],
"deps": [
"all-the-icons"
],
- "commit": "5e596819a82198212dfb461a8a3b61ebbee97835",
- "sha256": "14l23v5dgksbxk1bi8121l662kgvpkv33297mjx5lg3wyibcf8pa"
+ "commit": "162ef0c4be39ef7cfbdd599b6b502b9f2dd95f67",
+ "sha256": "155s7771kr2pndas99kimw4ddk02g1pcyxg6f3wdq44jx6mn8vxb"
}
},
{
@@ -83680,30 +83768,30 @@
"repo": "ndwarshuis/org-ml",
"unstable": {
"version": [
- 20230401,
- 230
+ 20230410,
+ 30
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "d1a942df35c0b37413ac335f89651cf46688df79",
- "sha256": "0yj50kppphjf6mga90qzqfrhkcnix61azz0zinnajkk7px63yhs8"
+ "commit": "f57336a9126a168ad32ccce017c072474555395a",
+ "sha256": "16j03fdikha5hwg8ifj0shsn4prbgf7dsggy3ksidpl63w3g05h4"
},
"stable": {
"version": [
5,
8,
- 7
+ 8
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "ca6a395f4a285893222c15296e6a8c2d1087d899",
- "sha256": "0yj50kppphjf6mga90qzqfrhkcnix61azz0zinnajkk7px63yhs8"
+ "commit": "7a7b1e918e8440f3f6ddb37db9bd1471d0dad37d",
+ "sha256": "16j03fdikha5hwg8ifj0shsn4prbgf7dsggy3ksidpl63w3g05h4"
}
},
{
@@ -83732,14 +83820,14 @@
"repo": "minad/org-modern",
"unstable": {
"version": [
- 20230312,
- 852
+ 20230410,
+ 1751
],
"deps": [
"compat"
],
- "commit": "b614ad31d72c49f9eb29d3836995fd7fb0d1fd4a",
- "sha256": "16c74vff882rx8yp4ybaydlg5774xz68iasajhidbn0fb4fhz8ph"
+ "commit": "04ee69abdf928df18f50a48bf465d140c8876d85",
+ "sha256": "1x64429hj909cvck2yc1n1n2aqzpi561z2vhknrf0nwabjdkvjng"
},
"stable": {
"version": [
@@ -83792,14 +83880,14 @@
"repo": "bpanthi977/org-mpv-notes",
"unstable": {
"version": [
- 20221202,
- 1657
+ 20230414,
+ 500
],
"deps": [
"mpv"
],
- "commit": "8c123996044cfb87101da6c5f16634188f019cca",
- "sha256": "1nr4n74c5l2azgyv3w828g6n8p3bjfrs8s6b37j87v9vscc24mic"
+ "commit": "215bd0fdbb8593e555231309dd11a96af7e98a33",
+ "sha256": "16dgs8nzh234fds8b15fba9f2bdgwyv986fgp5f6fhqzibpr3536"
}
},
{
@@ -83926,15 +84014,15 @@
"repo": "org-noter/org-noter",
"unstable": {
"version": [
- 20230330,
- 2301
+ 20230404,
+ 307
],
"deps": [
"cl-lib",
"org"
],
- "commit": "870109330a337751e44042d1b407d90d42ca9130",
- "sha256": "1gydq8ajswmyb6xkmwqrqsnhh91m97p6bh0yw7pqfn74cx16a1kz"
+ "commit": "a24ba82f5c9ad2f2a93bd71ab60b78547a94463d",
+ "sha256": "0g33541xwxqcg6zal6pd8b3v4lrkw08jcf4h35mpzi90hvyk4rav"
},
"stable": {
"version": [
@@ -84692,10 +84780,10 @@
},
{
"ename": "org-redmine",
- "commit": "017a9dd8029d083ca0c1307f2b83be187c7615e5",
- "sha256": "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv",
+ "commit": "189b7c9684c2c737407cc61006f7488963a257af",
+ "sha256": "0cl0awvsm9vsbmaf44fqxwhzlwfnsjrs4qq88q9s07lc87i9b0x7",
"fetcher": "github",
- "repo": "gongo/org-redmine",
+ "repo": "emacsorphanage/org-redmine",
"unstable": {
"version": [
20160711,
@@ -84713,8 +84801,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20230312,
- 1711
+ 20230421,
+ 1507
],
"deps": [
"avy",
@@ -84729,8 +84817,8 @@
"parsebib",
"s"
],
- "commit": "1af17e6df1a8ad967352edff0223cd8d3cf55836",
- "sha256": "0j5pkyq1hkcz13fb13ygl7n9fzg3p0wp87f9vyi0y677f0d89irs"
+ "commit": "67c015c778380712acef6fda64ca2daee06b8214",
+ "sha256": "0mzmjcsia1x5njx6pixbgzdlkxiz1q53ypb9xjbnlqbd4mvqldhw"
},
"stable": {
"version": [
@@ -84853,20 +84941,20 @@
"repo": "unhammer/org-rich-yank",
"unstable": {
"version": [
- 20220227,
- 2154
+ 20230421,
+ 1106
],
- "commit": "4bcd030f0d736d77c647955739b61fae541417e9",
- "sha256": "11j7ywvhsi4a4ayapxqccvag8sraw168pwwq4s3a0f98yzknd9h9"
+ "commit": "0a74fb742fcdf9560d954b40e2f49551476dee4f",
+ "sha256": "0cajgkfcwqgqdqyqf01hxji28n27jmj9nf0w3rbyw6l5dffgch0n"
},
"stable": {
"version": [
0,
2,
- 1
+ 2
],
- "commit": "d2f350c5296cf05d6c84b02762ba44f09a02b4e3",
- "sha256": "0gxb0fnh5gxjmld0hnk5hli0cvdd8gjd27m30bk2b80kwldxlq1z"
+ "commit": "0a74fb742fcdf9560d954b40e2f49551476dee4f",
+ "sha256": "0cajgkfcwqgqdqyqf01hxji28n27jmj9nf0w3rbyw6l5dffgch0n"
}
},
{
@@ -85017,8 +85105,8 @@
"repo": "tyler-dodge/org-runbook",
"unstable": {
"version": [
- 20230330,
- 325
+ 20230411,
+ 1806
],
"deps": [
"dash",
@@ -85029,8 +85117,8 @@
"s",
"seq"
],
- "commit": "3de6e4e31cd240a2ba128287a3d1bc550c253144",
- "sha256": "0cvyilxds02mqp8vrp07kbpfzphz3wdsp0v7nv35vw6sx3n4l6nm"
+ "commit": "f9dcc1c9262752a2ecb561578fa01d58f8ad32aa",
+ "sha256": "0975z2rvjpcfxbnd5i08y49y4rhh29k4hk4g5wfpy7cnj4kh6p7a"
},
"stable": {
"version": [
@@ -85540,15 +85628,15 @@
"url": "https://repo.or.cz/org-tag-beautify.git",
"unstable": {
"version": [
- 20230331,
- 240
+ 20230402,
+ 554
],
"deps": [
"all-the-icons",
"org-pretty-tags"
],
- "commit": "d6a9bb1431e848bcf8cb8f07c9290d29d039814d",
- "sha256": "0zmqyq1i21238j60x7p1dihhfx6r7m0c3vizb9x2qvfnga0v19mc"
+ "commit": "a9ec18a5b8132178b1c9f5a9e00680f4af295ba3",
+ "sha256": "03s266mlpgq1fy9gmmjfxx0m4hvh1qvvr0ysk3sm0qngvrb104p2"
}
},
{
@@ -85662,6 +85750,24 @@
"sha256": "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a"
}
},
+ {
+ "ename": "org-tidy",
+ "commit": "47c3731d47cd408457a677230d525e7ba6baf7c0",
+ "sha256": "0k8hm6vlmwzvqjfs0yh8jxgizlmfrd7crc4p29lizp4dfp17b1fj",
+ "fetcher": "github",
+ "repo": "jxq0/org-tidy",
+ "unstable": {
+ "version": [
+ 20230404,
+ 1119
+ ],
+ "deps": [
+ "dash"
+ ],
+ "commit": "2acf3f9b132bed43ae1c869140bdcc4d2fb7e0eb",
+ "sha256": "1x6pkhr4isyw3b0gzpdjya09m2wizrllyzzk5ki7zgjlqkzcpb94"
+ }
+ },
{
"ename": "org-time-budgets",
"commit": "776b58b433ab7dde5870300d288c3e6734fc32c0",
@@ -86647,20 +86753,20 @@
"repo": "tgbugs/orgstrap",
"unstable": {
"version": [
- 20230327,
- 650
+ 20230408,
+ 2232
],
- "commit": "045600b52dc5277b4fe4ec11fe140b1e7240f1f9",
- "sha256": "0w9qylxy97ha2wmp3hz6ipiydff4hkpa54cwz52dv1lzl9xcbz84"
+ "commit": "f35bccde556b0f82515e79ee69f4379469276356",
+ "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52"
},
"stable": {
"version": [
1,
5,
- 3
+ 5
],
- "commit": "3cf0fec936fc0dc72bd7bd970fa91d445e763af4",
- "sha256": "1kljqbwjz102igpygijxnrs0cmiwn1xnyxn7fxqblfb1l7s29dkw"
+ "commit": "f35bccde556b0f82515e79ee69f4379469276356",
+ "sha256": "1z0zwx2ccyzd5rk93xffz3h9c8b8riadkx5n9k38p2agnsq07h52"
}
},
{
@@ -86879,25 +86985,25 @@
"repo": "minad/osm",
"unstable": {
"version": [
- 20230314,
- 155
+ 20230417,
+ 1827
],
"deps": [
"compat"
],
- "commit": "8246774ad883c097dd63e95f114bbc825ac04cff",
- "sha256": "0dih2nsyfybbnksr89ljma9sm8yny2dw943wdwfd3ygnhjd2sblp"
+ "commit": "ce8512d793cbe99f2406551bc84ad534a7a37893",
+ "sha256": "1g4scrk7cgdlfyfaycq0576p5kiycy2jsq3iigppz7iky3xiqa9c"
},
"stable": {
"version": [
0,
- 10
+ 11
],
"deps": [
"compat"
],
- "commit": "c3fbc813f2e76c71056bf6e28ae3a997f33718d1",
- "sha256": "07caffh30sgmcbhxqk3wfpml3310ldvwkqbh19czq7nx4llynixc"
+ "commit": "ce8512d793cbe99f2406551bc84ad534a7a37893",
+ "sha256": "1g4scrk7cgdlfyfaycq0576p5kiycy2jsq3iigppz7iky3xiqa9c"
}
},
{
@@ -87184,14 +87290,14 @@
"repo": "tarsius/outline-minor-faces",
"unstable": {
"version": [
- 20230312,
- 1635
+ 20230407,
+ 1051
],
"deps": [
"compat"
],
- "commit": "02170814fe6feb14b31cf00af7c8c2df5918fd12",
- "sha256": "0v43b1zww673fv1ydh1cb1lwsz59jkd0aspi2ndnnyy2qd3vfnnp"
+ "commit": "0e7cd26d4ebe9a1c842645bd3535fc835d16fdf4",
+ "sha256": "07wkhs546j3xnlwpvndf17bk5h4ah2xm51gbqvgzklm1ah91dp14"
},
"stable": {
"version": [
@@ -87871,16 +87977,16 @@
"repo": "zzamboni/ox-leanpub",
"unstable": {
"version": [
- 20201129,
- 2027
+ 20230415,
+ 2139
],
"deps": [
"org",
"ox-gfm",
"s"
],
- "commit": "8a00843a2a58e0c43cb53080d1005c619e4a9c88",
- "sha256": "0yxzhgjkipy632jhw83l8cz5s7727m87sj6ldpzdh57w1abklidq"
+ "commit": "e8cd440632fd46812d7311360f565828a12380b7",
+ "sha256": "0v2lrmak1lhaccwm2a68z4w554ng38wpk0sbw2qaj8qn03gv9dn4"
}
},
{
@@ -87891,11 +87997,11 @@
"repo": "DamienCassou/ox-linuxmag-fr",
"unstable": {
"version": [
- 20230215,
- 2020
+ 20230417,
+ 1134
],
- "commit": "2c06d5441e9e67c3ce419bc84b1d4612f64ff40b",
- "sha256": "0azg5c7q3dl8v8162x9nmanh55f9drfkclmrhawmnjbk0m2sj8la"
+ "commit": "4eeebd75349853e3131d5358cd653a145322ea02",
+ "sha256": "1v40g6nvslyajnzfjfyzr55gvy320kmddkbq6qfdxnnw9ms6mq5k"
},
"stable": {
"version": [
@@ -88151,14 +88257,14 @@
"repo": "BenedictHW/ox-rss",
"unstable": {
"version": [
- 20230324,
- 157
+ 20230408,
+ 231
],
"deps": [
"org"
],
- "commit": "aceff7c50e9d8ace97cefc09ca265a11e75e4d68",
- "sha256": "1xj0dp2v1f6fswx9vi681wh80c6njczbz7n3h8llyakj454ik3vv"
+ "commit": "ee7347fca8f10a4b53075a8d1e3cac3aff6e6dac",
+ "sha256": "19fz5vvad8j3p1sm39spmby1h3h9djw5hlvwsdssk6bdpmvlcjp0"
}
},
{
@@ -88212,7 +88318,7 @@
"deps": [
"org"
],
- "commit": "85c617200587eb3f7954c278b6cde44f8d43fd87",
+ "commit": "c2d34f170f470461aeec983b778e9d165bdb4d1f",
"sha256": "02z8fdc7lcj10xh3ix58ddk96wqkrxxgsfsc1061c62fq1b6l5bs"
}
},
@@ -88579,11 +88685,11 @@
"repo": "melpa/package-build",
"unstable": {
"version": [
- 20230329,
- 1735
+ 20230409,
+ 1829
],
- "commit": "70ad610a996f6289cc24586af6ca885f784688fc",
- "sha256": "0b43ayzpqj1349lyd411n948mql96a8jhiwbg13mxdn5xcskf7bn"
+ "commit": "53e9c5c7ecf47e55d1e725df3d546f58574db0d7",
+ "sha256": "0ax7g9d6k2dgnvdcfncqxwyzjwfc4v59rmxkih6diccymhqn0k0c"
},
"stable": {
"version": [
@@ -89057,15 +89163,15 @@
"repo": "joostkremers/pandoc-mode",
"unstable": {
"version": [
- 20221128,
- 2034
+ 20230416,
+ 952
],
"deps": [
"dash",
"hydra"
],
- "commit": "8f955abec9c1d75acd9b03389b90a276ec4e2137",
- "sha256": "0jpjd3vhwc85vrp050qr7gmxm661m248pv3mndjq5w6z4862annm"
+ "commit": "da3f0f5238a8b1e5f09f2ec97e683dc488d25be0",
+ "sha256": "0azplwy3r29pczgdh4jvwxwr7qvbpsja2748qy4k8i0nj7h26i1v"
},
"stable": {
"version": [
@@ -90226,15 +90332,15 @@
"repo": "vedang/pdf-tools",
"unstable": {
"version": [
- 20230322,
- 1541
+ 20230404,
+ 327
],
"deps": [
"let-alist",
"tablist"
],
- "commit": "dea468796d7a20c7b28bc4360d0663cb1dc010fd",
- "sha256": "1y01nkj4q5y6w9qylc8xhi0wlkq6nk9i8548na1jn0nnynwab85q"
+ "commit": "7ff6293a25baaae65651b3e1c54b61208279a7ef",
+ "sha256": "0cc80k7xfy4j636afzfl8bljqzdwspy328q6ds2qvsfz82paca2p"
},
"stable": {
"version": [
@@ -91219,11 +91325,11 @@
"repo": "emacs-php/php-mode",
"unstable": {
"version": [
- 20230318,
- 2134
+ 20230410,
+ 1821
],
- "commit": "47e0813079cea6243139da2b6efedd36940367c8",
- "sha256": "135hgrccpmn7z2228w98hwv9khdmfja89gmkg9im4s6daph4y5lc"
+ "commit": "a8194bc884535eb7e8df9bed18658a5101724b3c",
+ "sha256": "114x9cwgj62nqan8bd149axz6m0sw5k4r5714g7m0qag5l4rplxj"
},
"stable": {
"version": [
@@ -91282,28 +91388,26 @@
"repo": "emacs-php/php-runtime.el",
"unstable": {
"version": [
- 20221009,
- 1955
+ 20230404,
+ 1713
],
"deps": [
- "s"
+ "compat"
],
- "commit": "36e6ae862cb02104b5782a563f0a5846c00e0082",
- "sha256": "1nv67f9ydpfjbaj0wxx4w98d37jrs51drjpkmih15b3ymfqcjh22"
+ "commit": "ba64f30e716f89f9cf2c3bd44c5d00da69736868",
+ "sha256": "0642n7cf3vn90gm7a2bvy264mjq5ar20aw5lh79ls55i4mryvqnr"
},
"stable": {
"version": [
0,
- 2,
- 0
+ 3,
+ 1
],
"deps": [
- "cl-lib",
- "f",
- "s"
+ "compat"
],
- "commit": "017e0e70f07d6b25e37d5c5f4d271a914b677631",
- "sha256": "1c74xd6p3hfanpd4920agvnar9rjbyvz33kwrzw9vywzrs68ncvh"
+ "commit": "ba64f30e716f89f9cf2c3bd44c5d00da69736868",
+ "sha256": "0642n7cf3vn90gm7a2bvy264mjq5ar20aw5lh79ls55i4mryvqnr"
}
},
{
@@ -91367,28 +91471,30 @@
"repo": "emacs-php/phpstan.el",
"unstable": {
"version": [
- 20230331,
- 1230
+ 20230417,
+ 1142
],
"deps": [
"compat",
"php-mode",
"php-runtime"
],
- "commit": "a4193de889c68d195a109fc239857f70728bce4e",
- "sha256": "1269l0andph861mh8qp00i2qh59k0vz0nxk1xnmaj24kaways79g"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
},
"stable": {
"version": [
0,
- 6,
- 0
+ 7,
+ 2
],
"deps": [
- "php-mode"
+ "compat",
+ "php-mode",
+ "php-runtime"
],
- "commit": "0869b152f82a76138daa53e953285936b9d558bd",
- "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj"
+ "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
+ "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
}
},
{
@@ -92758,16 +92864,16 @@
"repo": "polymode/poly-R",
"unstable": {
"version": [
- 20230303,
- 1140
+ 20230416,
+ 1454
],
"deps": [
"poly-markdown",
"poly-noweb",
"polymode"
],
- "commit": "f2e85391efe2d5a9516687422b4784d185af5241",
- "sha256": "0i6wjmqanzngk3jh9lmm2i54hy0m9zg420ky2f8jqgqjykfpx6fs"
+ "commit": "8024e852cfca642dea2045a41b2033baa2f1f9a5",
+ "sha256": "1r4cbvvg1fjyq18ap1mj7gpvgllpc6hf6g7nf697vgwmahlb7jgf"
},
"stable": {
"version": [
@@ -93575,11 +93681,11 @@
"repo": "tumashu/posframe",
"unstable": {
"version": [
- 20230321,
- 211
+ 20230420,
+ 643
],
- "commit": "b00f1386ca4e251a5c3d8985d313217e56e42a7e",
- "sha256": "0v6sl155dhxa7vmbpaihdsqpq1a50c3jfa3qi6gz6wpx5myakrgn"
+ "commit": "424fa9bfc990da7a8d0e4edc5f69169dfe7db45c",
+ "sha256": "1ny5wr9f613zarg4hfwjk4b3cvzjfabn4w22k8ynqxs4lg3f17gw"
},
"stable": {
"version": [
@@ -93757,15 +93863,15 @@
"repo": "SavchenkoValeriy/emacs-powerthesaurus",
"unstable": {
"version": [
- 20230401,
- 1906
+ 20230402,
+ 1904
],
"deps": [
"jeison",
"s"
],
- "commit": "30ad1e81c95942edd52f650c4af5e9d9162715b1",
- "sha256": "1dbym2ls8srrxgd7r8nd4ms6lak89l1iarrkl3cdk822sakdibv0"
+ "commit": "782df1d92f95acc100bc33d4b5f17fe6bad88682",
+ "sha256": "1wc1rlbx05q7pckj5gbp972qa3x8x74dp2s84fsj34qlfg8994ib"
},
"stable": {
"version": [
@@ -94254,14 +94360,14 @@
"repo": "alphapapa/prism.el",
"unstable": {
"version": [
- 20220716,
- 40
+ 20230416,
+ 626
],
"deps": [
"dash"
],
- "commit": "9cf6b5e3bcb6044567f3911a4adb796e0c61f207",
- "sha256": "1j2ifn1nc94b07ypifimmb6v13askcd93063pppjqjsh1qzm8s6n"
+ "commit": "2dc7c283455c8846dbf3c725fd7aacdec6c0ebcb",
+ "sha256": "1nm0ryk8bwcph8kzgbbhcwgng425j6nv9r95ka82sqb83nd1y99i"
},
"stable": {
"version": [
@@ -95120,11 +95226,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20230326,
- 2334
+ 20230414,
+ 931
],
- "commit": "78a555a12dd40348fb098331a20aa6fd663c152d",
- "sha256": "024p430a3k7knfvqp2c9m9l08841zxggwlvy9ziqn5fcf8ipaqxr"
+ "commit": "dac9b5d32ec1404d35e3dd83070591806f8977b0",
+ "sha256": "0nr80w94i7v17hbgxr751v4hl2yxr960ydci25aj7xk74589bcgf"
},
"stable": {
"version": [
@@ -95224,19 +95330,19 @@
"repo": "protocolbuffers/protobuf",
"unstable": {
"version": [
- 20230310,
- 1557
+ 20230412,
+ 2243
],
- "commit": "81f89d509d6771dcccb619cbe26ac86cec472582",
- "sha256": "0c2z0kz5rjy7rixn28xs2ma5r24v3m9rcbk43z6dirdh77m064rj"
+ "commit": "482156c0f96dd670b9f1ba4f946e66edeb04535f",
+ "sha256": "1bi1i8mm80z1lbzpxqkx9p4f87cc48fljnpm61f0ibg35vr4lz5q"
},
"stable": {
"version": [
22,
- 2
+ 3
],
- "commit": "81f89d509d6771dcccb619cbe26ac86cec472582",
- "sha256": "0c2z0kz5rjy7rixn28xs2ma5r24v3m9rcbk43z6dirdh77m064rj"
+ "commit": "482156c0f96dd670b9f1ba4f946e66edeb04535f",
+ "sha256": "1bi1i8mm80z1lbzpxqkx9p4f87cc48fljnpm61f0ibg35vr4lz5q"
}
},
{
@@ -95247,20 +95353,20 @@
"url": "https://git.ookami.one/cgit/protobuf-ts-mode",
"unstable": {
"version": [
- 20230207,
- 341
+ 20230410,
+ 855
],
- "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9",
- "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr"
+ "commit": "cde61510b711d90bf2978ca4cbd3f36fce8b4c3e",
+ "sha256": "1rzsvzwlpgghfg8brrhzqpiskb8v7ig2jwsr43f423d64a2i7azq"
},
"stable": {
"version": [
1,
0,
- 1
+ 2
],
- "commit": "3076f25bd5ce05f4a4a5840506c3a5a2c0e839d9",
- "sha256": "04zqi7anmwzrsgg5clbvilbmi7hg0m29gyr4cym871q73xgi2vmr"
+ "commit": "cde61510b711d90bf2978ca4cbd3f36fce8b4c3e",
+ "sha256": "1rzsvzwlpgghfg8brrhzqpiskb8v7ig2jwsr43f423d64a2i7azq"
}
},
{
@@ -96225,28 +96331,28 @@
"repo": "tumashu/pyim",
"unstable": {
"version": [
- 20230316,
- 716
+ 20230412,
+ 134
],
"deps": [
"async",
"xr"
],
- "commit": "6cc5b76a947938b3b9e842423497a1875b7ca1a0",
- "sha256": "0qxf88y2w1bbv5z98pnq0g4949p2iv5s70nb431aw7hnl0kvgyia"
+ "commit": "4c953701a368e1433bf91fd19766d76c9b496825",
+ "sha256": "08im5a335n3nkfsbcl417lvad7j8apqm2dk61jqlw16djql1h0mf"
},
"stable": {
"version": [
5,
3,
- 1
+ 2
],
"deps": [
"async",
"xr"
],
- "commit": "6cc5b76a947938b3b9e842423497a1875b7ca1a0",
- "sha256": "0qxf88y2w1bbv5z98pnq0g4949p2iv5s70nb431aw7hnl0kvgyia"
+ "commit": "4c953701a368e1433bf91fd19766d76c9b496825",
+ "sha256": "08im5a335n3nkfsbcl417lvad7j8apqm2dk61jqlw16djql1h0mf"
}
},
{
@@ -96735,11 +96841,14 @@
"repo": "jdtsmith/python-mls",
"unstable": {
"version": [
- 20230218,
- 2131
+ 20230407,
+ 2139
],
- "commit": "7d0167ecd71b8a2b9cedc08a490107c36b9ada43",
- "sha256": "1z4kgzw3al8mldzm0h697r2dig0fia5kicd5r1fv7j32wmp5qxcf"
+ "deps": [
+ "compat"
+ ],
+ "commit": "0dd0bb1eb8e580093bc35ee5610f894d4464d386",
+ "sha256": "1b7m1y8bwrwv7j79gvr441yjyfa95nih18fd3jyy3k6iaazwwagv"
},
"stable": {
"version": [
@@ -96954,11 +97063,11 @@
"repo": "psaris/q-mode",
"unstable": {
"version": [
- 20221224,
- 2024
+ 20230412,
+ 53
],
- "commit": "e18a7b40e876a5502d9d2d6d16a356295c555fab",
- "sha256": "0p5m2hxmf7r9hr00kjhjgpvl2ddk4hwaw9s0m6rlpg9x24bmnzqs"
+ "commit": "d89b359d5a26234336487ab4e42eb5878ad3c5a5",
+ "sha256": "0632mh9yhs4cs8xzq7d86gyklvzvvlja729d6vlzam3nw6s89c4d"
}
},
{
@@ -98487,11 +98596,11 @@
"repo": "reasonml-editor/reason-mode",
"unstable": {
"version": [
- 20200929,
- 1606
+ 20230405,
+ 517
],
- "commit": "5690544a7091630e0ea0023bbbd57a733cea8bde",
- "sha256": "1iha4jgdyhmia591aqkzdnv3333pj2x14g814qkil71na4z23y8j"
+ "commit": "d657ff75572a8ea7eda6fe22ada3a2ebf5bc6119",
+ "sha256": "07qz5509yw76x0jbbiz80lvp0qmg00bzappcl8n3mkfwwnhwmg0w"
},
"stable": {
"version": [
@@ -98768,14 +98877,14 @@
"repo": "minad/recursion-indicator",
"unstable": {
"version": [
- 20230215,
- 720
+ 20230410,
+ 1753
],
"deps": [
"compat"
],
- "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534",
- "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi"
+ "commit": "95eb885d8719e5e31a42fc99a6a76812fd38df8d",
+ "sha256": "0jrp79glc93zr18m8jr8a7yvgy0pd0k4mxbr1hdcg3bfjx8vlqgk"
},
"stable": {
"version": [
@@ -99105,11 +99214,11 @@
"repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
"unstable": {
"version": [
- 20230221,
- 1803
+ 20230408,
+ 1404
],
- "commit": "9c2a3193ccf32f8fa48578a6b8826b2959dac120",
- "sha256": "0qj9vnl5zqw288aw84nrwy21fqzi40b2yiv0g4km8y5pq7w13rw2"
+ "commit": "3fbac20154035d75238facbc3b881ab3b47ab711",
+ "sha256": "13l2kjkxmmsq8ad07pkdrfwzfr0wp2cx4vz6j4ac0z3nfhng11b1"
}
},
{
@@ -101252,16 +101361,16 @@
"repo": "semenInRussia/emacs-run-command-recipes",
"unstable": {
"version": [
- 20230202,
- 1326
+ 20230406,
+ 1757
],
"deps": [
"dash",
"f",
"run-command"
],
- "commit": "60e6fdbe6e8bea3871674a0e5779324ed5dbd318",
- "sha256": "0ngdxnjz3mvxyzmg00rs9mxy6b2zg86nsplhn0vmbxln133p73jr"
+ "commit": "adbde3fddd67f1f40b3374c1696af03ac9b72e5e",
+ "sha256": "0k111i5y3sr9pzxv1s7g7sbz700ycz4sz0y7p51c1hgbn0b05x2k"
}
},
{
@@ -102090,16 +102199,17 @@
"repo": "teeann/scholar-import",
"unstable": {
"version": [
- 20220730,
- 431
+ 20230412,
+ 1413
],
"deps": [
"org",
+ "parsebib",
"request",
"s"
],
- "commit": "7cb04af45f1ed1db30d6e7788803e578c641b3b6",
- "sha256": "00v9zl25vs71qsjxq54rcyj10b6m8nxvzfy8x6anxmis0r5g4f8k"
+ "commit": "2456367578caa7fd768e30238ce080687faa0a25",
+ "sha256": "1jgandx2zs6m921jxhb476g7ldh7paa7qlwjy9lzzn3cfgb18r8w"
}
},
{
@@ -102685,21 +102795,6 @@
"sha256": "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg"
}
},
- {
- "ename": "seen-mode",
- "commit": "a3645b08cb46e3d91081da7baa982b5283918447",
- "sha256": "0q8hz7m7yx3hlmjxg2fzpa5yy6wv97az3m3bn9c0bgbcidip147k",
- "fetcher": "sourcehut",
- "repo": "shiorid/seen.el",
- "unstable": {
- "version": [
- 20210311,
- 1935
- ],
- "commit": "57c960d76ad3dc551ac5a57ebe8682ef9fdc6d31",
- "sha256": "1bn6jrvnz4bh7jm0a4g9z29zld5lm6jc77gh0i5m9ia38wzr00jx"
- }
- },
{
"ename": "seethru",
"commit": "7945732d9789143b386603dd7c96ef14ba68ddaf",
@@ -103040,6 +103135,21 @@
"sha256": "1wpr37gwkly0jl0m8kh7f1pkp9dwg5i1r3bpx3sd1z8c57sfn8da"
}
},
+ {
+ "ename": "sentex",
+ "commit": "5a98fa15b4c70676cb1e2f3afecc0e52916b80f2",
+ "sha256": "1n1fw66n293dhha9ajxgfvafxh3sdlwn95i748fi8hd8mr129ylg",
+ "fetcher": "codeberg",
+ "repo": "martianh/sentex",
+ "unstable": {
+ "version": [
+ 20230411,
+ 1650
+ ],
+ "commit": "ab96ee0e9856222aaad6b085cf4ca0c5dda73789",
+ "sha256": "02phy6nivjamr3fjffx8ir740dwjpm6xqh7jhsf3kd77bgcqdcx5"
+ }
+ },
{
"ename": "seoul256-theme",
"commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -103063,15 +103173,15 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20230401,
- 1144
+ 20230403,
+ 1242
],
"deps": [
"dash",
"edit-indirect"
],
- "commit": "5a954c50654d39c3a9233fe17aa5fcbb45524c32",
- "sha256": "0xnkaf054n395jqqs56f03dyk9mpgv5r1psc4aqsghac9k7x15dh"
+ "commit": "8344e7338a0ab7968cab807e0073934a8444559d",
+ "sha256": "1w590fgsgm5vxqj5951fks79s1xwkdss3v1k9xbqh7jq0zzmiq10"
},
"stable": {
"version": [
@@ -103195,42 +103305,6 @@
"sha256": "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d"
}
},
- {
- "ename": "serverspec",
- "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
- "sha256": "0avyii5xif5dxipmrgf1slp09g8j73565bkc1a1j07p08vrap9c5",
- "fetcher": "github",
- "repo": "k1LoW/emacs-serverspec",
- "unstable": {
- "version": [
- 20150623,
- 1155
- ],
- "deps": [
- "dash",
- "f",
- "helm",
- "s"
- ],
- "commit": "b6dfe82af9869438de5e5d860ced196641f372c0",
- "sha256": "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2"
- },
- "stable": {
- "version": [
- 0,
- 0,
- 7
- ],
- "deps": [
- "dash",
- "f",
- "helm",
- "s"
- ],
- "commit": "b6dfe82af9869438de5e5d860ced196641f372c0",
- "sha256": "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2"
- }
- },
{
"ename": "services",
"commit": "beb91b4397f6e35a1d5c73a127d8cd7fc9201935",
@@ -104437,11 +104511,11 @@
"repo": "emacs-sideline/sideline",
"unstable": {
"version": [
- 20230216,
- 843
+ 20230411,
+ 1926
],
- "commit": "0441f2c308eb9316f01d721a949ba73b6df8c4c7",
- "sha256": "0jgkq8x0p291j8rig2hp1hcxiyf8ln9nh8jdbnhiijk229v3wka2"
+ "commit": "77c363239e3edce287eb15d59e3c28b21d8ddb79",
+ "sha256": "1i02v8plyhjhqqn9y4f9llvpbhv3fvrb70vbqbyxqcqz0i1vgp53"
},
"stable": {
"version": [
@@ -104461,15 +104535,15 @@
"repo": "emacs-sideline/sideline-blame",
"unstable": {
"version": [
- 20221231,
- 1636
+ 20230406,
+ 2312
],
"deps": [
"sideline",
"vc-msg"
],
- "commit": "1a1d80a71bdabe77fe2a33cd681b7188f193acfc",
- "sha256": "1w05825diivgbbbggval1drhnipi4iib1hv5ccr74rpwyixvm4hr"
+ "commit": "4d3343795bc95662adb65c85bcbb41947862699f",
+ "sha256": "171ax9zm6r754gk2bf5vd0k4l4jxcz2v6y9gnwkslz9bl4g3pcal"
},
"stable": {
"version": [
@@ -104493,16 +104567,16 @@
"repo": "emacs-sideline/sideline-flycheck",
"unstable": {
"version": [
- 20230216,
- 859
+ 20230402,
+ 1816
],
"deps": [
"flycheck",
"ht",
"sideline"
],
- "commit": "1f2f82d4383718a8dd2aff40cffafce4a8d0aca1",
- "sha256": "0ksjjd2j377c8hrf378z6x5v8mn2s0q6fifx58l0zz3sw7y649l7"
+ "commit": "3d74a008835eff71899b9455cd00f989378fe70e",
+ "sha256": "0y2cn8b7nh5fjcra78pmrjrsb06if1jrrq5wng2n08h39x6fjwi4"
},
"stable": {
"version": [
@@ -104526,14 +104600,14 @@
"repo": "emacs-sideline/sideline-flymake",
"unstable": {
"version": [
- 20230216,
- 914
+ 20230402,
+ 1816
],
"deps": [
"sideline"
],
- "commit": "e92fa5ca861ff5a54273aecde319974fe4aa9dda",
- "sha256": "13h4bzqqcvygza2c8x7aalc1cpy3mv0g2rbh2r1991qksddyqvcx"
+ "commit": "316325cb050d13f33e83e7d7823e3730a70ecf4e",
+ "sha256": "1fkvj2azswczxc8s8vkw9kp7r2sv3369hc0wrwsrmv96hn3lcc4w"
},
"stable": {
"version": [
@@ -105028,8 +105102,8 @@
"repo": "magit/sisyphus",
"unstable": {
"version": [
- 20230213,
- 1152
+ 20230415,
+ 1850
],
"deps": [
"compat",
@@ -105037,8 +105111,8 @@
"llama",
"magit"
],
- "commit": "1e6fd5ae0fb5384063e8b59d053bc5df7630cf5c",
- "sha256": "0r0mvkd7i9n7d92lv4cjd69nprzva6zhn509i4zjdn4dapcqw6z9"
+ "commit": "c75298b35c40a2267e5b37689e4df7c8c970908b",
+ "sha256": "16b5sqf0ag387c2mbhjgdc0v7wvhzbhqy3r23gi0yvwlva860ppp"
},
"stable": {
"version": [
@@ -105062,11 +105136,11 @@
"repo": "mastro35/sixcolors-mode",
"unstable": {
"version": [
- 20221127,
- 1208
+ 20230406,
+ 1031
],
- "commit": "fbcf57749ebc74d7b77d148da6c021b1a8e0f650",
- "sha256": "072jcm4da8b9vjss4jyb3bs18qdrjdd6mlgp4xwy097ypfdyijm3"
+ "commit": "4124a8cf664b04a4bf4c39f7c3b7da3e480b99c8",
+ "sha256": "1gk5h51k3lk5d0q1k63xpq3q3gs07jgi3qg24f5g2m1q738l4rlr"
}
},
{
@@ -105591,11 +105665,11 @@
"repo": "joaotavora/sly",
"unstable": {
"version": [
- 20230327,
- 1434
+ 20230411,
+ 1523
],
- "commit": "82b20a9a83209b4dbfbfb62a1536896aed5f85f7",
- "sha256": "0dvr36qvb490gml0znay0slw63czp7azvajnv7srh8s0j8pqpcaj"
+ "commit": "149d7ef7844b3824b1df148295cedf6ff85c2b99",
+ "sha256": "08ix2l52c59q1v8ajjxs8vsclz14ggx6dgv7v9vh2cv0qhy8ylxm"
}
},
{
@@ -106541,14 +106615,14 @@
"repo": "kyleam/snakemake-mode",
"unstable": {
"version": [
- 20220223,
- 218
+ 20230418,
+ 147
],
"deps": [
"transient"
],
- "commit": "78abd82f34a71b3fff7aa869de1b07a082f1f351",
- "sha256": "1621pvbwq5b0kgk735w4dnpar30x3ckbhx18bdwv03rc7ngdnj8r"
+ "commit": "0c4c5b6a25735ac025ce124ace9f0259eb5198e9",
+ "sha256": "003sw5qxk0y4qn88fhd963gvlb6i7pa8g12hapv6g1l7xycx9lrz"
},
"stable": {
"version": [
@@ -106764,26 +106838,26 @@
"repo": "md-arif-shaikh/soccer",
"unstable": {
"version": [
- 20230401,
- 1442
+ 20230410,
+ 626
],
"deps": [
"dash"
],
- "commit": "edf7aac57008d7b33ab44f3da317b3563f6e0b19",
- "sha256": "00dd4cg2zpkz6zb3l3lvi9xnxhdvl48f49lz4n1r5ydhpls25b3x"
+ "commit": "c99a20c3af1011aa14bf2012d3b84cfa4282d0c2",
+ "sha256": "096pzffg3sz26dswfy83dvg8fvfn45kjp0xqbg61ilqda80592q8"
},
"stable": {
"version": [
1,
- 4,
+ 5,
0
],
"deps": [
"dash"
],
- "commit": "aa7421aac10e528a904b29701be1bf26efae9d32",
- "sha256": "14qr4wfckfzxa3f9n6hbpmxz91qdq8sp1jw0xrd2d4gfa09nf47s"
+ "commit": "4515eaa5e12613185f4569c79772db886dcfa2f7",
+ "sha256": "1l6cjn7dfg2kp9rqb69661q0c2v1jmxfr7by8r9pig5m6k98jvzc"
}
},
{
@@ -106905,11 +106979,11 @@
"repo": "bbatsov/solarized-emacs",
"unstable": {
"version": [
- 20220619,
- 1203
+ 20230414,
+ 1130
],
- "commit": "94e7c342da1b04326028708e5503973d554bd828",
- "sha256": "1a5s9j32v04sc5adly98y1zlx3q9i4m3b0zggrbgy56qk10yqdx4"
+ "commit": "3fc985e8b31a975ef9b983c53f691cf48e1e0899",
+ "sha256": "07bn1mqqkj3y6g8cd8mqry92arizzj8b518lfz81r1zmx5mq9p70"
},
"stable": {
"version": [
@@ -107486,11 +107560,11 @@
"repo": "nashamri/spacemacs-theme",
"unstable": {
"version": [
- 20230321,
- 2210
+ 20230418,
+ 2106
],
- "commit": "05fe9bc750203960179d456ae4079d582561659c",
- "sha256": "1vg77sbpx6p2a0mripifr23gmicf6y6xb7lg6nym9d2iarlw3nab"
+ "commit": "c98c156d1ffa73426ec6d6f87a5aaf5f44c9fea5",
+ "sha256": "12nrvpjmaq3037fq92nr1rq8s8d1zlh33v4wmi9dh3xnwx9hvpmh"
},
"stable": {
"version": [
@@ -107524,11 +107598,11 @@
"repo": "alvinfrancis/spark",
"unstable": {
"version": [
- 20211021,
- 1832
+ 20230406,
+ 2307
],
- "commit": "c9af24a169b1f1aeba175f1f8d51abda113639af",
- "sha256": "0ap9xq77i7a3cbrz6xiydkzj5k0866jinfnpfa2551r93x06rdh1"
+ "commit": "0e58e5122cbb46fb6d850e3b72487431a3696861",
+ "sha256": "1z3hf4rl4ycz82dh2aaw7n41yx60cz80rzczq1l8hrpp02fgrigm"
}
},
{
@@ -107614,11 +107688,11 @@
"repo": "condy0919/spdx.el",
"unstable": {
"version": [
- 20230324,
+ 20230419,
110
],
- "commit": "bb787bfd385076a0a914dd656c6f776c36714e27",
- "sha256": "003p2khdcyxyw1q6f5lb6iwzj1bjlv0myhm766xygkdrdzbl56jg"
+ "commit": "f8ec8996ff5e0f34f98aecd7363dc44c3a4e5a6f",
+ "sha256": "0as7b26cc033xp2r2498r0hpq8f7j78ybbv2gni3qmd0pvvrh7ab"
}
},
{
@@ -108870,11 +108944,11 @@
"repo": "motform/stimmung-themes",
"unstable": {
"version": [
- 20230328,
- 1245
+ 20230420,
+ 832
],
- "commit": "edd330a418e39ca06c35993fa6ee6f6f4efea9ee",
- "sha256": "0828hn49fwmqcvyw0czpjkfx8xw0gln3xxkxzmq85c94hsd53piv"
+ "commit": "968af8491f619a71334875b760fb6ddab63aefae",
+ "sha256": "0gll4hg432mvlmqcykx868jrriybaz9k9bs9pm96bd9mch7ppzbq"
}
},
{
@@ -109107,17 +109181,17 @@
},
{
"ename": "stripes",
- "commit": "f4c7beb05435a70293806b729b6f35c2fc2e8ca4",
- "sha256": "0pwkqqyhg6gkpj8qh84ylsvq6wjykkkmmil4igw7mn80gy15zd09",
- "fetcher": "gitlab",
- "repo": "stepnem/stripes-el",
+ "commit": "6f503b0d55c1c833b503d68f2169ddda63dfa371",
+ "sha256": "1ipwccpmblrcqnnbgvn1krmyqfsdj4mz81qd0n0dydn9c900k1wp",
+ "fetcher": "git",
+ "url": "https://git.smrk.net/stripes.el",
"unstable": {
"version": [
- 20220310,
- 2237
+ 20230402,
+ 1228
],
- "commit": "618e40e0a9cf80decea32c8daecb1c9f6eae2991",
- "sha256": "0yb8mnix056n6ll17w13afr9rap53bb542xqy5ywcg9ajc1gd4jz"
+ "commit": "4683c9020da14bb1c1f74b90d27a4d9fdc7a9147",
+ "sha256": "08gk3z185jhvl8azkn8rccgv72imp14rqw44mlszhrvqjafdd3z0"
},
"stable": {
"version": [
@@ -110009,26 +110083,26 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20230326,
- 1911
+ 20230410,
+ 1815
],
"deps": [
"ivy"
],
- "commit": "e3164aae1e98ab7e3721e983463b6500c30e043f",
- "sha256": "11s7w94mpns6ff9k8d73m39n9w76lkaygkxpdl04918j9xndjq4w"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
},
"stable": {
"version": [
0,
- 13,
- 4
+ 14,
+ 0
],
"deps": [
"ivy"
],
- "commit": "8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6",
- "sha256": "1k8ja0cjdb13xi5b05rab3r0z53qkhjwjagxzw3fpzlyd7rxzi14"
+ "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479",
+ "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v"
}
},
{
@@ -110514,14 +110588,14 @@
"repo": "emacs-berlin/syntactic-close",
"unstable": {
"version": [
- 20230326,
- 1211
+ 20230416,
+ 1201
],
"deps": [
"cl-lib"
],
- "commit": "5d97262a0210c5fb393a257e4a9f90e0f29bc8fd",
- "sha256": "0gvfzxgimabgrvb1psvhs7259yx8ypg9cwgrnzvp6z2m1zvyqbrj"
+ "commit": "298376470548f211ed27caf753f550b064072bba",
+ "sha256": "1hrfk6r7hd3a6sn2if6skmyb8xr9ng1lmzwpb5g1svbm0x4gliqj"
}
},
{
@@ -110913,6 +110987,21 @@
"sha256": "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc"
}
},
+ {
+ "ename": "tabgo",
+ "commit": "80bdcded3f79c12968f4884fabf89cc7380c3bf1",
+ "sha256": "0mdlxvim1pgps3mbflmjyp4zxbnlcrh5d7f7p75lrwnjqf44byna",
+ "fetcher": "github",
+ "repo": "isamert/tabgo.el",
+ "unstable": {
+ "version": [
+ 20230411,
+ 1708
+ ],
+ "commit": "d96bceb35a54ef43676ac6718fee9353fc86771d",
+ "sha256": "1dyi9fi6cilhzqqaj4q5shfdxcjmsxsldvd0a8pj0pyy0ng1dpqa"
+ }
+ },
{
"ename": "tablist",
"commit": "6205f77bbb6c3a44146110f2a0e293cdf4280228",
@@ -111341,15 +111430,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20230401,
- 1152
+ 20230420,
+ 958
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "2cf74907e4b6a109ac01bb52494845176833268c",
- "sha256": "1kj53980bak2brgh73lllqi77q7p48wrcphz0bxlgblf0xybpaky"
+ "commit": "879a8c7afc8967942613b6b898d9ea8c1f3641bf",
+ "sha256": "1ic14hzzgjxpky1r3mz4v72si9hw8cw72420a9lnpdaiw99l8q7h"
},
"stable": {
"version": [
@@ -111462,14 +111551,14 @@
"repo": "minad/tempel",
"unstable": {
"version": [
- 20230305,
- 739
+ 20230410,
+ 1742
],
"deps": [
"compat"
],
- "commit": "4ab5f3af92aab2a1aea1ec66d9086812fe310044",
- "sha256": "0ph0vrylk3nf8si3zd7na6llnrv2453vb9skadf7p4ghnv97b5z1"
+ "commit": "94afb9b916a711c56f23183da93a103338e9f84e",
+ "sha256": "0nxpc7gjjpkvczry7gs3wh9m2kn12hjany38jlvdanpngrd86mjz"
},
"stable": {
"version": [
@@ -111491,14 +111580,14 @@
"repo": "Crandel/tempel-collection",
"unstable": {
"version": [
- 20230324,
- 941
+ 20230419,
+ 1521
],
"deps": [
"tempel"
],
- "commit": "096eff3618f6cd600fdf61859f9e5dd1bae08182",
- "sha256": "0lkh3agnddsc1v9zd6j27rzpbyr68bk65lpa1g4b56yx1w66abg6"
+ "commit": "8ae3c3e8a1122600965749545b478e6db55bf37e",
+ "sha256": "19y30pynvsxasxnirgqaqcbziajvnkj7mql0jr56g8pfzn8ag7dm"
}
},
{
@@ -111657,16 +111746,16 @@
"repo": "calliecameron/term-alert",
"unstable": {
"version": [
- 20210414,
- 1638
+ 20230407,
+ 1715
],
"deps": [
"alert",
"f",
"term-cmd"
],
- "commit": "ca1b48ad911bc972b049f48fe0531e702dbc553c",
- "sha256": "0jnv1011y521pc4rrjyrv1la6r1q2sb120lxf1nbns17wv86d0cd"
+ "commit": "8e7e744773e41355bcd9f5c911001be08bc79bec",
+ "sha256": "1lwsp5wpmss07hmpysvk3yifgzm5bk1rr7d1qmij46yn0r2q3wyk"
},
"stable": {
"version": [
@@ -111690,15 +111779,15 @@
"repo": "calliecameron/term-cmd",
"unstable": {
"version": [
- 20210417,
- 1447
+ 20230407,
+ 1704
],
"deps": [
"dash",
"f"
],
- "commit": "281b9a6d864ca85dc1451dc46baca98f48dc3f60",
- "sha256": "1knijk9l8ipb882h8awwx18lh3q1yy13dyjp5gm36nw06212qxx2"
+ "commit": "26c5a8cb6b55ac0d6c6bc08f6ea1b1e53f6e2654",
+ "sha256": "04q7i9dbcbxylfy6qsxp6x1rg89ix9qdhpr6z2dc1w925bqv71m8"
},
"stable": {
"version": [
@@ -112152,11 +112241,11 @@
"repo": "emacsmirror/tex-smart-umlauts",
"unstable": {
"version": [
- 20190316,
- 2215
+ 20230416,
+ 2051
],
- "commit": "f15ed781b1fb38bf3e46c481dd602c3999920b99",
- "sha256": "11ky141a33vm961jpj1spz9wxb4mfgw8drqxg2a6yk2rinkf0wcl"
+ "commit": "b28bac71990e0442616157fdb64494179df5575e",
+ "sha256": "0dy7q4r9ac1ka3ikx2whgp2l5vhxfqwn0r4ys086s1fs36a1l7mx"
}
},
{
@@ -112352,11 +112441,11 @@
"repo": "monkeyjunglejuice/matrix-emacs-theme",
"unstable": {
"version": [
- 20230317,
- 338
+ 20230402,
+ 1218
],
- "commit": "6e53d899c132d8f083c45aff034e041d5eb4d220",
- "sha256": "1yiprl5m99s7ibsya3y53zkzd5ps7cwyss7ykbjfkxz0k6g1dkcl"
+ "commit": "b339285651e088bc51fa2fb51aa319fb70cab9a4",
+ "sha256": "1rnb3h8bhdrawfhlkp32y2r0rai2pxj71qsvpj62drjk582bkfjm"
}
},
{
@@ -112382,20 +112471,26 @@
"repo": "hadronzoo/theme-changer",
"unstable": {
"version": [
- 20201226,
- 2256
+ 20230417,
+ 1502
],
- "commit": "57b8c579f134374a45bec9043feff6b29bb4f108",
- "sha256": "01c3n5ngbyw2p8h82hi00pjjfkaqm5lz8mnj2c0v504v23zvs3kk"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "2ff40a1750323a3547ca7a71c319971c8e1147ca",
+ "sha256": "08q7cmysajicxhryvcnsxajgd3b1fqr3wywxwkkha896wkjmhfnf"
},
"stable": {
"version": [
2,
- 1,
+ 3,
0
],
- "commit": "d3d9c9f62a138958262ac5dd61837df427268611",
- "sha256": "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd"
+ "deps": [
+ "cl-lib"
+ ],
+ "commit": "2312851b08de2e810c0f51a405b413c039cc8d2f",
+ "sha256": "1lfhbxvm20lznw8hgnls9hz0vq2b40i8cn736h90r4r3cmqhrxfi"
}
},
{
@@ -112546,21 +112641,21 @@
"repo": "facebook/fbthrift",
"unstable": {
"version": [
- 20230327,
- 401
+ 20230417,
+ 336
],
- "commit": "48771f2cb12529fdfb1f8765f4376b5a589bf4cc",
- "sha256": "0i16dj0ldiysgcvlbygxvpzxd5j3612hssykbvpld2xb1jvc4jmg"
+ "commit": "775d2a2b5902991ea9c117dee6b91833c2ac03f8",
+ "sha256": "0y9gijcbqxj8yb0khyd6v94g7ba81vsp820ipnaavn28g0z58mwl"
},
"stable": {
"version": [
2023,
- 3,
- 27,
+ 4,
+ 17,
0
],
- "commit": "48771f2cb12529fdfb1f8765f4376b5a589bf4cc",
- "sha256": "0i16dj0ldiysgcvlbygxvpzxd5j3612hssykbvpld2xb1jvc4jmg"
+ "commit": "775d2a2b5902991ea9c117dee6b91833c2ac03f8",
+ "sha256": "0y9gijcbqxj8yb0khyd6v94g7ba81vsp820ipnaavn28g0z58mwl"
}
},
{
@@ -112712,14 +112807,14 @@
"repo": "swflint/time-block-command",
"unstable": {
"version": [
- 20230326,
- 1904
+ 20230410,
+ 2110
],
"deps": [
"ts"
],
- "commit": "90831463528a232414895b4905f67fa001550b9b",
- "sha256": "1li58yyxpg3a79xwn1zcqa2y154qivmxf9nm9hj49djb2nh0v74l"
+ "commit": "02a7988f2a3d6124b48716fa341677f93da6eb30",
+ "sha256": "19im12bs1arjjllmvvjsfr84p4wrigglxjqkbqd2ikbz3kxidcj6"
},
"stable": {
"version": [
@@ -113149,11 +113244,11 @@
"repo": "vifon/tmsu.el",
"unstable": {
"version": [
- 20230322,
- 2344
+ 20230419,
+ 103
],
- "commit": "567ba42958592e632bf611f004d24c09eb2eeac1",
- "sha256": "1mzqw4ak32mahdylh934wxbcdcic1r4mxk4a28wfrb59ivv3gyna"
+ "commit": "024534c8795945bb6d9403747c51c0941f6b57ae",
+ "sha256": "05ybswza68lkmrpj86qdpwl48lz7jbnd8qpcajmyfg5hfffywbf4"
}
},
{
@@ -113394,11 +113489,11 @@
"repo": "gongo/emacs-toml",
"unstable": {
"version": [
- 20130903,
- 1255
+ 20230411,
+ 1449
],
- "commit": "9633a6872928e737a2335aae1065768b23d8c3b3",
- "sha256": "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban"
+ "commit": "ee4a12bfc8c890c5e8b4bfa35837ce672a882967",
+ "sha256": "0dql85xzzgyqjfqzmmdsmc1dly8z952rz81pnj8r7gjkah1slbvd"
},
"stable": {
"version": [
@@ -113493,11 +113588,11 @@
"repo": "alphapapa/topsy.el",
"unstable": {
"version": [
- 20210831,
- 133
+ 20230414,
+ 1738
],
- "commit": "8ae0976dfdbe4461c33ed44cf1dedc2c903b0bb0",
- "sha256": "032i1prl2v5w4l37zjlqam7063s56nk61nj5l3ypmxp98yz9nrq8"
+ "commit": "149ee929dad667fd7668728d9b59dedb0183dfe5",
+ "sha256": "122xzikqcd5ycqb8gl19xy0l6pp6xm29viksmc0xl5kzxjvbcdyx"
}
},
{
@@ -113927,14 +114022,14 @@
"repo": "haji-ali/transient-extras",
"unstable": {
"version": [
- 20230317,
- 1118
+ 20230418,
+ 1112
],
"deps": [
"transient-extras"
],
- "commit": "a9edac72cc0e29a8cae4340bcb63a5eae3eac130",
- "sha256": "1fyiaiayyh58j61la9n0n2nm7jzisqg0ympr4fhvnw070b6p2v3b"
+ "commit": "00a4b22882399c0355a2026b1a1c98974e669e62",
+ "sha256": "1f04b7b735rwf0w8rl0i5q2kakyicwpcabqg3c3af7hgwwpd0c3d"
}
},
{
@@ -114172,19 +114267,16 @@
"repo": "ethan-leba/tree-edit",
"unstable": {
"version": [
- 20220407,
- 1629
+ 20230419,
+ 1753
],
"deps": [
"dash",
"reazon",
- "s",
- "tree-sitter",
- "tree-sitter-langs",
- "tsc"
+ "s"
],
- "commit": "774a1e9598617f334fcd31aa606c5e738012fb60",
- "sha256": "1bc51pmrr37yf116vmw436y2gidr5410ya2vlylrh3scssyd6zgw"
+ "commit": "e15b61e7e4ff98c44e6684fd2007bd1cbb31570e",
+ "sha256": "03mrmp3hpf2r7d6y78rfx2frzh98wkzg8qkcdv5azdg36gb21wc2"
}
},
{
@@ -114388,8 +114480,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20230323,
- 629
+ 20230412,
+ 1624
],
"deps": [
"ace-window",
@@ -114401,13 +114493,13 @@
"pfuture",
"s"
],
- "commit": "a20d49ed62fa64a4164a9a3f25c102ec0a338367",
- "sha256": "1spf9bnbvms4vgfd0cih5ran47qfxric3lvbnshgzkj34ib6gjll"
+ "commit": "26c16e997d2fa9c088042061c652ab0f6e839e2c",
+ "sha256": "1c9w083f1pqf63bqmm8ym4y2jwzn9wx3f4jydxff3dlx2crv08m8"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"ace-window",
@@ -114419,8 +114511,8 @@
"pfuture",
"s"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114431,27 +114523,27 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"all-the-icons",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"all-the-icons",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114462,27 +114554,27 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"evil",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"evil",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114493,25 +114585,25 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220915,
- 1626
+ 20230408,
+ 1109
],
"deps": [
"treemacs"
],
- "commit": "1961981c81122b22ea70962f45c01feeb54c3800",
- "sha256": "15nqx0m93dq05j29gn4ip937icizdrgwjiam4mlzpj014pd1bg66"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114522,29 +114614,29 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220917,
- 1026
+ 20230408,
+ 1109
],
"deps": [
"magit",
"pfuture",
"treemacs"
],
- "commit": "13a8a060b784021f3d6bd7c27f2a0bcf6ea0d087",
- "sha256": "0dv0jkw79nwb5j3lf22izdmsr8z3z2dcq9m7v9r7hbrqkslcj3hc"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"magit",
"pfuture",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114555,29 +114647,29 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"dash",
"persp-mode",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"dash",
"persp-mode",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114588,29 +114680,29 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"dash",
"perspective",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"dash",
"perspective",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114621,27 +114713,27 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"projectile",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"projectile",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -114652,27 +114744,27 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20220911,
- 1427
+ 20230408,
+ 1109
],
"deps": [
"dash",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
},
"stable": {
"version": [
3,
- 0
+ 1
],
"deps": [
"dash",
"treemacs"
],
- "commit": "861418d9d11b205930bd4555a40b430b9dde9dd4",
- "sha256": "0l6pbfrkl0v1iyc43vyhchbcfy7cjhinn8pw07aq4ssh6lxil7kp"
+ "commit": "127485317a19254ca20ba1910d10edf7dbaa2d97",
+ "sha256": "1rs0l0k9fd8xav627944jfm518yillcmjbdrkzjw3xq1wx80pn95"
}
},
{
@@ -115801,11 +115893,11 @@
"repo": "ideasman42/emacs-undo-fu-session",
"unstable": {
"version": [
- 20230205,
- 310
+ 20230405,
+ 221
],
- "commit": "7b3fd0647dd1fbd02101eec61440e6d44953bcd9",
- "sha256": "1vjpr2d9fdpc3slk8gav7vlld9v5nvz6wfs5fhig6m2icklvwhyq"
+ "commit": "6a306462ee1fa3a7c6303561f9ddf510e448b731",
+ "sha256": "1d64ydnn4f24wsydm3lyxns30v16alqp6g6vqa0p8jszvbam9cgg"
}
},
{
@@ -116746,26 +116838,26 @@
"repo": "diml/utop",
"unstable": {
"version": [
- 20230105,
- 1430
+ 20230421,
+ 1019
],
"deps": [
"tuareg"
],
- "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b",
- "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12"
+ "commit": "ba0e2c7fffab33cf78e2f6e4c346f65e7c0949ae",
+ "sha256": "12i5icvykgr6lsw00kdpdd65655p93fdi5pvcc2pnbi0s7l2savs"
},
"stable": {
"version": [
2,
- 11,
- 0
+ 12,
+ 1
],
"deps": [
"tuareg"
],
- "commit": "595002e6f07e6a3c6abc6e94a1b2448006115f1b",
- "sha256": "0a3imki76pz68s6s495wdw0ig5j8hiwrgbm2lj3ddsm5w2cxxi12"
+ "commit": "ba0e2c7fffab33cf78e2f6e4c346f65e7c0949ae",
+ "sha256": "12i5icvykgr6lsw00kdpdd65655p93fdi5pvcc2pnbi0s7l2savs"
}
},
{
@@ -117202,11 +117294,11 @@
"repo": "tarsius/vcomp",
"unstable": {
"version": [
- 20190128,
- 20
+ 20230407,
+ 1426
],
- "commit": "f839b3b3257a564b19d7f9557dc8bcbbe0b95842",
- "sha256": "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak"
+ "commit": "fdd010e9081d62aa6aaa1b25a2df925efd662d0c",
+ "sha256": "1kpafj5sxcd0qkxfnqqh9pl2wpjdy4vs04jjy1w33cdrz411k60v"
},
"stable": {
"version": [
@@ -117220,17 +117312,17 @@
},
{
"ename": "vcsh",
- "commit": "a5f56f914d7cc11f45be0474897998accb0fec2e",
- "sha256": "0cclih5yfgal3bi3n2na4sc4xw1rqalml3nknhgypxrlx4j784pb",
- "fetcher": "gitlab",
- "repo": "stepnem/vcsh-el",
+ "commit": "6f503b0d55c1c833b503d68f2169ddda63dfa371",
+ "sha256": "1gdjb7700z18a5pfbx9388sv5fyc83j4zvv2lxf3xdlmr2knxkgq",
+ "fetcher": "git",
+ "url": "https://git.smrk.net/vcsh.el",
"unstable": {
"version": [
- 20200226,
- 1339
+ 20230402,
+ 1229
],
- "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1",
- "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7"
+ "commit": "b9c0109a8c77446980de668785e6af1e46bdcdcd",
+ "sha256": "1jqgfk49295g8b0371s2dargncf05mcb5sv04j5xyfblrl5nm4pw"
},
"stable": {
"version": [
@@ -118328,11 +118420,11 @@
"repo": "emacs-vs/vs-dark-theme",
"unstable": {
"version": [
- 20230310,
- 914
+ 20230415,
+ 435
],
- "commit": "1bbf3d580856610a5fe600da9c28ed17e8b4691d",
- "sha256": "106lnjlhxi4dszpqy8hncgafnl0wd5p0if2r2yhs9rcdm18adkqq"
+ "commit": "8906a2a593888eafc61c5c202260edaddd3e6c75",
+ "sha256": "1vdv01r6pjk372d1fbp0x1rz4wrq2a7c8lp5jk1sw513bskj4irh"
},
"stable": {
"version": [
@@ -118351,11 +118443,11 @@
"repo": "emacs-vs/vs-light-theme",
"unstable": {
"version": [
- 20230310,
- 913
+ 20230415,
+ 434
],
- "commit": "5accd5c1e4581005a0859cf7d85b0191b6b7a30b",
- "sha256": "1sr28py5nqd1irr6kmd439i9s2w8ax17jgnwxq155k57j486sjrz"
+ "commit": "dc633afc975b1cfaa1b7435f7425f5548ff1c35a",
+ "sha256": "0skl0lph05adf07d4rcqf99fx7cwlzab1mql1vfalan2gv5b1zbd"
},
"stable": {
"version": [
@@ -118428,11 +118520,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20230217,
- 228
+ 20230417,
+ 424
],
- "commit": "3e5a9b754b8e61850bb7d1b63b090b9fbf6687f3",
- "sha256": "1px5nnwlnpiqry7s99ykvjf2hqryixnl6qvv9wj3808qkls6wykk"
+ "commit": "94e2b0b2b4a750e7907dacd5b4c0584900846dd1",
+ "sha256": "0p55wg6j2x5p4g13v20fhwrrw9dv3n2srk34vnxx9md5vhz1pq6p"
}
},
{
@@ -119649,8 +119741,8 @@
},
{
"ename": "wgrep-ack",
- "commit": "9648e3df896fcd97b3757a727108bc78261973cc",
- "sha256": "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh",
+ "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd",
+ "sha256": "1lgh3zgggsssr1nsf3bk4l72m78gy59zmf4bv0wni1c9kr1x6bhl",
"fetcher": "github",
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
@@ -119666,33 +119758,33 @@
},
"stable": {
"version": [
- 3,
+ 1,
0,
0
],
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
}
},
{
"ename": "wgrep-ag",
- "commit": "2c50b704343c4cac5e2a62a67e284ba6d8e15f8a",
- "sha256": "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a",
+ "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd",
+ "sha256": "01jdi7i1v4vnw3imh72nx74y0yz6rbq1p5abchpsfm84sx8nj7v5",
"fetcher": "github",
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
"version": [
- 20230203,
- 1214
+ 20230202,
+ 315
],
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
},
"stable": {
"version": [
@@ -119703,26 +119795,56 @@
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
+ }
+ },
+ {
+ "ename": "wgrep-deadgrep",
+ "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd",
+ "sha256": "1xlmldjzps61ag9kcgnmxl1s2b6z5mk9p5vmh9mvjjfraic14952",
+ "fetcher": "github",
+ "repo": "mhayashi1120/Emacs-wgrep",
+ "unstable": {
+ "version": [
+ 20230405,
+ 936
+ ],
+ "deps": [
+ "wgrep"
+ ],
+ "commit": "3584e9ba43287d712e0c17df5328211c174e9c60",
+ "sha256": "0mfc3j07lyj9dvq5nv77qmqbfmlvmqsx4ib8x7bryc1ljrhgd0cw"
+ },
+ "stable": {
+ "version": [
+ 2,
+ 3,
+ 0
+ ],
+ "deps": [
+ "wgrep"
+ ],
+ "commit": "3584e9ba43287d712e0c17df5328211c174e9c60",
+ "sha256": "0mfc3j07lyj9dvq5nv77qmqbfmlvmqsx4ib8x7bryc1ljrhgd0cw"
}
},
{
"ename": "wgrep-helm",
- "commit": "9648e3df896fcd97b3757a727108bc78261973cc",
- "sha256": "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b",
+ "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd",
+ "sha256": "02629drcz5vw08wria8qy68y5mrp8jcilag106gf1bv8ipl9rv8n",
"fetcher": "github",
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
"version": [
- 20230203,
- 1214
+ 20230202,
+ 315
],
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
},
"stable": {
"version": [
@@ -119733,14 +119855,14 @@
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
}
},
{
"ename": "wgrep-pt",
- "commit": "c39faef3b9c2e1867cd48341d9878b714dbed4eb",
- "sha256": "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg",
+ "commit": "3ec834a0c37dd816fb49eb5b86fa2594efd4ccfd",
+ "sha256": "1cqal3sa8x52av4hg8pi5vm00pjr5xgvidiwy47v6p2bznzj7wks",
"fetcher": "github",
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
@@ -119756,15 +119878,15 @@
},
"stable": {
"version": [
- 3,
+ 1,
0,
0
],
"deps": [
"wgrep"
],
- "commit": "b4d69280d8a6a5ded1597e02afbaa811a160383b",
- "sha256": "16qg5dpg7hms5dmh92ksnjahf6010pw97ggi7sb0mfafd6iwps0a"
+ "commit": "ff3cf631b6842432daa59bf604049ca916cce73b",
+ "sha256": "0q89qhvsy9pcnx3x2sxh17wzcdwwmr8h89r43czyqgpw6g84ib85"
}
},
{
@@ -120899,14 +121021,11 @@
"repo": "martianh/wordreference.el",
"unstable": {
"version": [
- 20230304,
- 1307
+ 20230405,
+ 1353
],
- "deps": [
- "s"
- ],
- "commit": "ea741be7ff0979552f7dfb591596075add0293b7",
- "sha256": "0yxpj8r6cb4si298cj4i0kmnw0dl3za6w65bfs43h4jza49isrn9"
+ "commit": "fcc791173a0e9f89d05b651a09f7d64a21aff584",
+ "sha256": "0b8h2bv6wzp48c71qw76x4shai3hhs1ylcnx9wa381sp24xgaw4a"
}
},
{
@@ -122891,16 +123010,16 @@
"repo": "tuedachu/ytdl",
"unstable": {
"version": [
- 20210506,
- 914
+ 20230331,
+ 1804
],
"deps": [
"async",
"dash",
"transient"
],
- "commit": "23da64f5c38b8cb83dbbadf704171b86cc0fa937",
- "sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl"
+ "commit": "2ea3daf2f6aa9d18b71fe3e15f05c30a56fca228",
+ "sha256": "0y62lkgsg19j05dpd6sp6zify8vq8xvpc8caqiy4rwi7p4ahacsf"
},
"stable": {
"version": [
@@ -123316,16 +123435,16 @@
"repo": "Vidianos-Giannitsis/zetteldesk.el",
"unstable": {
"version": [
- 20221121,
- 1811
+ 20230410,
+ 1048
],
"deps": [
"hydra",
"major-mode-hydra",
"zetteldesk"
],
- "commit": "b3e1479286932c59d951c68682675137acd834f9",
- "sha256": "1plph3ha1prq7p5cf75d9nm6l1sv0mhd5hl3b6v15jk54mfxj7hw"
+ "commit": "1266b7ed67b6236087c5591b28823ddc34058d2f",
+ "sha256": "0hkaxf20qxiadj4hjbgl3fkb4llzzjvv9xrq581i541gp2ink94p"
},
"stable": {
"version": [
@@ -123350,15 +123469,15 @@
"repo": "Vidianos-Giannitsis/zetteldesk.el",
"unstable": {
"version": [
- 20220702,
- 1527
+ 20230410,
+ 1048
],
"deps": [
"bibtex-completion",
"zetteldesk"
],
- "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d",
- "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk"
+ "commit": "1266b7ed67b6236087c5591b28823ddc34058d2f",
+ "sha256": "0hkaxf20qxiadj4hjbgl3fkb4llzzjvv9xrq581i541gp2ink94p"
},
"stable": {
"version": [
@@ -123534,11 +123653,11 @@
"repo": "localauthor/zk",
"unstable": {
"version": [
- 20221121,
- 1252
+ 20230421,
+ 632
],
- "commit": "afddac4018c8cf8d8088b4ca128adb01a872e741",
- "sha256": "0xmxfkrkijh0n73g0gpynb9rmrxf4mhmk0pwmf2q53wmvpvyn6bm"
+ "commit": "c5a8339109de67799f10de9b3ad6ff9f8087c3b1",
+ "sha256": "1fac6vskrbxpqxnw5klff2rnrqkf9q6865wsgw36bblgscibrcqd"
},
"stable": {
"version": [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix
index b7cca4ff3e..5edf029e00 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "featherpad";
- version = "1.3.5";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "tsujan";
repo = "FeatherPad";
rev = "V${version}";
- sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA=";
+ sha256 = "sha256-6hu8r38hrQEt0vaO9XA+KaWPuWYcBdydpjEf2V+m5xY=";
};
nativeBuildInputs = [ cmake pkg-config qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
deleted file mode 100644
index bcb7e066bf..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchFromGitHub
-, qmake
-, pkg-config
-, qttools
-, qtwebengine
-, hunspell
-, cmark
-, multimarkdown
-, pandoc
-}:
-
-mkDerivation rec {
- pname = "ghostwriter";
- version = "2.2.0";
-
- src = fetchFromGitHub {
- owner = "KDE";
- repo = pname;
- rev = version;
- hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI=";
- };
-
- nativeBuildInputs = [ qmake pkg-config qttools ];
-
- buildInputs = [ qtwebengine hunspell ];
-
- qtWrapperArgs = [
- "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
- ];
-
- meta = with lib; {
- description = "A cross-platform, aesthetic, distraction-free Markdown editor";
- homepage = "https://kde.github.io/ghostwriter";
- changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md";
- license = licenses.gpl3Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ dotlambda erictapen ];
- broken = stdenv.isDarwin;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
index 9b7c7e7cc4..6167c6134c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json
@@ -3,50 +3,50 @@
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "4b7f431dec981601f4c4e217612f582ffd6c8aa53d03604f518eb1f35357ec6a",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1.tar.gz",
- "build_number": "231.8109.174"
+ "version": "2023.1.2",
+ "sha256": "e3efc51a4431dc67da6463a8a37aab8ad6a214a8338430ae61cd4add5e7e5b04",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.tar.gz",
+ "build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "0512cef755d7a465a8a525fc88b443a5f8ace062f5aa0598e51e38d2ad34f341",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.tar.gz",
- "build_number": "231.8109.163"
+ "version": "2023.1.1",
+ "sha256": "9f1d9bd64352ade881343bd2d0cae63a4f5e9479e1bf822b4ab5f674fc0a8697",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1.tar.gz",
+ "build_number": "231.8770.3"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
- "version": "2022.3.2",
- "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz",
- "build_number": "223.8617.56"
+ "version": "2023.1",
+ "sha256": "626314f6d2771e197214981fa2078da5affb4b7b55bcffd5c6960803270dcecd",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.tar.gz",
+ "build_number": "231.8109.187"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
- "version": "2022.3.4",
- "sha256": "f8ff96336c416ab56abea03819cb3637a1d46b80a88e8544f1e9e98746b781ac",
- "url": "https://download.jetbrains.com/go/goland-2022.3.4.tar.gz",
- "build_number": "223.8836.56"
+ "version": "2023.1",
+ "sha256": "f208e2471ef5c4e232ff49434e8c14ce614b7924963ebd28d4c863399dd42d2c",
+ "url": "https://download.jetbrains.com/go/goland-2023.1.tar.gz",
+ "build_number": "231.8109.199"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "e6fe45c9df8e763ee3278444b5fb1003910c436752e83221e0303a62c5e81eaa",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.tar.gz",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "0a9bc55c2eaecbe983cd1db9ab6a353e3b7c3747f6fc6dea95736df104a68239",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.tar.gz",
+ "build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "3029c751c36d86fef0021feceb8f3010d37aebd42aef6d6aed9e3b9207c2d2ac",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.tar.gz",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "62ac9a6a801e5e029c3ca5ea28ee5de2680e3d58ae233cf1cb3d3636c6b205ca",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.tar.gz",
+ "build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -59,10 +59,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
- "version": "2022.3.3",
- "sha256": "d79a66032dfb85b16cef4ff308eb0161e06a831cee1fa93f2b7ca46fb1dc2ea9",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.tar.gz",
- "build_number": "223.8836.42",
+ "version": "2023.1",
+ "sha256": "2e1feb9ae691ada21bd5ddc28a693f75a27aedc8f211729370ed03925e63400b",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.tar.gz",
+ "build_number": "231.8109.199",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -84,76 +84,76 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
- "version": "2022.3.3",
- "sha256": "e4607ae70bd0acf827535aa329e3da73ddf3a3fa78b54b5c8d18eae6ef52919c",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.tar.gz",
- "build_number": "223.8836.53"
+ "version": "2023.1.1",
+ "sha256": "d50a7ed977e04ae50d6a16422a0968896fc6d94b0ab84d044ad3503d904570e0",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.tar.gz",
+ "build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "f9eabc980d82a9c9b27bc84daa7f1e786f41b17bbbfeca282985c6ed87e768ec",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.tar.gz",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "44a852fa872751ba53b1a10eb5d136a407ae7db90e4e4f8c37ba282dcc9c1419",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.tar.gz",
+ "build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
- "version": "2023.1",
- "sha256": "bd074c7bafdcfcce4db001a4356040d0badd7cd2f65418a35b4156b00a07e94b",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.tar.gz",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "93e11177010037a156939f2ded59ac5d8d0661e47a4471399665affe4a1eb7a9",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.tar.gz",
+ "build_number": "231.8770.64"
}
},
"x86_64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
- "version": "2023.1",
- "sha256": "f3e30a41c183d3ed929324dc2531c07374e59fa12185ced97b9b6800896e4f1e",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.2",
+ "sha256": "a980ecceda348d5a9e4ee7aaec2baf6d985a66c714ee270d402d708838e40d26",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2.dmg",
+ "build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
- "version": "2023.1",
- "sha256": "5de7f381f20c52bd0c96977f9d000033f0decd3912eaf0776eff540ec06c0881",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.dmg",
- "build_number": "231.8109.163"
+ "version": "2023.1.1",
+ "sha256": "94b2c070b91a45960d50deee5986d63e894dc2a2b3f371a1bcd650521029b66b",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1.dmg",
+ "build_number": "231.8770.3"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
- "version": "2022.3.2",
- "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg",
- "build_number": "223.8617.56"
+ "version": "2023.1",
+ "sha256": "323066b6171ca2cb117b667d5b4e626a680bc6ac3f121ad3d6faf0a1b78692c3",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.dmg",
+ "build_number": "231.8109.187"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
- "version": "2022.3.4",
- "sha256": "c42568393732fd8c25f81167a9e984c79c84095a9d394138c014814738ad5628",
- "url": "https://download.jetbrains.com/go/goland-2022.3.4.dmg",
- "build_number": "223.8836.56"
+ "version": "2023.1",
+ "sha256": "b1afadacb4c8d77fb8811abbfb5c4c447ec81ec27af2efef233c9f1164cab9c8",
+ "url": "https://download.jetbrains.com/go/goland-2023.1.dmg",
+ "build_number": "231.8109.199"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
- "version": "2023.1",
- "sha256": "233cc0253921bb002bd20eff0e493864b5b7ad951cd806d29a702cf1a6934f0f",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.dmg",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "ee7769737cb0e22d4c88ea8808d0767b8d88667b6b732748d745a5eb48809c46",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1.dmg",
+ "build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
- "version": "2023.1",
- "sha256": "1e8498336a5c4d90518f47d687a167adbe0e634d1f7d10530164c84542b91677",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.dmg",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "46fed7185c1cc901778593941db035d9806ebdad930eccbb4472668d440e60af",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1.dmg",
+ "build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -166,10 +166,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
- "version": "2022.3.3",
- "sha256": "79f5857f95452a6f66ba4ddbfd4445290449f21b90e6fd37e6118ac17cc052ed",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3.dmg",
- "build_number": "223.8836.42",
+ "version": "2023.1",
+ "sha256": "825c4626f4f4359cb47f2e6f74d8fe23df0fb991f2ac4cbb86b99a6c8dbee5f6",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.dmg",
+ "build_number": "231.8109.199",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -191,76 +191,76 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
- "version": "2022.3.3",
- "sha256": "e06189d3170b7005540de82ad4288111007c1231f15598ee9baa392004d31dae",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3.dmg",
- "build_number": "223.8836.53"
+ "version": "2023.1.1",
+ "sha256": "72131efb1d4606cefd9bfb11cc98443a13f5b9761ac007484564db2107e7f8e9",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1.dmg",
+ "build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
- "version": "2023.1",
- "sha256": "fba60e34520c807ba0a9124802e5782e2b4c8e63c27e07968b9cb642f0fc0a77",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "2c37a3e8c8a9b800b9132f31d0cfdffbb3fd4ee83de13b3141187ec05a79e3e0",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1.dmg",
+ "build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
- "version": "2023.1",
- "sha256": "35f110baf5a37232175a367c524a4cb04216bc2c0b0767506449648df6a12032",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "e7b9b86501682a0cf5a1b2d22e65491a6923635043378707581357a10fc8dc2a",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1.dmg",
+ "build_number": "231.8770.64"
}
},
"aarch64-darwin": {
"clion": {
"update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "83c9fffa1f8890a36db5fed21a49133989cb59bd98f8011ea0a6fdae7e2a7eb3",
- "url": "https://download.jetbrains.com/cpp/CLion-2023.1-aarch64.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.2",
+ "sha256": "61c8c1e76fe25389557111534c3fdadb5ba69427384890bf25499d0b474c147d",
+ "url": "https://download.jetbrains.com/cpp/CLion-2023.1.2-aarch64.dmg",
+ "build_number": "231.8770.66"
},
"datagrip": {
"update-channel": "DataGrip RELEASE",
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "17a74498378758bd2963e775dea7b77744a7072778a07a5685375b07acbd537b",
- "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1-aarch64.dmg",
- "build_number": "231.8109.163"
+ "version": "2023.1.1",
+ "sha256": "215ad7898e9a8ef2cf18ec90d342c995bf94a2fe5781fbce537e7166edf90652",
+ "url": "https://download.jetbrains.com/datagrip/datagrip-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.3"
},
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
- "version": "2022.3.2",
- "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg",
- "build_number": "223.8617.56"
+ "version": "2023.1",
+ "sha256": "8b9c656cc4b5c6bd8822e888d0b7d93ef9184ace4afc80da55767be3cf3a01ac",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1-aarch64.dmg",
+ "build_number": "231.8109.187"
},
"goland": {
"update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
- "version": "2022.3.4",
- "sha256": "279b522a7ee3c22dd0b5eec20b116921209008d4d50d0d5a7a08a13fb98914c9",
- "url": "https://download.jetbrains.com/go/goland-2022.3.4-aarch64.dmg",
- "build_number": "223.8836.56"
+ "version": "2023.1",
+ "sha256": "1774ededcf8dbea93bcd35142bffef5d0fe121b5fb5d2f146ef4b98352375862",
+ "url": "https://download.jetbrains.com/go/goland-2023.1-aarch64.dmg",
+ "build_number": "231.8109.199"
},
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "33964525cb28ac199e39e3c8eac4128874963f3292d5074257ae54fe1df9f986",
- "url": "https://download.jetbrains.com/idea/ideaIC-2023.1-aarch64.dmg",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "c9ab2053e1ad648466c547c378bd4e8753b4db8908de1caaeca91563ad80f6f9",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.65"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "6e2ca530fe082f79724fb89849e06fa91b8c17089430f9633a7e9a813204151f",
- "url": "https://download.jetbrains.com/idea/ideaIU-2023.1-aarch64.dmg",
- "build_number": "231.8109.175"
+ "version": "2023.1.1",
+ "sha256": "ae631000e19b821194b38be7caaa1e13ad78b465e6eb00f44215bb1173038448",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.65"
},
"mps": {
"update-channel": "MPS RELEASE",
@@ -273,10 +273,10 @@
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
- "version": "2022.3.3",
- "sha256": "23ba3a7ff84216b945327241be759429040bd09bc4269a01b77a2e3745c66132",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2022.3.3-aarch64.dmg",
- "build_number": "223.8836.42",
+ "version": "2023.1",
+ "sha256": "030d0b8f7ef486fa5dc757fcb2c5c5678d9f9dcc27769f79996c631c299657e7",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1-aarch64.dmg",
+ "build_number": "231.8109.199",
"version-major-minor": "2022.3"
},
"pycharm-community": {
@@ -298,26 +298,26 @@
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
- "version": "2022.3.3",
- "sha256": "5284412be4fc781047dda6d0af7bf6bebbc051e6c67bd2cf228ffee83d2d4ccb",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.3-aarch64.dmg",
- "build_number": "223.8836.53"
+ "version": "2023.1.1",
+ "sha256": "b089e107bd81829fffe97509912c4467f8b4ea09fd5f38ebd8cc8c57e6adb947",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.54"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "56d0202ea1261eb8ac5bd24f1cb044282cda5bd6c8306d3ec606109a3fe28fba",
- "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1-aarch64.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "17327de2d4edd3fbddb47c96d4db1bfba716786eb5b74b4a2e3ba6d0482610f9",
+ "url": "https://download.jetbrains.com/ruby/RubyMine-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.57"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
- "version": "2023.1",
- "sha256": "91f4a8f63c36407e9431a97a1ecc33762f67afd488046796cf4cca3a6709518c",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1-aarch64.dmg",
- "build_number": "231.8109.174"
+ "version": "2023.1.1",
+ "sha256": "3ccf935b898511106b25f3d30363767372f6a301311a5547f68210895b054cf1",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.1.1-aarch64.dmg",
+ "build_number": "231.8770.64"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
index 49662a0e8e..ab5aa92428 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py
@@ -81,10 +81,7 @@ in lib.fix' (lib.extends overrides packages)
def main():
editor = KakouneEditor("kakoune", ROOT, GET_PLUGINS)
- parser = editor.create_parser()
- args = parser.parse_args()
-
- pluginupdate.update_plugins(editor, args)
+ editor.run()
if __name__ == "__main__":
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix
index 3e6346f57e..ef21add4b3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "ldtk";
- version = "1.2.5";
+ version = "1.3.0";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
- sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A=";
+ hash = "sha256-2gGxl6l7J/L0CfMJk6PVmc1ABQISzAnjKDJgnMyx2PM=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];
@@ -48,8 +48,9 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
- homepage = "https://ldtk.io/";
description = "Modern, lightweight and efficient 2D level editor";
+ homepage = "https://ldtk.io/";
+ changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ felschr ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/moe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/moe/default.nix
index 197cccd43c..71449a0b8a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/moe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/moe/default.nix
@@ -5,12 +5,12 @@
, ncurses
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "moe";
version = "1.13";
src = fetchurl {
- url = "mirror://gnu/moe/moe-${self.version}.tar.lz";
+ url = "mirror://gnu/moe/moe-${finalAttrs.version}.tar.lz";
hash = "sha256-Q6VXvFEvidbHGOX0ECnP46BVaCYg642+zmMC80omFGs=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix
index ab9489cd38..dcea229e81 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "notepad-next";
- version = "0.6";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "dail8859";
repo = "NotepadNext";
rev = "v${version}";
- sha256 = "sha256-t+TfyhQjUp4xJQ4vihAwm691dpt8ctQwLYDRRAQI7OM=";
+ sha256 = "sha256-4OjthXAzcAVwDA7+oK7sKiOiB7i/cYIdxyrz+9wPvDg=";
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix
index ec8eb24073..59723a0432 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix
@@ -4,13 +4,13 @@
buildGoModule rec {
pname = "orbiton";
- version = "2.60.5";
+ version = "2.61.0";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
- hash = "sha256-gCE4mrZXLFteZKUPDsAc1hS1I/WTns9I9oZE5bAF7fU=";
+ hash = "sha256-GknQXHwpdIRzSjIc1ITsoiaks4Vi5KmVqL7sHzmfnmQ=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix
index 545cd95f6f..85b28061e4 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix
@@ -17,23 +17,26 @@
, makeDesktopItem
, copyDesktopItems
, makeWrapper
+, nodePackages
+, python3
}:
let
- pname = "Pulsar";
- version = "1.103.0";
+ pname = "pulsar";
+ version = "1.104.0";
sourcesPath = {
x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
- x86_64-linux.hash = "sha256-C9La+rMpxyFthNPwPBZfV1goP/F1TiNYYYwmPCSkKdw=";
+ x86_64-linux.hash = "sha256-HEMUQVNPb6qWIXX25N79HwHo7j11MyFiBRsq9otdAL8=";
aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
- aarch64-linux.hash = "sha256-uVGxDLqFgm5USZT6i7pLYJZq8jFxZviVXXYTL3RVhpw=";
+ aarch64-linux.hash = "sha256-f+s54XtLLdhTFY9caKTKngJF6zLai0F7ur9v37bwuNE=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
additionalLibs = lib.makeLibraryPath [
xorg.libxshmfence
libxkbcommon
xorg.libxkbfile
+ stdenv.cc.cc.lib
];
newLibpath = "${atomEnv.libPath}:${additionalLibs}";
@@ -57,6 +60,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
wrapGAppsHook
copyDesktopItems
+ nodePackages.asar
];
buildInputs = [
@@ -110,12 +114,26 @@ stdenv.mkDerivation rec {
ln -s ${git}/bin/git $dugite/git/bin/git
rm -f $dugite/git/libexec/git-core/git
ln -s ${git}/bin/git $dugite/git/libexec/git-core/git
+
+ # We have to patch a prebuilt binary in the asar archive
+ # But asar complains because the node_gyp unpacked dependency uses a prebuilt Python3 itself
+
+ rm $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
+ ln -s ${python3}/bin/python3 $opt/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3
'' + ''
# Patch the bundled node executables
find $opt -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" {} \;
# Also patch the node executable for apm
patchelf --set-rpath "${newLibpath}:$opt" $opt/resources/app/ppm/bin/node
+ # The pre-packaged ASAR bundle comes with prebuild binaries, expecting libstdc++.so.6
+ asarBundle=$TMPDIR/asarbundle
+ asar e $opt/resources/app.asar $asarBundle
+ find $asarBundle -name "*.node" -exec patchelf --set-rpath "${newLibpath}:$opt" --add-needed libstdc++.so.6 {} \;
+ unlink $asarBundle/node_modules/document-register-element/dre # Self referencing symlink, breaking asar rebundling
+ asar p $asarBundle $opt/resources/app.asar
+ rm -rf $asarBundle
+
# We have patched the original wrapper, but now it needs the "PULSAR_PATH" env var
mkdir -p $out/bin
wrapProgram $opt/resources/pulsar.sh \
diff --git a/third_party/nixpkgs/pkgs/applications/editors/pulsar/update.mjs b/third_party/nixpkgs/pkgs/applications/editors/pulsar/update.mjs
index ecddbbbb9b..2e4155d874 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/pulsar/update.mjs
+++ b/third_party/nixpkgs/pkgs/applications/editors/pulsar/update.mjs
@@ -1,18 +1,16 @@
#!/usr/bin/env nix-shell
/*
-#!nix-shell -i node -p nodejs-18_x
+#!nix-shell -i node -p nodejs_18
*/
import { promises as fs } from 'node:fs';
-import { promisify } from 'node:util';
-import { exec as _exec } from 'node:child_process';
-const exec = promisify(_exec);
const constants = {
githubUrl: "https://api.github.com/repos/pulsar-edit/pulsar/releases",
sha256FileURL: (newVersion) => `https://github.com/pulsar-edit/pulsar/releases/download/v${newVersion}/SHA256SUMS.txt`,
x86_64FileName: (newVersion) => `Linux.pulsar-${newVersion}.tar.gz`,
aarch64FileName: (newVersion) => `ARM.Linux.pulsar-${newVersion}-arm64.tar.gz`,
+ targetFile: new URL("default.nix", import.meta.url).pathname,
};
async function getLatestVersion() {
@@ -69,10 +67,10 @@ async function updateFile(newVersion, sha256Sums, currentFile) {
newFile = newFile.replace(/x86_64-linux\.hash = "(.*)";/, `x86_64-linux.hash = "${sha256Sums.x86_64}";`);
newFile = newFile.replace(/aarch64-linux\.hash = "(.*)";/, `aarch64-linux.hash = "${sha256Sums.aarch64}";`);
- await fs.writeFile('default.nix', newFile);
+ await fs.writeFile(constants.targetFile, newFile);
};
-let currentFile = await fs.readFile('default.nix', 'utf8');
+let currentFile = await fs.readFile(constants.targetFile, 'utf8');
let currentVersion = currentFile.match(/version = "(.*)";/)[1];
const newVersion = await getLatestVersion();
if (currentVersion === newVersion) {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
index 50eacf97bf..a3eee45ed4 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/quartus-prime/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript
+{ stdenv, lib, buildFHSEnvChroot, callPackage, makeDesktopItem, writeScript
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; }
}:
@@ -13,7 +13,7 @@ let
categories = [ "Development" ];
};
# I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
-in buildFHSUserEnv rec {
+in buildFHSEnvChroot rec {
name = "quartus-prime-lite"; # wrapped
targetPkgs = pkgs: with pkgs; [
@@ -44,7 +44,7 @@ in buildFHSUserEnv rec {
xorg.libXext
xorg.libXrender
libudev0-shim
- libxcrypt
+ libxcrypt-legacy
];
passthru = { inherit unwrapped; };
diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
index 193d7a0416..4ba505ff78 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix
@@ -11,20 +11,21 @@
, gobject-introspection
, gtksourceview4
, gspell
+, libhandy
, poppler_gi
-, webkitgtk
+, webkitgtk_4_1
, librsvg
}:
python3.pkgs.buildPythonApplication rec {
pname = "setzer";
- version = "0.4.8";
+ version = "55";
src = fetchFromGitHub {
owner = "cvfosammmm";
repo = "Setzer";
rev = "v${version}";
- hash = "sha256-7NPyvAof0xObYZws3KFAbdue/GpIRthzdX00jc9GhYs=";
+ hash = "sha256-Mcl9kWeo4w/wW8crR58Yyqoh26w8/SmNrjmHps6DmRA=";
};
format = "other";
@@ -43,8 +44,9 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
gtksourceview4
gspell
+ libhandy
poppler_gi
- webkitgtk
+ webkitgtk_4_1
librsvg
];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
index ddb759837b..10c7ee38e9 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json
@@ -1,13 +1,13 @@
{
- "version": "3.150.45",
+ "version": "3.151.3",
"appimage": {
"x86_64-linux": {
- "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-x86_64.AppImage",
- "hash": "sha512-a1g+nOJJ1MSiCvguFAlAPhwyogAS6cwDD8Ou+P0lufLLG2HyLPdOEwVl8Nhqq4iaFFQoyY3FtKm+Sdpd3WJ72Q=="
+ "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-x86_64.AppImage",
+ "hash": "sha512-Wk31nB9OjR8E3cPFfh4KpUqQxXsnerzDt5TgaExXW4OeWLftv3ejyf2ROWXAoqG/8K87OclbunCqS3b2g8hAjA=="
},
"aarch64-linux": {
- "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-arm64.AppImage",
- "hash": "sha512-ivnyuMhdBweRs+9Qkt4srm2JlMMxLFDbT0DBaeNCHVuyWM/13LRczIyto2tbPp9xC6DCJmGktjY3ZYsB3odftA=="
+ "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-arm64.AppImage",
+ "hash": "sha512-nPTpEJs978wxZjG1pN15ETgUBdGBzl574QHCQNo2ShYvhi9Uf38jCaGQIsY0d779eT8kSHuMBXoAiE/flxfWMQ=="
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix
index d4bfdebd6a..01c2e8e74a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler }:
+{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook }:
mkDerivation rec {
pname = "texmaker";
@@ -10,7 +10,7 @@ mkDerivation rec {
};
buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
- nativeBuildInputs = [ pkg-config poppler qmake ];
+ nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook ];
env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
qmakeFlags = [
@@ -19,6 +19,12 @@ mkDerivation rec {
"METAINFODIR=${placeholder "out"}/share/metainfo"
];
+ dontWrapGApps = true;
+
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
meta = with lib; {
description = "TeX and LaTeX editor";
longDescription=''
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch b/third_party/nixpkgs/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch
new file mode 100644
index 0000000000..8cafd9c3e2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch
@@ -0,0 +1,26 @@
+From b26a91fd0f70e8f0a8f3360a5f371a1eace70002 Mon Sep 17 00:00:00 2001
+From: Nick Cao
+Date: Sun, 16 Apr 2023 22:10:55 +0800
+Subject: [PATCH] fix build with qt 6.5
+
+The fix is borrowed from https://github.com/hluk/CopyQ/pull/2324
+---
+ src/scripting/Script.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scripting/Script.cpp b/src/scripting/Script.cpp
+index 3437f125..906eefde 100644
+--- a/src/scripting/Script.cpp
++++ b/src/scripting/Script.cpp
+@@ -352,7 +352,7 @@ Script::MethodResult Script::doCallMethod(QObject * obj, const QString& name,
+ }
+ else if (typeName == QString::fromLatin1("QVariant")) {
+ // QMetaType can't construct QVariant objects
+- retValArg = Q_RETURN_ARG(QVariant, result);
++ retValArg = QGenericReturnArgument("QVariant", static_cast(result.data()));
+ }
+ else {
+ // Note: These two lines are a hack!
+--
+2.39.2
+
diff --git a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix
index 4f1544eeb4..72db4262c8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/texworks/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ=";
};
+ patches = [ ./0001-fix-build-with-qt-6.5.patch ];
+
nativeBuildInputs = [
cmake
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
index 47270dcce6..4d83ffe082 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
@@ -19,13 +19,13 @@ in
stdenv.mkDerivation rec {
pname = "tiled";
- version = "1.10.0";
+ version = "1.10.1";
src = fetchFromGitHub {
owner = "mapeditor";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134=";
+ sha256 = "sha256-zrDka6yXJ++UuGFepn8glQ1r7ufBcjsnNZuH+jnkJw0=";
};
nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
index ad64772de5..8b49850d60 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
@@ -160,6 +160,9 @@ in stdenv.mkDerivation rec {
++ lib.optional tclSupport tcl
++ lib.optional rubySupport ruby;
+ # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
+ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
+
preConfigure = "" + lib.optionalString ftNixSupport ''
cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix
index 49af99fad1..c5b9a607f2 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix
@@ -15,7 +15,7 @@ in
stdenv.mkDerivation {
pname = "vim";
- inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
+ inherit (common) version src postPatch hardeningDisable enableParallelBuilding enableParallelInstalling meta;
nativeBuildInputs = [ gettext pkg-config ];
buildInputs = [ ncurses bash gawk ]
@@ -50,6 +50,15 @@ stdenv.mkDerivation {
ln -s $out/bin/vim $out/bin/vi
mkdir -p $out/share/vim
cp "${vimrc}" $out/share/vim/vimrc
+
+ # Prevent bugs in the upstream makefile from silently failing and missing outputs.
+ # Some of those are build-time requirements for other packages.
+ for tool in ex xxd vi view vimdiff; do
+ if [ ! -e "$out/bin/$tool" ]; then
+ echo "ERROR: install phase did not install '$tool'."
+ exit 1
+ fi
+ done
'';
__impureHostDeps = [ "/dev/ptmx" ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
index 35e13d23f2..e74c97d1c5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1,4 +1,4 @@
-# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
+# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
final: prev:
@@ -29,12 +29,12 @@ final: prev:
ChatGPT-nvim = buildVimPluginFrom2Nix {
pname = "ChatGPT.nvim";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "jackMort";
repo = "ChatGPT.nvim";
- rev = "3ff8403136e3298f45ff9d11456f922da5b9fc50";
- sha256 = "057y17xqs29w06rmiyjnacj3v4pix3a0a088khg3kxv6lnazsyd4";
+ rev = "5a0fdf6c408a53924081aff0b7379e765c7edc1b";
+ sha256 = "06pjcsbg4kmxily4ggnc7sx06kas0v5vqch2jzkazds2icbnpnk3";
};
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
};
@@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
- version = "2023-03-31";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
- rev = "7ce1b1519a45f48aa4b5f35b7b7a886b42fe56d8";
- sha256 = "0rvv2rdn5g3x54prrhiv3lq9m1d55kx8myria0xpmckw8rl1i38m";
+ rev = "2f93f69171e6203d79b2aaf1798be71ae1137bda";
+ sha256 = "0qmwixccxjcfi3d6mk1h488y0nkv3d7csspn9m5mnp8qw1m617di";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
- version = "2023-04-06";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "a592fbe98959d13014b022ec1b1418498309019c";
- sha256 = "0adx845p0vwyrzqx3ncl34dsmaac036bh0ydb6ib4kn3j5fq3slq";
+ rev = "bff3297b0c1dba18907c9e5a8eb433e8b2add045";
+ sha256 = "05vzrmylh84wz4248kwn0nfp0q1sw6k69lkx3ssr7w4yxpf92986";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -365,12 +365,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
- version = "2023-04-07";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
- rev = "2cf2f0a9875c66c5179dda0c86143af3bc5ae119";
- sha256 = "0i7fhy0l94x3nd5wmzfmw4aqqrj2aw8vvhb8cdghyh8mqddbqj8n";
+ rev = "07ef56b433dabe259687cb2a2d603aaab82753ed";
+ sha256 = "1n7ycr5wj3ad8i79z4g5l8b5d6qiz5crzvpimj9nzlmi0r2az7yr";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@@ -437,12 +437,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2023-04-06";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "b3e8838ec90d6b017b3b99715fdb2463d2de730f";
- sha256 = "1yf5h3l273hws5vhfsfigghcva5nb7fxyx3isj0dv5xx8lvgqsdq";
+ rev = "78ba06ef21bfab9835ced9f4ba8ffdac1b975c40";
+ sha256 = "0wr3d5ziwnb2v3fwh5asl1jq9js159qz8q1l8p0y4wx1jbfvryll";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -486,12 +486,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2023-04-04";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "7371322c60120a56bcc833c407de96be42c18172";
- sha256 = "06m3kgj4r7cys16phihszdqsdpkhkgx2q4xx59jagcjgdijn6dgp";
+ rev = "00cac8e96f932dca8f559849cbea3f0812621d0d";
+ sha256 = "1i57k301va0c1kgxblz4cyq6s38g6z54xzklddyhrvvq4pvn31mi";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -547,12 +547,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2023-04-07";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "57254db9ef1e0b0bf21466ed2d3ebaf60338768f";
- sha256 = "01n04zi55y6nrg2dg2jpfacs7a140wa0m8rfkingdvx59n5g3j6j";
+ rev = "fdadaed2ba93432add241bb25f9935dc2ebb4152";
+ sha256 = "08i1fs55b3wqbvn3259c7zwnr45iv0lcyqri7ig7xgppi13hm2x8";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -571,12 +571,12 @@ final: prev:
alpha-nvim = buildVimPluginFrom2Nix {
pname = "alpha-nvim";
- version = "2023-03-21";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "goolord";
repo = "alpha-nvim";
- rev = "dafa11a6218c2296df044e00f88d9187222ba6b0";
- sha256 = "0qsm73hjdg82xvd1pdi30splm2031n4s9wk1llmh0pllwz97zllc";
+ rev = "87c204040e3f5d4c1c95067b35905d8f8a2f2545";
+ sha256 = "0g4p18852vl6j9yb1cgqbcmkil90sf30wss85xcfa2zviid0ab6a";
};
meta.homepage = "https://github.com/goolord/alpha-nvim/";
};
@@ -847,36 +847,36 @@ final: prev:
b64-nvim = buildVimPluginFrom2Nix {
pname = "b64.nvim";
- version = "2022-08-22";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "taybart";
repo = "b64.nvim";
- rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
- sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
+ rev = "0efc9f2d5baf546298c3ef936434fe5783d7ecb3";
+ sha256 = "1sb24ydihp01qkrvfr1pc2wf5yjl9sb8b893x5hm6l8q8a70pr5h";
};
meta.homepage = "https://github.com/taybart/b64.nvim/";
};
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
- version = "2023-04-10";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "romgrk";
repo = "barbar.nvim";
- rev = "0a21988ddfe4e63ef4d89332b2a6914dbdbf16ac";
- sha256 = "1iy8pizpx1j6lqhnkfp3iijy9y6c2ja3dqvkmp68wryiffr1bvgh";
+ rev = "8edf23fe94a2486a8bc74cb64efb9211810f7e83";
+ sha256 = "1ja724qvy2g1irgpkm1yihmbzcyzmmkdwlfa5pbbkla1n9wppks4";
};
meta.homepage = "https://github.com/romgrk/barbar.nvim/";
};
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
- version = "2023-04-09";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
- rev = "0859f1264310e8b5f75e2da1d5254c586fc7e3c8";
- sha256 = "0h391fy61il5xvdm48h73ddckf27x5x4vqr1x6fbv7zll9qi1q1l";
+ rev = "ac2272e72e4d1960d9cab62f9914e264ba1e6082";
+ sha256 = "1lgnibhqrwl956v3h6rbxljqx87ps582isiwhf98afh541wsk18a";
};
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
};
@@ -941,6 +941,18 @@ final: prev:
meta.homepage = "https://github.com/max397574/better-escape.nvim/";
};
+ bigfile-nvim = buildVimPluginFrom2Nix {
+ pname = "bigfile.nvim";
+ version = "2022-12-01";
+ src = fetchFromGitHub {
+ owner = "LunarVim";
+ repo = "bigfile.nvim";
+ rev = "c1bad34ce742b4f360b67ca23c873fef998240fc";
+ sha256 = "1jgjj0knyizwyvbv9ddg36hcpwbscy4p5fsqwzybnsjgxd32602j";
+ };
+ meta.homepage = "https://github.com/LunarVim/bigfile.nvim/";
+ };
+
bitbake-vim = buildVimPluginFrom2Nix {
pname = "bitbake.vim";
version = "2021-02-06";
@@ -1051,12 +1063,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2023-04-03";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "ef4fdc5cea3473801dce89b5fdfe633380c80c65";
- sha256 = "1kxkgz58xi7257f90apmna9nxp77d8x63zkcxygi2g67p745fd78";
+ rev = "8b32447f1ba00f71ec2ebb413249d1d84228d9fb";
+ sha256 = "1i46lgd2w1zwi08zkfs4xfq2gzz7s58hw1mm6s76avbp4fqjrr7q";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@@ -1111,12 +1123,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
- version = "2023-03-31";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
- rev = "3e07b8ffc9dab162cd2940e75601da75ed0cebbe";
- sha256 = "0rk2gvnksss5w29sij6pw9rw0ah7wgvl5q8h21iby6wyvrzhh32i";
+ rev = "985c4a25ad610c6dc3294f1f8d52384440e2b600";
+ sha256 = "0akwmz8vfa5wy6wdvammq1hrmkxb07d7i9kn3hvhikzld2s82kgy";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@@ -1279,12 +1291,12 @@ final: prev:
cmp-cmdline = buildVimPluginFrom2Nix {
pname = "cmp-cmdline";
- version = "2023-02-16";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-cmdline";
- rev = "8fcc934a52af96120fe26358985c10c035984b53";
- sha256 = "1bhhna3f1xzf6y7q6iq9v2369w0jrgnh0hngnw84wh79pknqsgb3";
+ rev = "af88e700417c6449719fc77f6f3745f88e42d5da";
+ sha256 = "07wkbyzia7b7m99dd96km3qhdl8ndibjnsjix5skzqsvxjv24jib";
};
meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
};
@@ -1531,24 +1543,24 @@ final: prev:
cmp-nvim-lua = buildVimPluginFrom2Nix {
pname = "cmp-nvim-lua";
- version = "2023-01-05";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-nvim-lua";
- rev = "f3491638d123cfd2c8048aefaf66d246ff250ca6";
- sha256 = "0qydmgfgarf17hz10i6ffqvppmyrj3q1dm2awksk4l4y6z0cgg7w";
+ rev = "f12408bdb54c39c23e67cab726264c10db33ada8";
+ sha256 = "18qqcqjyxrmzvpj7m7wyjx1313h66vg8992n6y9lwawmb4mwxrg9";
};
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/";
};
cmp-nvim-tags = buildVimPluginFrom2Nix {
pname = "cmp-nvim-tags";
- version = "2022-09-16";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "quangnguyen30192";
repo = "cmp-nvim-tags";
- rev = "de630ce773d249ab5739405a3428a5a29d7e0076";
- sha256 = "0mxf3phyzkrakkzhirhr2f1jvigzz9gi7in5b31px3m9yxfhaymw";
+ rev = "28542c9adb9fed45a895b7091591f03c80e4c40a";
+ sha256 = "16fgf2s6r56byfr00ypwyg80pvpmv4n7dzdpysvjp6sf5v6q4d14";
};
meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/";
};
@@ -1651,12 +1663,12 @@ final: prev:
cmp-tabnine = buildVimPluginFrom2Nix {
pname = "cmp-tabnine";
- version = "2023-03-21";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "tzachar";
repo = "cmp-tabnine";
- rev = "4c8a0db92e75c848fb066edd280072389db80d24";
- sha256 = "19ypgjd3hfiw3qvjzx543x9i3pk09qj0wr89w2rbngsj4sypfm4h";
+ rev = "380a11420752ac1c2d8fbb344454ff7f955b912c";
+ sha256 = "0dn7cm1zxincy2m83irlc979ci9wlgvic66j1mqps2a2g0aan1zj";
};
meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
};
@@ -1927,12 +1939,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2023-04-11";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "ab62084fa992ed7ee3c19bbb5227ce2c4234612b";
- sha256 = "02hsh3addjmdinhh3irh0hsbyqvl4mhkd5msa6c4ddaxf6zbwclq";
+ rev = "a89339ffbee677ab0521a483b6dac7e2e67c907e";
+ sha256 = "0q2882md4c42v255y7pfhqiv1vvi0h76wh4i8n2a00958vkmzg36";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1999,12 +2011,12 @@ final: prev:
compiler-explorer-nvim = buildVimPluginFrom2Nix {
pname = "compiler-explorer.nvim";
- version = "2023-03-31";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "krady21";
repo = "compiler-explorer.nvim";
- rev = "c086828f149728ccf934d966908674f26fb59339";
- sha256 = "1s1dk9x4hmsg0p6l6r5ays8bqcg1rwn94873g72c0z9nf6f5yaab";
+ rev = "6708947a47479bc922847432f0909cbeb19ee557";
+ sha256 = "1ky0pqjkjhxxgllzk0rml9xnpjwv83rvsrz2f9vqjn7wn9k4rkpr";
};
meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
};
@@ -2131,12 +2143,12 @@ final: prev:
copilot-lua = buildVimPluginFrom2Nix {
pname = "copilot.lua";
- version = "2023-04-11";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
- rev = "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb";
- sha256 = "1f5jzjih3bq7nlhvlrw8ndzvknmaaih4z10m0hzsjd4gdqnpvldn";
+ rev = "decc8d43bcd73a288fa689690c20faf0485da217";
+ sha256 = "18wsjan43mj8iwm2g5l3bkzcrwxcsinpwlwvbsylsfj5yxqjmvyy";
};
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
@@ -2155,24 +2167,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
- version = "2023-04-09";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
- rev = "be72c7ad5d8dfe942fd5aec89505805c2e474b93";
- sha256 = "1q7hz1pj7rs1d2d53rk624qqmz0cglqxlh578b4ik9k87i0bfpzx";
+ rev = "551ee8e34fe4d24252ee0c20f51357b78a52d3c7";
+ sha256 = "13c8m6y9329k61flkam9vd85dwaw7641h1hlaa2d9jvq06f19fgi";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
- version = "2023-04-09";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
- rev = "ee47eb595100b311ebd81d7285304d58bf28db29";
- sha256 = "14i9mz2m4zq80ak2f9x71wc86r6kaf93kc7lc7jkhjllfpr537i8";
+ rev = "4ff6cd4ca34876e231743db480aef699a3ebea98";
+ sha256 = "0mqj667kq4hmicysvmj89w4s18kdsl82ah879njv4jvq7s205vgn";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2191,12 +2203,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2023-04-09";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "4c764a092b0a64ad45d69273fde35224cfb89861";
- sha256 = "064qcl093hv2hpfkxh34a53v2ww5hmgvcwarvgn2zs7r0r9wrqyk";
+ rev = "d9eaa12329b4f48a5e6c29ed6a0b9217ebf67f23";
+ sha256 = "0xrj6qrw0vpiybnqjnhhg60gcihkzgxl80dgfijdx669ivvs72vh";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2335,12 +2347,12 @@ final: prev:
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2023-04-07";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "dashboard-nvim";
- rev = "6f65affd9904ed96a7c7a3edc55486f7f517931d";
- sha256 = "1jqxl2hsygmsq4bm3461qmancszh6ddr713g3zlzb1a17fyrivpk";
+ rev = "275e7c8579858c3ee06f32c16bdc687153ca7204";
+ sha256 = "1wsy39swlpw06lm8gq9vzgqd50dj4indr0b7k4h4d41ggfpn647d";
};
meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
};
@@ -2721,12 +2733,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2023-04-06";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "6bebefbc4c90e6d2b8c65e65b055d284475d89f8";
- sha256 = "0rpfy4cc6wb443y73gncb4l6iq82mka1gmblagknycrk64ycinaw";
+ rev = "f9ddbe798cb92854a383e2377482a49139a52c3d";
+ sha256 = "05a0a4521vba35aa9gy1j3r70y3pqy0rirq7cnzmla654n0d7ddl";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2769,24 +2781,24 @@ final: prev:
dracula-nvim = buildVimPluginFrom2Nix {
pname = "dracula.nvim";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "Mofiqul";
repo = "dracula.nvim";
- rev = "ce99c0b68edca27caa1701c0e79cf461b484d501";
- sha256 = "00rnxjz7cvlcbs1zld04fxnk8y5vjvikcz078bs7ap3l4pg1zy5p";
+ rev = "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb";
+ sha256 = "16z6rzay9sn011pl1ljjqs2f2k7igzzyqg9k6dyzzxjb3k1037rl";
};
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
};
dressing-nvim = buildVimPluginFrom2Nix {
pname = "dressing.nvim";
- version = "2023-04-07";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
- rev = "91b9ba8a9474d2c4156dc2f3e858e07ae8faecf0";
- sha256 = "09cwg5vfccacxqm5y6k28f3kvmx80mczd1c7j4srdi824mqj9ffa";
+ rev = "0e3e1eba147fee6e638ac1ac28f0495bcde17319";
+ sha256 = "0yndy9n5hl1vv53nflixrqng11mpf5qj7afk9x137bpi847b2x7h";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@@ -2805,12 +2817,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2023-04-11";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "cda4ae057cc6c0f6e15865772b64d2474f4dd5c2";
- sha256 = "0skrfnq6ch41blb2v8pw7pi6mkjkv6kjgfi9nkx29zgfqs0lv12d";
+ rev = "35396c36580e329d5b3717b397431499a661e99b";
+ sha256 = "0ph229jg8bc1g7fln2bkbbjyic8kbc634znffwkvicjk7i81yi3z";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -2840,6 +2852,18 @@ final: prev:
meta.homepage = "https://github.com/gpanders/editorconfig.nvim/";
};
+ elixir-tools-nvim = buildVimPluginFrom2Nix {
+ pname = "elixir-tools.nvim";
+ version = "2023-04-21";
+ src = fetchFromGitHub {
+ owner = "elixir-tools";
+ repo = "elixir-tools.nvim";
+ rev = "a9bb505891b2d6eda659b33f69f5e65c9849785d";
+ sha256 = "0ks90kvssckqpd2aifp5bg6xlvb4jjiy6aq4xwjiriln3npgd477";
+ };
+ meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
+ };
+
elm-vim = buildVimPluginFrom2Nix {
pname = "elm-vim";
version = "2020-09-23";
@@ -2891,12 +2915,12 @@ final: prev:
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "everforest";
- rev = "8ab6ce701e2d042eabded36f5d8cf7072b896b46";
- sha256 = "0j6x3iiv9lkrm8prkax7pvk3kr71a7xwzfwcldl15y56jn01va57";
+ rev = "61693d7b90056b90e2f482d36301b485f6c815fa";
+ sha256 = "0s7m7gipc248dka7a6w6v5zsp8660isajnd844swkhsyfzby4010";
};
meta.homepage = "https://github.com/sainnhe/everforest/";
};
@@ -2951,14 +2975,14 @@ final: prev:
feline-nvim = buildVimPluginFrom2Nix {
pname = "feline.nvim";
- version = "2022-12-22";
+ version = "2023-03-29";
src = fetchFromGitHub {
- owner = "famiu";
+ owner = "freddiehaddad";
repo = "feline.nvim";
- rev = "d48b6f92c6ccdd6654c956f437be49ea160b5b0c";
- sha256 = "1d3sj499mj63djy2bjp7yx5qyrzsq8gphzy3wl9fnfnni1bzwg4g";
+ rev = "a02bcdde649cdfca0e25d2dd693ba140233b5c3e";
+ sha256 = "0s646hd3pbzv5i8vpsk019hwgyqnrd3qhm6lzilqlydrz3yx3b87";
};
- meta.homepage = "https://github.com/famiu/feline.nvim/";
+ meta.homepage = "https://github.com/freddiehaddad/feline.nvim/";
};
fennel-vim = buildVimPluginFrom2Nix {
@@ -3048,12 +3072,12 @@ final: prev:
flatten-nvim = buildVimPluginFrom2Nix {
pname = "flatten.nvim";
- version = "2023-04-09";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "willothy";
repo = "flatten.nvim";
- rev = "3508beaa48d316937d8332d17f7ddc1b7d3f9a83";
- sha256 = "1npwcscw01r109vlgkfk5wziwr31nscz3xv0k7gjhpb09chnrb43";
+ rev = "28db6048a509c9653cb4a4c734e03f412139aa11";
+ sha256 = "0fv7ysb6nl12hhbxr1sm8sjrknpfm6n9z8sr576vpq7cd3ldyzd1";
};
meta.homepage = "https://github.com/willothy/flatten.nvim/";
};
@@ -3120,24 +3144,24 @@ final: prev:
flutter-tools-nvim = buildVimPluginFrom2Nix {
pname = "flutter-tools.nvim";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "akinsho";
repo = "flutter-tools.nvim";
- rev = "b64892ec95b4454f1080b62fef170338f92fc414";
- sha256 = "194dmji38vdkykmr8a2mn4zjzq6k9g8bn1mdsnblapcbwk02b0za";
+ rev = "bd82eed8ed710e538fb0752c4c8ec36089d5d239";
+ sha256 = "087am755knhk8jr5kq9cy4i5i0900kdjj844w347iiv55rsvw7d3";
};
meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/";
};
formatter-nvim = buildVimPluginFrom2Nix {
pname = "formatter.nvim";
- version = "2023-04-10";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "mhartington";
repo = "formatter.nvim";
- rev = "b09b4573b0b6f4bc9e0ae599f7fab7dab34a6acf";
- sha256 = "17igcjbj51568zz7lnhzfby9xx3i78yv6yw0gnpjng1w97i1n4j2";
+ rev = "9c44c9d80863aef1cef5b5c354c393ed5d74e634";
+ sha256 = "0a2850jvpwqs1irwkgjfgdd4d32g48zdgpsyay00v6kc48v372pj";
};
meta.homepage = "https://github.com/mhartington/formatter.nvim/";
};
@@ -3156,12 +3180,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2023-03-26";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "8d91ba2dc2421a54981115f61b914974f938fa77";
- sha256 = "0j45scar2frdk3a31lsc536z5vyzwanpg3nn89awp9idzhyviwys";
+ rev = "b1b78a6433268fc172adb5a843e165035e83861e";
+ sha256 = "09zj4m7j9dsmjvfqb2m7k7yv64r8w9z0f27rifdxywfangsa0zi0";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -3264,12 +3288,12 @@ final: prev:
fzf-lua = buildVimPluginFrom2Nix {
pname = "fzf-lua";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
- rev = "061a4df40f5238782fdd7b380fe55650fadd9384";
- sha256 = "0p928iyia6bpzrc4g6926xxagvfw30830air5lfbw492vp4rh2j5";
+ rev = "8cee7f542885cb78abef4e2cb6515470aea78564";
+ sha256 = "18q477avcrgsmb6nndrbrx0aamjbpqp0ws17pa6fj8mgwg3mgg1w";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@@ -3324,12 +3348,12 @@ final: prev:
ghcid = buildVimPluginFrom2Nix {
pname = "ghcid";
- version = "2022-12-12";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "ndmitchell";
repo = "ghcid";
- rev = "41dd2cfd805478c5601df229549029b20f930381";
- sha256 = "1zwrh2wss3igx10bh85zh55hjahhn5nda2w8na8cz8qld0prpc3v";
+ rev = "e2852979aa644c8fed92d46ab529d2c6c1c62b59";
+ sha256 = "0bsjbb6n7ssg411k2xj4f881v392hvb7xln99bq1r3vkg14mqqsd";
};
meta.homepage = "https://github.com/ndmitchell/ghcid/";
};
@@ -3420,12 +3444,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2023-04-04";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "372d5cb485f2062ac74abc5b33054abac21d8b58";
- sha256 = "0wck04ja0i77g1acidfrb3b44zvd8yiywlqwa64ji0isxl85aicx";
+ rev = "7dfe4be94b4f84a9931098f0f0f618d055e50bd5";
+ sha256 = "1jpiiyv6b2dcswjjd1c8p7d65040ik0cx862kp8f7f21xz0salzb";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -3444,12 +3468,12 @@ final: prev:
glance-nvim = buildVimPluginFrom2Nix {
pname = "glance.nvim";
- version = "2023-04-06";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "DNLHC";
repo = "glance.nvim";
- rev = "9bf10d6924e342cc7304f4c033f8a207a57b2648";
- sha256 = "1ps47npdsx6zl5x4vkscgqw754144v5p048ljza1svkkpbyizqvv";
+ rev = "77ebd260c360ce11ddc6aa08efdcea993f40614a";
+ sha256 = "0gkpngmdd568j8bbajpcwb30hqba90d9583pg9farfyl8l3j5vqa";
};
meta.homepage = "https://github.com/DNLHC/glance.nvim/";
};
@@ -3480,12 +3504,12 @@ final: prev:
go-nvim = buildVimPluginFrom2Nix {
pname = "go.nvim";
- version = "2023-04-08";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
- rev = "8398343f2e161aec2d1a9324cd1c739eb379dd24";
- sha256 = "07w7zwz87d3ngz34cnp5g6pxg16n7ixaci32gxfvyixlpng43wcb";
+ rev = "e7e914cdc3538a9f4e8843d63310b95641245984";
+ sha256 = "03rkv3kcnll5bx3an20x4sjb7y9bffk602790yv2b6ysgn5a623d";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@@ -3600,24 +3624,24 @@ final: prev:
gruvbox-material = buildVimPluginFrom2Nix {
pname = "gruvbox-material";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "gruvbox-material";
- rev = "b12f46903867939b963c8c20abb27dd507d77054";
- sha256 = "08plsqi71ijp746ni941l2w18n1r3bqiwyziffyfh7nrjwhk21w8";
+ rev = "9956b910882009e6a70feb66229ae47a8c592d80";
+ sha256 = "1999liw5dr6wcsay31q2hcxn2fjkgcpy5m494glmsc64dia3rdv0";
};
meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
};
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
- version = "2023-04-10";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
- rev = "de4e3380575acc1bc9a349d32f028301dea54dcd";
- sha256 = "10r0vvici824894aj51979vyszwdzw2g2dyfzfr5d57365sc8bgb";
+ rev = "487598d979868224aff92cf8818195c1a60e5dfe";
+ sha256 = "11imfkvxk84r63h7rp5w71131anr83difwab3y5jrv9cprijl20j";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@@ -3683,12 +3707,12 @@ final: prev:
haskell-tools-nvim = buildNeovimPluginFrom2Nix {
pname = "haskell-tools.nvim";
- version = "2023-04-09";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
- rev = "bf43d7ba6f27be7dcbdb8df8d79de07e3112a244";
- sha256 = "0gnzsbbj16p7ckbc19wvdllx4z0bnqw6wlgkyk3wgxg2g1gn389n";
+ rev = "53c5a037db61288a760a058f34c41c00849c754f";
+ sha256 = "1xy8sj5wykc1n30jxk789rymkrk4gqyhvwfgwaccq6kc07jqazkp";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@@ -3731,12 +3755,12 @@ final: prev:
heirline-nvim = buildVimPluginFrom2Nix {
pname = "heirline.nvim";
- version = "2023-04-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "rebelot";
repo = "heirline.nvim";
- rev = "d860874eef6088109b5cb102871d76307280f052";
- sha256 = "0gh4jc45zvgmgx3bg4iyqa4smjl2bqalkwylpq74izzn4bxjd4yz";
+ rev = "2aed06a3a04c877dc64834e9b9dabf6ad3491bc8";
+ sha256 = "1sqhnhc749hm1bpy6s49w8jb3zpzj2azpj2hszn13ml1g1ps5iv7";
};
meta.homepage = "https://github.com/rebelot/heirline.nvim/";
};
@@ -4175,12 +4199,12 @@ final: prev:
kanagawa-nvim = buildVimPluginFrom2Nix {
pname = "kanagawa.nvim";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "rebelot";
repo = "kanagawa.nvim";
- rev = "22adef57f08a3cd07978b65966ce68da42501f68";
- sha256 = "15v5p1kj97nhnibnki03a1y0lm2v6k5r2s0fwxz6ynij4sz6bshn";
+ rev = "963824e979f33bf2b39838d9ea7a59467d34ec9b";
+ sha256 = "1mkm7klmn5qsj3mznhvndvsv03vy8fbzfd3bf27xmi7hk5z8ibmn";
};
meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
};
@@ -4271,12 +4295,12 @@ final: prev:
lazy-nvim = buildVimPluginFrom2Nix {
pname = "lazy.nvim";
- version = "2023-03-25";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "folke";
repo = "lazy.nvim";
- rev = "57cce98dfdb2f2dd05a0567d89811e6d0505e13b";
- sha256 = "10ayiikd4sxm61rm2689cgbk2byh48si9h5pz5dbz2rwm40k5kig";
+ rev = "5c89dc52f42e5058a46b0912d7d9042f564e44e0";
+ sha256 = "1wn2r05rxxsi64ssnaryby7v293maf5k986bkngaki45lag3ghp8";
};
meta.homepage = "https://github.com/folke/lazy.nvim/";
};
@@ -4331,24 +4355,24 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
- version = "2023-04-09";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
- rev = "98a72ad93c629c49bd7127d342960cc1b159b620";
- sha256 = "1zb0k6d57z8pp4nzmqvk041gqhpsswxz642jj8398hf44r05lcq8";
+ rev = "0eb3611593e135150e2f7880ec67568ccb51c17a";
+ sha256 = "1kz843qj8d766x43ys3q9bi6ahjcyw1c063x1kj6dhv3c85l911q";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
- version = "2023-04-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
- rev = "69e7b9b56e6507760049c78a15116e1c0540423c";
- sha256 = "0m5ngwaz9hw79gwv7mpbc3i63m3i18sykvmm67gr9182k505xqpc";
+ rev = "4fc7d11d03df874ecd7a8cfa6055d7a4ce2cff87";
+ sha256 = "0y4wgla8w2b8yc7bynchaiq1vcv9i9yvvzgia1zdfky7ph47r1jk";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@@ -4643,12 +4667,12 @@ final: prev:
lsp-overloads-nvim = buildVimPluginFrom2Nix {
pname = "lsp-overloads.nvim";
- version = "2023-04-10";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "Issafalcon";
repo = "lsp-overloads.nvim";
- rev = "c63692f0b31ca0114bf2573d8d99fed5fd47dad9";
- sha256 = "1yh1k1px4lxfqcdirpdwammc9rjf8bpk2qs6vvkiixx2wkh4xsdf";
+ rev = "939bf42421a31dfe021a47720763602d54e1b165";
+ sha256 = "1gs96pc2hyvrnzax0lisi1n05ws3vf13fjr6lm1jz76s0gawqx1z";
};
meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
};
@@ -4679,12 +4703,12 @@ final: prev:
lsp-zero-nvim = buildVimPluginFrom2Nix {
pname = "lsp-zero.nvim";
- version = "2023-04-10";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "VonHeikemen";
repo = "lsp-zero.nvim";
- rev = "48d5f891b57291550a7e32792abae4d0774942e3";
- sha256 = "16lw176flzpgdm209q5gxaqdhk4jqyk2jbkqk22s6y29g2lzv16w";
+ rev = "8f7436b5df998515d9e15073b16f1bd142c406f9";
+ sha256 = "06jdi7qg9nhqjb2isldndjkbn4z3jminhn7rp036bc2rp3r6l3iw";
};
meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
};
@@ -4714,12 +4738,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2023-04-08";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "775c0cdf5be5adcc08f27c9058edb00b5b517520";
- sha256 = "1b3pq2l2qilqvkvd051wv32myjp200wqcns00qgdx10frracvlvr";
+ rev = "72b0d4ece23338fe2d03fc7b6fd8c8bace6bb441";
+ sha256 = "0ids2xfw7c3i4kjxz2bjbh03zsbp4h3576sxlwfnyc9jdfrwdy6g";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -4762,12 +4786,12 @@ final: prev:
ltex_extra-nvim = buildVimPluginFrom2Nix {
pname = "ltex_extra.nvim";
- version = "2023-01-29";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "barreiroleo";
repo = "ltex_extra.nvim";
- rev = "1d2f288ceedc70d5a9c00f55c0d0cc788b5164f2";
- sha256 = "1vknp3y3s1pavk9f4n4kb6nnymvcs7pbrnb8ckw18jyk02mfnjfs";
+ rev = "918915211dbdbdae29a16e0b85d415e10e732af3";
+ sha256 = "0730sq9g3jq56a19d6dbzzx7xyb5sp6ys156gxdk39z0xghkzpq4";
};
meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
};
@@ -4798,12 +4822,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2023-04-11";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38";
- sha256 = "10gyij1glisb1zqqdrb2wy772kz3nwf0mjn9npzzfcyrpvvwfra4";
+ rev = "8d6c0a93dec34900577ba725e91c44b8d3ca1f45";
+ sha256 = "1lrfmzhmxizjk265bk991apfxc74wlaxqwizrg63clbks5nx6av5";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4895,12 +4919,12 @@ final: prev:
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
- version = "2023-04-08";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
- rev = "a8d5db8f227b9b236d1c54a9c6234bc033825ce7";
- sha256 = "1c8w86yxmyay2b3c7ifl4qxcibgi27sf6pmx5b43j21ixjv5455n";
+ rev = "7034065099c1665143091c7282b3b1b8f0b23783";
+ sha256 = "1ahw156adi9frh3isad37r48zwy8j7llhyq307c3kxnh3r98iiaa";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
@@ -4919,12 +4943,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
- rev = "3fb2be48864b7850a26c54c04cedb54e95dcdf3f";
- sha256 = "11i931xsxbsw7arbglv8k4gl53klw2jv0r69a00m0fddyiz4avq8";
+ rev = "7f364a3c9b3f77ead3dc5316cf6918d944fc3621";
+ sha256 = "18a8bljq3yqgdvgmdrqbiw8rmgrlx4wn9rzv69hwap4i2rf8lw97";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@@ -4991,24 +5015,24 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2023-04-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "d42d1e5b5394f1a34763dc630f70dffe2470ef84";
- sha256 = "01hp2aqz0fj84s0b9kysy22mx8ms9v4pwng9b4xi5skbdli2vcsb";
+ rev = "590ac69a6c249ee94c390ab4b46147480409b646";
+ sha256 = "1vkjh7jzj8c4pfwwi3qbkpwc1mssiqgyvbral489ls94j9fncad4";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap.vim";
- version = "2023-04-11";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "868a809302f9f5d4c408ef8aef7eb9bd5893f801";
- sha256 = "1j7p33did6c0xnxq96541fw07fq25ss9784sf33ak6by8xhmpqdw";
+ rev = "726746ed02eab2eef137a7ecceda7214fbeeec41";
+ sha256 = "1p8bpa7g349zhx7z78gyxrhfrhibihd9v7p4224qzddk0pd4ibkz";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -5039,12 +5063,12 @@ final: prev:
mkdx = buildVimPluginFrom2Nix {
pname = "mkdx";
- version = "2023-04-04";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "SidOfc";
repo = "mkdx";
- rev = "1ddfff8118b6c3eb000dfc7c3c6eea5a314344b8";
- sha256 = "0jjrn0br2sl7flr0bjx367j8f94m7cyqsmaaq3ind9i42vjfahkv";
+ rev = "2881f23d06da8544ecfcb75cd3b6c061d7392414";
+ sha256 = "06d08mbzc3ri9x8ar9a5f05b7g9vz76cbygna8hqkpmzhq1rq817";
};
meta.homepage = "https://github.com/SidOfc/mkdx/";
};
@@ -5327,12 +5351,12 @@ final: prev:
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
- version = "2023-03-31";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
- rev = "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7";
- sha256 = "03c6glvdf7vdws7vvm8y3xh6443bjyk75vq505dmnadgkcwn28ga";
+ rev = "7a6b0d43d70636edfec183fb49c02f725765da73";
+ sha256 = "0icsairxll0anffwh1q39p9mlwwvbf5krp7v7388kilsd57lhjdi";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@@ -5351,12 +5375,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
- version = "2023-04-03";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
- rev = "6aaeb48336b369d7ed8ef243bfd0d76ec79362cd";
- sha256 = "1jw6wlkvs4agqx0mf95m6ddzvy93v76fgm7ipc05p2hw4qlplpjq";
+ rev = "62c8d706fafed90c95aa6b5846f296d3b28db75a";
+ sha256 = "1i5r1j3sbqmijvhla1mldrmpki5ymvi1h2qcs63gypmxj4xpy6hz";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@@ -5375,24 +5399,24 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
- version = "2023-04-05";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
- rev = "864b35006d3de24c60e44b566de8018f919b13e6";
- sha256 = "01xsqdbpwy9mj9rixadmlgbnb2nr2ssjgqhb2qsrxfxc2mk3dcvp";
+ rev = "e812f3d0e62e21a164b70f90f642cf30129503e4";
+ sha256 = "17w17gpk85w8zkqpkvrr2kg90p39wz2l57czphc52ybzirkpij30";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2023-03-31";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "e18e0cc2641dd78f0cdb0ddd575843045d672dde";
- sha256 = "0vprb47wcpwnsij6iyxzirfkcbzr4jaj2cc8flb41d42lsjr0mnj";
+ rev = "aca320ad601338c93eca50ab4c86fca964a18d96";
+ sha256 = "17wcvqwddw4nlcpfvlaxxkcyl93axb1hqdcn73xb4c1yr8fdwaxi";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
@@ -5411,12 +5435,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2023-03-20";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "039ff3212ec43cc4d3332956dfb54e263c8d5033";
- sha256 = "17a6lpqv99b89g7kakbzw97hpkqmw729if4j8gq8svza3fjcq2pg";
+ rev = "69a6ca7c41b023ebf9cad70778e227b3209b40c4";
+ sha256 = "1r5dii9510hb4qd63g32hrrrn8m3dmhwlp8l2ilig2vzcpics6mq";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -5471,12 +5495,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2023-04-11";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "32c03d5a320235469050757ec890d8eb11c3135c";
- sha256 = "0fk3b6kpbjd59v3smbvmfn1lcx3aac30v25mc5ni4sq3328cwlvq";
+ rev = "f742e90d6d8ec831f0bce939c37a3c04407c0e9f";
+ sha256 = "11nc74vpx7ws733x5ksymd6jdry3vj04jx08wi6gdwsikhvz8jhq";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -5531,12 +5555,12 @@ final: prev:
neotest = buildVimPluginFrom2Nix {
pname = "neotest";
- version = "2023-04-10";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest";
- rev = "28724010861dbf294f09b9ee1948d2da2823604b";
- sha256 = "0n4g735i9kndnv5790bkggsl3dm0jckwxa0n83j4mikrrfg0zi66";
+ rev = "8d279ac31542553461f5377db1596ae52e042d00";
+ sha256 = "0mfh332nh1c5g0abywcjng23wz4z1571dgxyc4f6nlvyikziaghc";
};
meta.homepage = "https://github.com/nvim-neotest/neotest/";
};
@@ -5567,12 +5591,12 @@ final: prev:
neotest-dotnet = buildVimPluginFrom2Nix {
pname = "neotest-dotnet";
- version = "2023-04-10";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "Issafalcon";
repo = "neotest-dotnet";
- rev = "cb0e6f580e4877034a76a02c3e8aed75dcbc8c48";
- sha256 = "0x0msjris2mpfgadkrgk1gqb00cck26lqlazjqqdf1516lvyvlm2";
+ rev = "85ffa30ec8a1feb1126f3057361850edf7d94e3f";
+ sha256 = "0f31rwn93qkigx47444lmkp9fmappzbm62rgnxjwjz3gkipm0vca";
};
meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
};
@@ -5591,38 +5615,38 @@ final: prev:
neotest-go = buildVimPluginFrom2Nix {
pname = "neotest-go";
- version = "2023-03-28";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest-go";
- rev = "756edf3dddcb3b430110f9582e10b7e730428341";
- sha256 = "03ldff1cf1j4skj2swhqphna08xkpm33xzmlm87ln5jg7h5izjii";
+ rev = "2148ad794e7a5c30c7385a3281f4be91e6b113c4";
+ sha256 = "0z9yam6v82a6aymsmrr5rly20gq6pv90lwjgwwnz3r88nhyq11v6";
};
meta.homepage = "https://github.com/nvim-neotest/neotest-go/";
};
neotest-haskell = buildVimPluginFrom2Nix {
pname = "neotest-haskell";
- version = "2023-03-31";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
- rev = "0bd879195b08ee6ca9fdff6b4782f73546c28743";
- sha256 = "1x9fd36zfw6q5sasrh93xr1nr4rn5v7va7czpij0kb9ri7s2by6c";
+ rev = "ea123371271cabcfae8de34095956c75f7e705b6";
+ sha256 = "13yskn5dja2lbx20351ajgfqxz8lnnzg3pplcfgrnhfd6xbmxqdy";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
neotest-jest = buildVimPluginFrom2Nix {
pname = "neotest-jest";
- version = "2023-01-26";
+ version = "2023-04-16";
src = fetchFromGitHub {
- owner = "haydenmeade";
+ owner = "nvim-neotest";
repo = "neotest-jest";
- rev = "821bb227e31259307db30c88671a1c3724f78637";
- sha256 = "0zhia9flpzac17rc9l1ybv1x7zfvhmws65i8sq53dp1mlfvimzkp";
+ rev = "22b1050dda3ebd401780ec4b8e193cf52523a4da";
+ sha256 = "0vg433x68c9h0nzws6lwb4xcgqzm8ss5dkmi8df4fa55m2ll8iaw";
};
- meta.homepage = "https://github.com/haydenmeade/neotest-jest/";
+ meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
};
neotest-pest = buildVimPluginFrom2Nix {
@@ -5639,24 +5663,24 @@ final: prev:
neotest-phpunit = buildVimPluginFrom2Nix {
pname = "neotest-phpunit";
- version = "2023-04-10";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "olimorris";
repo = "neotest-phpunit";
- rev = "bf414a6dd2ddbe69f6c7b96e345cfe28afd577db";
- sha256 = "0ss6qlh6cs1bidn7j2m7565pnx2sfclqik1x123dw6ibmasc9zrb";
+ rev = "6c4f1def7d4d0ff5d410022b71078468ab96273b";
+ sha256 = "1hx5c99b57s1z9hf1f45l4fgvvc5ndh300s347xpi9zbw19ym8fl";
};
meta.homepage = "https://github.com/olimorris/neotest-phpunit/";
};
neotest-plenary = buildVimPluginFrom2Nix {
pname = "neotest-plenary";
- version = "2022-12-30";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "nvim-neotest";
repo = "neotest-plenary";
- rev = "d49bfd9470f791e7c29149e75d56b6f925bb391b";
- sha256 = "055k0q1zgi42hf8lcgi2fmfbs3yc4fhbfjy34p3p2k90i1izxy5q";
+ rev = "65f57c41ffb7bf1c34938b61683fe833ad3be8fb";
+ sha256 = "0m4hhl4rcbkvpfs9azaarya9zyfbcxhrsc2ij797myfggiz5s28v";
};
meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/";
};
@@ -5675,24 +5699,24 @@ final: prev:
neotest-rspec = buildVimPluginFrom2Nix {
pname = "neotest-rspec";
- version = "2023-04-10";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "olimorris";
repo = "neotest-rspec";
- rev = "0843dbd82f953c2d7a4a50160c07c3cb6600879c";
- sha256 = "1aky5dhhflilvsazzh6ix75fl3618zyss1dyy3dpws3mk16fn5cf";
+ rev = "68b4b195603e89b69dcbe587116eee7e78d186ce";
+ sha256 = "0h3qiyd91hrg481fdplyac17yaplmgn41jlhsqnbi18274c1ipjk";
};
meta.homepage = "https://github.com/olimorris/neotest-rspec/";
};
neotest-rust = buildVimPluginFrom2Nix {
pname = "neotest-rust";
- version = "2023-04-03";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "rouge8";
repo = "neotest-rust";
- rev = "5bb78ad3c1c11a28a2c48af59056455841e6546f";
- sha256 = "0wrb7nqqr9glsycqrfak6xi2l5pvb0ax48vr1jlcpg83ya2ljj3g";
+ rev = "e375bdb26d2ce1c099d17c8adc4d18768d501ff7";
+ sha256 = "0zfxr2261ls0k754f4qcd012fl4jhqywpjmr6cc1q5m6bx74p2ms";
};
meta.homepage = "https://github.com/rouge8/neotest-rust/";
};
@@ -5723,24 +5747,24 @@ final: prev:
neotest-vitest = buildVimPluginFrom2Nix {
pname = "neotest-vitest";
- version = "2023-02-27";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "marilari88";
repo = "neotest-vitest";
- rev = "643d1fb7a3e874b82f51693bf6d37c427ab54c75";
- sha256 = "0lshr7w1j2rnaw74kvm72pz9fi6xx2s88s3by56wg82n8hzlnb7h";
+ rev = "f9efe9524ccba1284d5f4e41d0dc6ff91951cfcc";
+ sha256 = "09bhg1g2r4nc0jr41v5j07wgfcqgfnjw4nbmhz8pizshiyqq0rah";
};
meta.homepage = "https://github.com/marilari88/neotest-vitest/";
};
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
- version = "2023-04-11";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
- rev = "7ee99986e4a478ce0fa78c35e4afddd00476e551";
- sha256 = "05mfrlj8cw32z0xnp3mhqz3li30rfg2zv2b1lp0akkl1csgbivf8";
+ rev = "762ff24bd429fbb1c1e20b13043b4c8f0266bcf1";
+ sha256 = "0qwaxnk2ywdfi04c0dgx438w765vq9df7g4dicb73626jfdvy141";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@@ -5783,12 +5807,12 @@ final: prev:
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
- version = "2023-02-05";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdcommenter";
- rev = "d069f7fb562fb9eb6911fe23cda7aca2a387043e";
- sha256 = "0ir2cghjcz3wr1sp1fzvdjnwqrjy82n3zlhrcz7cs41n8f2wich7";
+ rev = "91499c76a7358b10945c50173fa8c64dc3c909c8";
+ sha256 = "1xv2nb0jpxmmgchjh2j7dpam0xzrslc4qfbv02fdhmj1f7ybf018";
};
meta.homepage = "https://github.com/preservim/nerdcommenter/";
};
@@ -5819,12 +5843,12 @@ final: prev:
netman-nvim = buildVimPluginFrom2Nix {
pname = "netman.nvim";
- version = "2023-03-23";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "miversen33";
repo = "netman.nvim";
- rev = "0992ecede84db9591c59ee2131f39443f4a44f3c";
- sha256 = "0nmm6yp1q99f7c26h0ymwd237vv7b9652ffaffbm2ym4ahcmg8xr";
+ rev = "cd5b2c4802d2014df1bc1d07c37aa2271e6ba725";
+ sha256 = "1kwxy0ccwjji4gc76n0lv7zd4maldxddhrahmfwxana1aqwyc8sc";
};
meta.homepage = "https://github.com/miversen33/netman.nvim/";
};
@@ -5867,12 +5891,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "fbc610f3d3771e330b0dbefc8aab3112679554a6";
- sha256 = "1a5mmjhiq3dpbillrmyh0f2j4p2cki6707j0qdbak1swrk30hwqp";
+ rev = "e54427a1bfea55c9ab0c21ac7e9d07b22156d0f0";
+ sha256 = "0fwn5hhw9fy9g0h62zqlx5iiar77m5ryd8mvahybhdjk8ygjkmg4";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -5903,12 +5927,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
- rev = "fd5ca6e4c2b01f97309e6b515b9957e7454587e1";
- sha256 = "047911rgg1a9vrg1f6yaifsc54wgg6xjpgv198iaz80dhn5mr913";
+ rev = "32f39128c96baf5482c6a775f437be116d0adf4f";
+ sha256 = "00l8akyihpimvkxy8yxdvwc3iafjkyyx66scfqj9drm4flsbbqc8";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@@ -5951,12 +5975,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
- version = "2023-03-26";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
- rev = "1da4edfba3e9278e98fc9723d7235d9ab3889744";
- sha256 = "18y314k7da239w05rkxz6nqjljjx24mx9kx5020bkkx80q1z57yk";
+ rev = "7bd435a48a2d2b3f028c633126e3f669ae6b902f";
+ sha256 = "003pbngbf7wvac91lpy717sp3blkxv869f17brshwhciq2zzfxjm";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
@@ -5999,12 +6023,12 @@ final: prev:
nui-nvim = buildVimPluginFrom2Nix {
pname = "nui.nvim";
- version = "2023-04-10";
+ version = "2023-04-11";
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
- rev = "bf5900f1b60bf6499755ac92315181a24a87a577";
- sha256 = "0rs8i095ppkllvk6hacgvwsbmmiwaj2m57xwg5jd7mxyvy40zr4j";
+ rev = "ecd9def93891b9260b15b5fcef542eaabf4145c9";
+ sha256 = "133qxi97km61kg0y465jbwwzrby1v5h663igvrqlj1n2syvwwmi2";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
@@ -6047,12 +6071,12 @@ final: prev:
nvim-FeMaco-lua = buildVimPluginFrom2Nix {
pname = "nvim-FeMaco.lua";
- version = "2022-10-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "AckslD";
repo = "nvim-FeMaco.lua";
- rev = "469465fc1adf8bddc2c9bbe549d38304de95e9f7";
- sha256 = "1rv3ppjfndi27dbg7dsapxacbal1mj2a9dx2vq0yvi2v1gb97b3x";
+ rev = "7f18adaa2e62dcfdce3cce9677eeb9371e584f85";
+ sha256 = "0ramhcrn1crbsj29c9dx0fx2kp97wzvp1i0h8shjzzsa9pyqd8h4";
};
meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/";
};
@@ -6071,12 +6095,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2023-04-09";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "7470af886ffb3df32800e5ef9c072a6cd825770d";
- sha256 = "10mpzlikr2yx7ky25001jjcdcy0rprm6n81lwxg46xbim3mbxnb7";
+ rev = "7566a86f44bb72ba2b1a609f528a27d93241502d";
+ sha256 = "0hxaqhvqd4446zvwbfs2l6akqbki2sag2vlxqfxbn1a9pdin1329";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -6119,12 +6143,12 @@ final: prev:
nvim-bufdel = buildVimPluginFrom2Nix {
pname = "nvim-bufdel";
- version = "2023-02-27";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "ojroques";
repo = "nvim-bufdel";
- rev = "9f1ed6ef6594df9a74762a86f469d12036584976";
- sha256 = "0fcvhxsr6nfi1sg5cy46dyy20rzc7g25y7ha0bhl2cprvz3frph1";
+ rev = "96c4f7ab053ddab0025bebe5f7c71e4795430e47";
+ sha256 = "01m8pgwsfplmknwf0a0ynwn7nflhsxfz1vmx4h3y92p0gs5shwwy";
};
meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
};
@@ -6251,12 +6275,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2023-04-07";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421";
- sha256 = "0h4vcdy7zrbrx29r2bw5nk01q1y983ffh59sl35rq5aa9xdwr4zf";
+ rev = "6cedcb527e264c8f25e86afa8dae74c6692dee51";
+ sha256 = "1vapds2p17k3h4llh0p6mxk4qrdik8sjp09l7fnl1mwnybl0k6wp";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -6371,12 +6395,12 @@ final: prev:
nvim-highlight-colors = buildVimPluginFrom2Nix {
pname = "nvim-highlight-colors";
- version = "2023-03-26";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "brenoprata10";
repo = "nvim-highlight-colors";
- rev = "14670d94c7813bfe929ed2ca2d3875f4f468173e";
- sha256 = "0igiam19m1kw9ir41zkpfq78n67yypwvmmw2j3p04qnbwj0x3nxb";
+ rev = "8d7e7fe540b404ec06a248d6e5797eaf3362420c";
+ sha256 = "1saabc855b0pqhfvhph9lgir090126f1nh4hpv57d44fn8n0cwgh";
};
meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
};
@@ -6419,12 +6443,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2023-04-03";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "ffb8f63689197b845c2388f0df5f0d1bd21c968f";
- sha256 = "0pxz9050522vlglvwm67s43dniwxygynvi0f8qdd8dhb5zm9x65q";
+ rev = "aa04fc0e4d8acbfa43efc6a6f7162b01987257a1";
+ sha256 = "1jng1y8rwc90k3060rivbipd99d0q2s16dlwm2hgpy8yk3q6ngmk";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -6455,12 +6479,12 @@ final: prev:
nvim-lightbulb = buildVimPluginFrom2Nix {
pname = "nvim-lightbulb";
- version = "2022-08-26";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "kosayoda";
repo = "nvim-lightbulb";
- rev = "56b9ce31ec9d09d560fe8787c0920f76bc208297";
- sha256 = "0xi9bgfcn2dlwp06lkfvr6nddspjbaaprsxrl5mpfx5qskyqf3lz";
+ rev = "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7";
+ sha256 = "0885z0fv3q77jbn9zfzfng2s9l8k4x8y8l49dd9rrlfwvkl6bhdw";
};
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
};
@@ -6479,12 +6503,12 @@ final: prev:
nvim-lint = buildVimPluginFrom2Nix {
pname = "nvim-lint";
- version = "2023-04-05";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-lint";
- rev = "2a9969a09d8456104d7954b67ee6667d6645c71a";
- sha256 = "0yy9kwl2xkg38xl7rsjz9yz3w99md2ywj2w3whlv7hwk0w0pirb4";
+ rev = "f27ba536d9363d216dcf1996f42d55756e977522";
+ sha256 = "1km9ch467q613pf50xa1bhrp9zd47c21g990aqczw4s6787fk2fb";
};
meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
};
@@ -6503,12 +6527,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2023-04-10";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "10fa01d553ce10646350461ac5ddc71f189e9d1a";
- sha256 = "1v5zqf5z9fl23f62cgchsyhg54wpw364k6bpn9gi6py5mfpig49c";
+ rev = "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0";
+ sha256 = "1gpkmywjlyyx8zmvyxqsrrfyrxsvs42gd442k05nhfv75z077dcf";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -6575,12 +6599,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
- version = "2023-04-02";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
- rev = "27124a773d362628b114cd12016e743dab4ccf3e";
- sha256 = "0xv2y9kw60cjk5n8h91s679rc101lhaal9ds5fmxgj4sl19jf5fn";
+ rev = "63a5d2d6af20d7818b94b4bdc2133107a88107e2";
+ sha256 = "1gj28wiimizgxyqshxlbk0l9afxsakjhjfsx35pg0j0znaybj9m4";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@@ -6611,12 +6635,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2023-03-22";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "50d037041ada0895aeba4c0215cde6d11b7729c4";
- sha256 = "0nzqj6j9j0cvi0mckqggfgyc8a6cdyr6z2qwkzk30yqjs39fnh66";
+ rev = "159c6cf1be25a933f35e97499314c9faab55c98f";
+ sha256 = "02v5n53397x9kyvgzky2kmzpmiq040ahk9d9k5j03l9ai7jdsj2c";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -6729,6 +6753,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
+ nvim-spider = buildVimPluginFrom2Nix {
+ pname = "nvim-spider";
+ version = "2023-04-12";
+ src = fetchFromGitHub {
+ owner = "chrisgrieser";
+ repo = "nvim-spider";
+ rev = "23fa1260be2090f2d675ee90e0b83fd993f6c3dc";
+ sha256 = "1ij9kv1dm6lrdvrw83wc833yw32k4wdgqg1gd5d4qdddnqhix6zw";
+ };
+ meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
+ };
+
nvim-surround = buildVimPluginFrom2Nix {
pname = "nvim-surround";
version = "2023-04-02";
@@ -6767,36 +6803,36 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree.lua";
- version = "2023-04-11";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
- rev = "48d53a5934fbd51b655d03db7dad35551838f2c9";
- sha256 = "0wxkbjbbx6j2fs3bxc69vdppp4n46s13ykilrq4sd4vkcj1msr5m";
+ rev = "0db85a70248f9a90e61af5cdbafe5d9f4320f719";
+ sha256 = "0iyyy0b2ym00p14n5hrmx6g87g9r03scjsszr33v6hcsq0k06282";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "ac4020c70722337c326bf65b645b162ee6e1796b";
- sha256 = "0i993nj2yazzq5maiyqn0x1n0iilx6jz1a5wi079f0whhz5jaggi";
+ rev = "654216eb04f3fdf0f847ff2d410319fba6cee847";
+ sha256 = "0rk925xmgh7nil8dmps109h0zr36x36j6l537zs66kjcvafmy0rs";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPluginFrom2Nix {
pname = "nvim-treesitter-context";
- version = "2023-04-07";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
- rev = "38203f5e6c62617b3c07662dc71ce3047ecd90d3";
- sha256 = "0l3583h890pqmil34bim5zy3ib1jfc3nz12ykhda2b42a1qad0b4";
+ rev = "8b6861ebf0ba88e5f57796372eb194787705d25a";
+ sha256 = "08dn0c673i91ql14ls8ackmda3l7mx4y4gl5hlyr0030c6ziv1qf";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@@ -6851,24 +6887,24 @@ final: prev:
nvim-ts-autotag = buildVimPluginFrom2Nix {
pname = "nvim-ts-autotag";
- version = "2023-04-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-ts-autotag";
- rev = "b525525b6aba20763e19011a73454845170850d7";
- sha256 = "0j8vgqq3408y1b6vsv5rppp5aqly1cf8yn37chh526r42aikzbkd";
+ rev = "26761ba6848d814605a629bc8d2694eeb1e48007";
+ sha256 = "1g3ss0mhbwv08y8kpgzqk65d5v4vl9mdl21ya2c7irvsnm23l25r";
};
meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
};
nvim-ts-context-commentstring = buildVimPluginFrom2Nix {
pname = "nvim-ts-context-commentstring";
- version = "2023-03-05";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "joosepalviste";
repo = "nvim-ts-context-commentstring";
- rev = "729d83ecb990dc2b30272833c213cc6d49ed5214";
- sha256 = "1ddfnz7cscnfl7g0i7kv5x15pnbd87v2qm1lgzxap1x63vm1m7vh";
+ rev = "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3";
+ sha256 = "194v4vp3fjwmhiyy6gf7465m9c7yhhyvwvyih6gxls0bq5jmdzjs";
};
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
};
@@ -6887,11 +6923,11 @@ final: prev:
nvim-ts-rainbow2 = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2";
- version = "2023-04-07";
+ version = "2023-04-17";
src = fetchgit {
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
- rev = "2c82e0965be2baf67fa2d3d48f3747437fde7204";
- sha256 = "1f31bx466vl1if7kinbb1szrl65b9gq06v32nf9h6s5rs4yvmpv4";
+ rev = "3bfcb9a7dd55d106f2e8afd3dcaec1ac624db2db";
+ sha256 = "1vh125k3i2j35jqw0rfkjxsvivxr8g5kg31zzkpcwq1irhfz9w5d";
};
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
};
@@ -6914,8 +6950,8 @@ final: prev:
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-web-devicons";
- rev = "defb7da4d3d313bf31982c52fd78e414f02840c9";
- sha256 = "1qwcr82yd2jdfds6r6s0pfkixpk0dydnl1l9vqg092l6vkx6v30v";
+ rev = "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e";
+ sha256 = "18ssw6v60sy2lmb4dc11xz0vwkc4mw8fzbavvggadibjmbcf824l";
};
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
};
@@ -6972,12 +7008,12 @@ final: prev:
pname = "oceanic-material";
version = "2022-08-17";
src = fetchFromGitHub {
- owner = "glepnir";
+ owner = "nvimdev";
repo = "oceanic-material";
rev = "9f2d002398d1ef0cd52315fa767b138719536c5d";
sha256 = "1c9sbprivdhjyzxni3xzmk3lc56icd61azzvl9bb961iaag6r1c9";
};
- meta.homepage = "https://github.com/glepnir/oceanic-material/";
+ meta.homepage = "https://github.com/nvimdev/oceanic-material/";
};
oceanic-next = buildVimPluginFrom2Nix {
@@ -7006,12 +7042,12 @@ final: prev:
oil-nvim = buildVimPluginFrom2Nix {
pname = "oil.nvim";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
- rev = "fb8b101d7cb4727d8719ab6ed141330eca997d3f";
- sha256 = "1vhrmiws4k65v5mzvxy2f93f5y8dxcpchsxwrqfmp9imzkcm081z";
+ rev = "3ac035e5ac448ce898c9aad7158a47378be4e85a";
+ sha256 = "01znzj38mhnh80w7n101ysq4vsd651lsbk6rr8d1g2nc61m1c2bc";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -7019,12 +7055,12 @@ final: prev:
omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix {
pname = "omnisharp-extended-lsp.nvim";
- version = "2023-02-02";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "Hoffs";
repo = "omnisharp-extended-lsp.nvim";
- rev = "55cb3d7310e07e38d0d420d195f353c51eb603fb";
- sha256 = "1wy2cpg4cb2f18751lxiy8lbhxmp17z9d01b7qwbz6pxyr4l6k2p";
+ rev = "53edfb413a54c9e55dcddc9e9fa4977a897e4425";
+ sha256 = "1fwvqkiips64nzixp1vshlls8vd6wq88yqg751pqxab5w1hyqn5d";
};
meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/";
};
@@ -7043,12 +7079,12 @@ final: prev:
onedark-nvim = buildVimPluginFrom2Nix {
pname = "onedark.nvim";
- version = "2023-03-22";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "navarasu";
repo = "onedark.nvim";
- rev = "dd640f6cfb0e370cfd3db389f04b172508848bd3";
- sha256 = "1ymv9mjbjhmmsyh5pm2jh883mvhh8rlcy3d7513vvdifriyxy2mz";
+ rev = "d20f23c0d6810c8754737428771eef40bd1056a7";
+ sha256 = "0xb50bz86dmlnsqnpl7b29glpx84i4m1c2sm9q03sf6xdizdpk2a";
};
meta.homepage = "https://github.com/navarasu/onedark.nvim/";
};
@@ -7067,12 +7103,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2023-04-02";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "17b3bb0fcce1cf626f4f848fa586bb5dd4b95331";
- sha256 = "06dipnhjiqj5fvjwcj6i3zdvlacjadfclvylzdfzan6facx6sm4s";
+ rev = "434b67beced0b518804712ab04b8cf4bcf1aed7d";
+ sha256 = "0580qvrc5f9z7vbgwys83gm6grcc77nhy8l5hy5bg5yfg342aajf";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -7091,12 +7127,12 @@ final: prev:
onenord-nvim = buildVimPluginFrom2Nix {
pname = "onenord.nvim";
- version = "2023-03-11";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "rmehri01";
repo = "onenord.nvim";
- rev = "9a59d47db81e566d4e254904479f129cfffe5f21";
- sha256 = "07052ni5kjm5xcc6wl1hvrwayif1srjhlaggawpn8icahhrpn25r";
+ rev = "f9eb20f354e59b309dc75a526667af67b14e3e8c";
+ sha256 = "1x12ly7kq8ykivxn7dghdjgggz6blfqmzf2y84n4mq47fk785gbk";
};
meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
};
@@ -7139,12 +7175,12 @@ final: prev:
orgmode = buildVimPluginFrom2Nix {
pname = "orgmode";
- version = "2023-04-07";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "87cf0069949bb9426ef4930efdcaea942438cf92";
- sha256 = "0cxf6mqjrhchixyc3m9dar141admannzwmdgpd392alvq6zi5yi8";
+ rev = "d8020e95f531369962d74d037f603d038d70de1e";
+ sha256 = "08zq7fnmj2bcz96f2zwjghp10w75ww6qqslyrdn4hic0vvdw976l";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -7307,12 +7343,12 @@ final: prev:
playground = buildVimPluginFrom2Nix {
pname = "playground";
- version = "2023-04-09";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
- rev = "934cb4c4adc2e7f4f351846a63c9532018c996ed";
- sha256 = "1s6wd3xrqpxmxmaa5spnwcazpr7695fwf5mxbrrr72va8amn5vy1";
+ rev = "2b81a018a49f8e476341dfcb228b7b808baba68b";
+ sha256 = "1b7h4sih8dc55w12f0v5knk9cxfpy0iffhbvmg0g84if55ar616v";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
@@ -7329,6 +7365,18 @@ final: prev:
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
+ poimandres-nvim = buildVimPluginFrom2Nix {
+ pname = "poimandres.nvim";
+ version = "2023-02-17";
+ src = fetchFromGitHub {
+ owner = "olivercederborg";
+ repo = "poimandres.nvim";
+ rev = "43ea31d1e19f7603697bb3272b233930d0292383";
+ sha256 = "1q3xszkwlz008n9dh3q2agii6yjk45c47k38g3fj7ssgzmq56q21";
+ };
+ meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/";
+ };
+
pony-vim-syntax = buildVimPluginFrom2Nix {
pname = "pony-vim-syntax";
version = "2017-09-26";
@@ -7645,12 +7693,12 @@ final: prev:
rest-nvim = buildNeovimPluginFrom2Nix {
pname = "rest.nvim";
- version = "2023-01-23";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "rest-nvim";
repo = "rest.nvim";
- rev = "0fdb69f328529b34a2279c14be63b3325dc52740";
- sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0";
+ rev = "df826bc0a76d5eb79b458db894d47a5538b454fe";
+ sha256 = "13f3s5xzl572y2pa7j67h7sgmnkjhkrchzqd1fjjx6098r15qnsk";
};
meta.homepage = "https://github.com/rest-nvim/rest.nvim/";
};
@@ -7777,12 +7825,12 @@ final: prev:
satellite-nvim = buildVimPluginFrom2Nix {
pname = "satellite.nvim";
- version = "2023-04-03";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "satellite.nvim";
- rev = "d77b40a730f3036a3290d07bc32af7fc935cd031";
- sha256 = "1i8445whk6vndinn05n2ss2vz37hlf30qyqfl1gspky3sz861jda";
+ rev = "223fd56405993175f60dbc0ee6bdda0582b78b19";
+ sha256 = "03bqfvfxwz94hiigmahahdqvpxhgrfvmr2k4kd1zy9zmszyfgnwb";
};
meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
};
@@ -7970,12 +8018,12 @@ final: prev:
smart-splits-nvim = buildVimPluginFrom2Nix {
pname = "smart-splits.nvim";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "smart-splits.nvim";
- rev = "a2d3c590c250298f34674c19a87aa9e4c01af788";
- sha256 = "18028fx4f88v34227mdzqj77x9k6zja69dj0shsl14pyagxallng";
+ rev = "e1dbc83510616df73a645f616431cfe1348898f8";
+ sha256 = "1yyz16hb9h76gnilim6mwsyim3arkki7raaa53nxndr7gmjgkywd";
};
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
};
@@ -8042,16 +8090,28 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2023-04-11";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "5eeceab6e905c1b93ba3a49dfbaa1200071990f9";
- sha256 = "0d32v5qr5irbaznq1r654b8ffqyryqxs0cxmav65hp09y3m27lmx";
+ rev = "95d0ed42b40e6e050b4f0e5f08a7bf7b348f7808";
+ sha256 = "096hzz7ksydvzz2p605yx1gz0w8bsk9k1rywjsbzm6m6ybwqc1g4";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
+ sort-nvim = buildVimPluginFrom2Nix {
+ pname = "sort.nvim";
+ version = "2023-04-12";
+ src = fetchFromGitHub {
+ owner = "sQVe";
+ repo = "sort.nvim";
+ rev = "c789da6968337d2a61104a929880b5f144e02855";
+ sha256 = "0d9i0vhqp7axls2xs1fgz9g762g7a5j0p5452v2158wjzgb2yxy6";
+ };
+ meta.homepage = "https://github.com/sQVe/sort.nvim/";
+ };
+
sourcemap-vim = buildVimPluginFrom2Nix {
pname = "sourcemap.vim";
version = "2012-09-19";
@@ -8066,12 +8126,12 @@ final: prev:
space-vim = buildVimPluginFrom2Nix {
pname = "space-vim";
- version = "2022-09-29";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "space-vim";
- rev = "ad92c42f97c2cb495c34b83f43d91b3d6cfdfa4e";
- sha256 = "1ijzvnj3hff2c0kilqlb2gwv7l141p61176xv4nz5r4v9knqgl5s";
+ rev = "cabe884b7f47a537311424e662d421a9c49a1678";
+ sha256 = "1qz9nrc2v7r7dc6kcyh63pmhhwaq87ja3rgwsagmg0vzqdpjwbab";
};
meta.homepage = "https://github.com/liuchengxu/space-vim/";
};
@@ -8162,12 +8222,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin.vim";
- version = "2023-03-21";
+ version = "2023-04-09";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "2c8cd19a7be5b3d7baec3eeac086eef576896e12";
- sha256 = "0ij5l0z5hf7878gzfyz8ldvl6pjgjpbd7js26dpvgq8jlz5r5nb7";
+ rev = "8a1d52c374f1347c259e9557658be06d7acf3e79";
+ sha256 = "1yccnam55pr8nshgjfqqvzfczi7qyflkxkgs46yp90vinmibjb12";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -8175,12 +8235,12 @@ final: prev:
sqlite-lua = buildVimPluginFrom2Nix {
pname = "sqlite.lua";
- version = "2023-03-18";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "kkharji";
repo = "sqlite.lua";
- rev = "376e4735c48e07dade3e6ff5f09a654a04f5d4ba";
- sha256 = "1l6c9z72kfnj4pzhipnscprvlmbw44jhrvbi14pplvj7wk9x9c85";
+ rev = "b7e28c8463254c46a8e61c52d27d6a2040492fc3";
+ sha256 = "0dx4d29zfp7psp2x42lpag0midadk51fcjiyw4hq570sd0j44jaw";
};
meta.homepage = "https://github.com/kkharji/sqlite.lua/";
};
@@ -8211,24 +8271,24 @@ final: prev:
ssr-nvim = buildVimPluginFrom2Nix {
pname = "ssr.nvim";
- version = "2023-03-27";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "cshuaimin";
repo = "ssr.nvim";
- rev = "a30674d07b220304ed81f1f46a8f1de36ce74c38";
- sha256 = "1z0kwd335pad6np8kr2njyrh2m97f1n6mh2pabl7axhcisvhvhrd";
+ rev = "e5768511518a397fa712f26389ba30d0404990de";
+ sha256 = "0bw60qf49bb07vhxpg21fkf5v2am4ply3x4z5y5c24lx19fwmryw";
};
meta.homepage = "https://github.com/cshuaimin/ssr.nvim/";
};
stabilize-nvim = buildVimPluginFrom2Nix {
pname = "stabilize.nvim";
- version = "2022-10-06";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "luukvbaal";
repo = "stabilize.nvim";
- rev = "34069870a8e72632c5447188e638e1c6bfebc353";
- sha256 = "0ik3p1p3wndclw7a72rx507fzk6d9zv6b75lahd0sp9ra9xhzc86";
+ rev = "eeb1873daffaba67246188a5668b366e45ed1de1";
+ sha256 = "0zvirhhq7pnavsldsll35xqjchvsqmvsrj1zhg930kkp2r0ycf01";
};
meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/";
};
@@ -8257,6 +8317,18 @@ final: prev:
meta.homepage = "https://github.com/darfink/starsearch.vim/";
};
+ statuscol-nvim = buildVimPluginFrom2Nix {
+ pname = "statuscol.nvim";
+ version = "2023-04-23";
+ src = fetchFromGitHub {
+ owner = "luukvbaal";
+ repo = "statuscol.nvim";
+ rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";
+ sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";
+ };
+ meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
+ };
+
stylish-nvim = buildVimPluginFrom2Nix {
pname = "stylish.nvim";
version = "2022-02-01";
@@ -9019,12 +9091,12 @@ final: prev:
tmux-nvim = buildVimPluginFrom2Nix {
pname = "tmux.nvim";
- version = "2023-03-11";
+ version = "2023-04-11";
src = fetchFromGitHub {
owner = "aserowy";
repo = "tmux.nvim";
- rev = "9ba03cc5dfb30f1dc9eb50d0796dfdd52c5f454e";
- sha256 = "0xkdihg0f9b0wc37zml7n3wsmy8ppy08zynv8f2j90xwlwad06b4";
+ rev = "b6da35847df972f50df27d938b6e5ea09bcc8391";
+ sha256 = "1zmvc8ar9x79bygiilb9gs49hnl8w2z575l25cpvlbylaz6yxi22";
};
meta.homepage = "https://github.com/aserowy/tmux.nvim/";
};
@@ -9080,24 +9152,24 @@ final: prev:
toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim";
- version = "2023-04-09";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "akinsho";
repo = "toggleterm.nvim";
- rev = "2e477f7ee8ee8229ff3158e3018a067797b9cd38";
- sha256 = "1d7qqgviimgmzz1g7ykv688pyhr0m9kv6h9lrczxmdq7xwymmbbq";
+ rev = "1c5996ee3c30b54751093fe68d40676859e7778f";
+ sha256 = "0m0xaw7d9yf9xy4j9x9y8lj7alr9zmys5picknfklyxq6p7szh6b";
};
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
};
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
- version = "2023-03-23";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "1b0c88094548a62641ece1e668fa9a234e1c539e";
- sha256 = "0mf9f955bd587kd3mxvvhqdn7p639pfqi1wfbz1wds1hizkdfmrk";
+ rev = "ff81eac0ecf85db235dfc4c9d54f2d07d662a423";
+ sha256 = "1zccj9jff1cyi5z1cg2dy7ly42z2zxr1csd22akrlxf2956v3nb1";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -9128,12 +9200,12 @@ final: prev:
treesj = buildVimPluginFrom2Nix {
pname = "treesj";
- version = "2023-04-09";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "Wansmer";
repo = "treesj";
- rev = "12fc4074a7dee23faabeb1f5dfd3af41d2aa04f1";
- sha256 = "1nq06hgsm1hky7w1h8hy2y1l3nyngky2xrknk9qqwy5yq1q6pngp";
+ rev = "61830dd2ba196e3e62557386607928889741ab3d";
+ sha256 = "046ggamsbss9am5qs0ggp7dp8izqzyxc5sk9sagiy4nzl2j1mzz6";
};
meta.homepage = "https://github.com/Wansmer/treesj/";
};
@@ -9164,12 +9236,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
- version = "2023-03-26";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "2ae7237c2917d661f458443c9a88680f8ca2d7b2";
- sha256 = "086w4yk5vnm03q1rkxjg0n6pg8hq5abzbz8g3ynds558q9yg03xv";
+ rev = "d56bfc0c501ced4002a57cb60433362fb2ce9c4d";
+ sha256 = "0h01raxxjq2arkjq0wa1l5nhgr2x55rmmq7hwz46sl4il936yvli";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -9272,12 +9344,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
- version = "2023-04-11";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
- rev = "b9c391ea148795d50071565d8abea635f59dc68f";
- sha256 = "0xh52mc6kp58w2frjmncc0p132y3287hc92dxih62maaagaham9l";
+ rev = "c32964f6fb35a7ad2bc74320bb7032477965881b";
+ sha256 = "19bpf235rv3gdyx94ancwmg9an0zjlkf0k0i75vmx6y01kb0an55";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@@ -9704,12 +9776,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2023-03-16";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "a532fed72ace069e61c0132125b728316f9abd3c";
- sha256 = "1n11mi2fh8a95ddrmmi7p4yrapvzg4lqnvsw5npfjzyj22c5wmpy";
+ rev = "5891a3f7bedb5d0b23a546189a607836913814bb";
+ sha256 = "0vmzpxkivrr8w7gwkwcxpa9h9jyfr3si516misj6aki4si8bzxr8";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -9848,12 +9920,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2023-01-09";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
- rev = "d529e3e09a378695367969bf01735b9b997014ec";
- sha256 = "06p0246rw4cra2c9zr6bml9ylflyb4kcx4h5nfcriz0rsqgph0ha";
+ rev = "7b35295b519f5f69be2e10b936db7fbac290b813";
+ sha256 = "1cwxnbq4pngfi8151ycp9d78gybq70snrikv1nsxqmlk4k3wdipk";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@@ -9906,6 +9978,18 @@ final: prev:
meta.homepage = "https://github.com/moll/vim-bbye/";
};
+ vim-be-good = buildVimPluginFrom2Nix {
+ pname = "vim-be-good";
+ version = "2022-11-08";
+ src = fetchFromGitHub {
+ owner = "ThePrimeagen";
+ repo = "vim-be-good";
+ rev = "c290810728a4f75e334b07dc0f3a4cdea908d351";
+ sha256 = "1xnydbqyjrmwj7cpj3qcr1icg8v75ny847i1qpj94dafjzzmi4wl";
+ };
+ meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/";
+ };
+
vim-beancount = buildVimPluginFrom2Nix {
pname = "vim-beancount";
version = "2023-01-02";
@@ -10098,18 +10182,6 @@ final: prev:
meta.homepage = "https://github.com/rhysd/vim-clang-format/";
};
- vim-clap = buildVimPluginFrom2Nix {
- pname = "vim-clap";
- version = "2023-04-02";
- src = fetchFromGitHub {
- owner = "liuchengxu";
- repo = "vim-clap";
- rev = "5a3667644ca1beada1c6add865b3f8329b4727bc";
- sha256 = "1066xdimc4vpqar95hnbwl1f2wijr3yss6z1s16k07ymvi02dgxs";
- };
- meta.homepage = "https://github.com/liuchengxu/vim-clap/";
- };
-
vim-clojure-highlight = buildVimPluginFrom2Nix {
pname = "vim-clojure-highlight";
version = "2015-07-05";
@@ -10388,12 +10460,12 @@ final: prev:
vim-dadbod-ui = buildVimPluginFrom2Nix {
pname = "vim-dadbod-ui";
- version = "2023-03-18";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "vim-dadbod-ui";
- rev = "986324fa6372170ec47b28a5558ae7f7185e1d71";
- sha256 = "0cc8lj2fsvibdvw1vdg5pa14gdndr0h6p3rzkzz475xzh1hiid2q";
+ rev = "4c306bef457ebfdbe71c76b49672d48ef310ddd3";
+ sha256 = "0xq3ywagb5xj9hzb84gm4lg1jkhxh81lgi5q942hi8sajgmlmf6d";
};
meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
};
@@ -10640,12 +10712,12 @@ final: prev:
vim-endwise = buildVimPluginFrom2Nix {
pname = "vim-endwise";
- version = "2023-02-25";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-endwise";
- rev = "c3411c95290063f56dfe13b485882111ef403c6e";
- sha256 = "0dip6vajky1hyc3xs8bjbwv5dycrv4lmyzicj6g7y8pgbddl283a";
+ rev = "49f7283374f8e3badd3701e35420cf6cb386ef2a";
+ sha256 = "0afh1k81b2j169h6bzd4hjr3cp0iizc3z3cj4ycj7a3h0n6pzm3s";
};
meta.homepage = "https://github.com/tpope/vim-endwise/";
};
@@ -10832,12 +10904,12 @@ final: prev:
vim-flog = buildVimPluginFrom2Nix {
pname = "vim-flog";
- version = "2023-03-19";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "rbong";
repo = "vim-flog";
- rev = "c58f04c82174fc887bbd626e871c89bc393ba585";
- sha256 = "0113br4ny03pn3r2zly3w6svasrm7n48vcnc5dcizwkk0jf2rhi4";
+ rev = "79d12ed0384d2934c27daee8f5f49b8390c56014";
+ sha256 = "0q084z6lbhd84qgl7zz6xkfzy8x5raw3lm5gix93wdi0kzczchpn";
};
meta.homepage = "https://github.com/rbong/vim-flog/";
};
@@ -10880,24 +10952,24 @@ final: prev:
vim-fubitive = buildVimPluginFrom2Nix {
pname = "vim-fubitive";
- version = "2023-02-13";
+ version = "2023-04-12";
src = fetchFromGitHub {
owner = "tommcdo";
repo = "vim-fubitive";
- rev = "f522e7c1c958d099438b375f38576f0f2f5100d2";
- sha256 = "1qd9pka3wrmwq1y33i4bzm2qs6l0lx8g1174aa0g4kcawwf21m7j";
+ rev = "5b13f16703ff69cca103aeffbd3d69515899989a";
+ sha256 = "00gi3bfrf58f8z7v30lkbdj4mw8n8q2cjdkqq4clv6yrsy7jg25i";
};
meta.homepage = "https://github.com/tommcdo/vim-fubitive/";
};
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2023-03-30";
+ version = "2023-04-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "ef99f1d90cdb33a52931aed5868785b51fb9411d";
- sha256 = "1q71pmhm1yg2nwczyj0iq102nzzv8j4y55f2aylr4j2cxbhy7bzb";
+ rev = "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c";
+ sha256 = "1n6sswhn0x7qg7jpk38790lbrbvpz1k5wjfjanplfz35h2njjyag";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -11421,12 +11493,12 @@ final: prev:
vim-jack-in = buildVimPluginFrom2Nix {
pname = "vim-jack-in";
- version = "2023-01-31";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "clojure-vim";
repo = "vim-jack-in";
- rev = "8ca306a9484d6d184de8921a9cab03c63ee9aa79";
- sha256 = "0hrvsq95rqwp0kfsdiid5qv0bfx1i7wc5yn7qmdqc660s7abwqxs";
+ rev = "4cefab20f02c44249499f43200442a3176315acd";
+ sha256 = "1jvqfqf11gv8ww5gh4xxxdrpflaw1pw8f10p1y8slc63var5i8vd";
};
meta.homepage = "https://github.com/clojure-vim/vim-jack-in/";
};
@@ -11770,12 +11842,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2023-04-10";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "06bf1b35ef4717a10a00ec4f8387ebf3ec983194";
- sha256 = "1wmxjlhhb3za2giza5hphr4sp4x763czajviv6vndfpibi4cgy5s";
+ rev = "80644e108b71d8735ab4c03dbc53db5ec6598d9b";
+ sha256 = "1m3c8sq48acb1mcv1b1dxyh6zfm2i46hvaf0i7nx8ndnasd3jap4";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -11879,12 +11951,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2023-04-10";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "03ebc3b7dbf8f17f2d45d9b5619b48a030e1bf88";
- sha256 = "18bgw4gv9xd8msh7ly4lz8x631a3bprn5lcdl114g3h6ybs8ldix";
+ rev = "1364b2ba551c82fdb342b646da666a477490c063";
+ sha256 = "1fqnp195gxh8wcjvdv01iq6zd04d43nml3d2qlxqr6fcc5pvrn9a";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -12311,12 +12383,12 @@ final: prev:
vim-oscyank = buildVimPluginFrom2Nix {
pname = "vim-oscyank";
- version = "2023-03-06";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "ojroques";
repo = "vim-oscyank";
- rev = "ffe827a27dae98aa826e2295336c650c9a434da0";
- sha256 = "1hj1yviw2lkinnb4l15psg2c9gmcx4csmlh0hp32kbslwmv56y92";
+ rev = "7fa8b04562d4ba2c23e67e7038256ecabc8fc376";
+ sha256 = "0cbpjffjk8ydwb9kv1sblggrs5j2hdk7l57xy7k0r7rwd5kmwj5k";
};
meta.homepage = "https://github.com/ojroques/vim-oscyank/";
};
@@ -12755,12 +12827,12 @@ final: prev:
vim-rails = buildVimPluginFrom2Nix {
pname = "vim-rails";
- version = "2023-01-05";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rails";
- rev = "959e94b76e6ebdf984acef61649ba7d0f62bd425";
- sha256 = "05v2gi42jv1rly8g7vhwfhjl01x3ld5xnrzgi7kadl5kppjnp5g8";
+ rev = "eb51379ebab26ca3ec45d54f848c310c45ce7692";
+ sha256 = "0z8zsyv3g1224g6iwgf0wchnqn6cmr7w9h0ddgv3lysvh7qz6mla";
};
meta.homepage = "https://github.com/tpope/vim-rails/";
};
@@ -13031,12 +13103,12 @@ final: prev:
vim-slime = buildVimPluginFrom2Nix {
pname = "vim-slime";
- version = "2023-03-15";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "jpalardy";
repo = "vim-slime";
- rev = "e5ae6a6d479c97d5352969574130956798e480b7";
- sha256 = "1s4xpwca6nnylcfsk3lic6s2ddy4plf8qc2hln7vvbnmbjp948d0";
+ rev = "bb152854fc21193729bf587aa055e738d50c8b48";
+ sha256 = "1hxcjqy6xga0jr5z6s71vsl1s45z1fkhcvwxwr571n1azfhb8znk";
};
meta.homepage = "https://github.com/jpalardy/vim-slime/";
};
@@ -13149,6 +13221,18 @@ final: prev:
meta.homepage = "https://github.com/honza/vim-snippets/";
};
+ vim-solarized8 = buildVimPluginFrom2Nix {
+ pname = "vim-solarized8";
+ version = "2023-02-25";
+ src = fetchFromGitHub {
+ owner = "lifepillar";
+ repo = "vim-solarized8";
+ rev = "bcd4e74e9850fd59ee0294a5c3ae958ed535cc52";
+ sha256 = "00qhqy511wdcmlsglwhqsd6gffagjmdz0wl5627a3nwmxs8p45sa";
+ };
+ meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
+ };
+
vim-solidity = buildVimPluginFrom2Nix {
pname = "vim-solidity";
version = "2018-04-17";
@@ -13211,12 +13295,12 @@ final: prev:
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
- version = "2023-02-01";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
- rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834";
- sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx";
+ rev = "00391e7f86a0fd0ebdb2afdf4336f6712925ce45";
+ sha256 = "1n0q0mgb52yr5vv053dgkp1vhzl42l7ancmpbg5vwc4gj0bwm603";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@@ -13572,12 +13656,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2023-04-02";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "33434a26c8b057bcf6ed20f10fa888b2ed82e2cc";
- sha256 = "0ahkmbg998w2mpby5krv4n9c9a8kbnbzflivc8fx3xdvs4a4a2x7";
+ rev = "b492a5717ba513b32a5d310fab7b9b0401eb0b57";
+ sha256 = "0zi6891wndfvhf2k3cl3rzbfsk2nfxl2qhqscg05szx7gfjvb3bd";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -13812,12 +13896,12 @@ final: prev:
vim-wakatime = buildVimPluginFrom2Nix {
pname = "vim-wakatime";
- version = "2023-03-18";
+ version = "2023-04-13";
src = fetchFromGitHub {
owner = "wakatime";
repo = "vim-wakatime";
- rev = "3b3d7f3d0fb4a476a7d1ef4d6f41e31050bdf52a";
- sha256 = "1l2zv2442nrhl8hskc273n62i8d4ws7ixsk83hhdy4r8cafnhmjd";
+ rev = "515dbcc2278a9279a19de838fa29fc5078e34e56";
+ sha256 = "186p9v00j7sag46wh9w0x7nvc52k5ki19smxfi1mwjpfrfizxywn";
};
meta.homepage = "https://github.com/wakatime/vim-wakatime/";
};
@@ -13908,12 +13992,12 @@ final: prev:
vim-xkbswitch = buildVimPluginFrom2Nix {
pname = "vim-xkbswitch";
- version = "2023-03-06";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "lyokha";
repo = "vim-xkbswitch";
- rev = "99821a4b8ee2a05996954a2894d043af001f2d7b";
- sha256 = "1jbng45aiypb526ji6nd9d26d4zjj6il4jz808452b5q1immdrpc";
+ rev = "cba47eaec8931266c34c4ab1247abe04f3b7ef55";
+ sha256 = "0fgd10j4c64zc77pc2q3d5x7hg1h844lfj2cdqqxgds33nf2cald";
};
meta.homepage = "https://github.com/lyokha/vim-xkbswitch/";
};
@@ -14112,12 +14196,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2023-04-06";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "657132ead403951a59641b24bd771bb6da93e427";
- sha256 = "11kzpzah7wqm22wnrlr8hpyjaammkj2nlxh19m52xb8cc3fkzpys";
+ rev = "bcf6dad40903ad34843a7536d3a4cff6ac5c0035";
+ sha256 = "0lngsihdwv3s46b61r7kpnac3r0iw1vhh2bggn3k9ldmzds36rzb";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -14125,12 +14209,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2023-04-06";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "e8542f26b45e489fe7cfa7894737ccb0fe937fcd";
- sha256 = "1zlagp825rcl82kg4n38hvxvyywd6rx3496jh34lkcqzdvvbab2r";
+ rev = "d3dfbf391ba8d8f08ab91ce8e54173cddc708b02";
+ sha256 = "1kv6004a8r1c68kda1zn853kddbqb8dafxba8a5h3rcjqcbjn1kn";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -14149,12 +14233,12 @@ final: prev:
vimwiki = buildVimPluginFrom2Nix {
pname = "vimwiki";
- version = "2023-04-05";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "vimwiki";
repo = "vimwiki";
- rev = "71edcf6802eeb724ca679547d5cb7a8eadf0cfcb";
- sha256 = "0c08c24i17h2zykbsm0lv1brscwsbmyf9lvqh9zbi8ikbfswr5b7";
+ rev = "7a48268d24614e74f8187856ade54cf03134e9d9";
+ sha256 = "1g85yjp2adysgvfpy6mq24vdm2rgn1gq7yr3h6hw8i3c3wjzjibg";
};
meta.homepage = "https://github.com/vimwiki/vimwiki/";
};
@@ -14197,12 +14281,12 @@ final: prev:
vista-vim = buildVimPluginFrom2Nix {
pname = "vista.vim";
- version = "2022-11-30";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "33774aff5d8b224f24c2e4c6015c613c1a17bf74";
- sha256 = "0c3255id5wzgb1v5zsga7ig1b8mqmrbklmz40x98av4j5dqghfw7";
+ rev = "cbe87c86505d80fe5ad7fd508f2d92185f2e2aa1";
+ sha256 = "0vx99bhrgwr72az85imp7qwni54q9kk1v9vhdbglfc4h1rd3fzm5";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -14231,26 +14315,38 @@ final: prev:
meta.homepage = "https://github.com/mattn/webapi-vim/";
};
+ wgsl-vim = buildVimPluginFrom2Nix {
+ pname = "wgsl.vim";
+ version = "2023-04-12";
+ src = fetchFromGitHub {
+ owner = "DingDean";
+ repo = "wgsl.vim";
+ rev = "b72cb2c28ec9554be240113bceb34198f88484e6";
+ sha256 = "1l1y9dwp33g5gp5mvyq4vkw8q8369r493i0qfn81nmwnmc09rsbn";
+ };
+ meta.homepage = "https://github.com/DingDean/wgsl.vim/";
+ };
+
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
- version = "2023-03-26";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
- rev = "4b73390eec680b4c061ea175eb32c0ff3412271d";
- sha256 = "0c8f765hm0j9k5j3xcnmmzrj3ajrc9v3gw94rc6sil5p0va997a7";
+ rev = "94cb020ff33a1e0e22fac1c41663d2c439741f17";
+ sha256 = "1xq9l53n5l1dyyj4xvw30wra9g8c8xg82sijx1ahgfcqkz4j1zib";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
whitespace-nvim = buildVimPluginFrom2Nix {
pname = "whitespace.nvim";
- version = "2023-02-13";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "johnfrankmorgan";
repo = "whitespace.nvim";
- rev = "525f67b3f01910c73f07f0848839aab0b7ab9f42";
- sha256 = "0kv2b099jc9592g0b381rdgzv5wvryy3v95bfk1sdjr9bmzdyjn9";
+ rev = "fe9ca0ba3c6e6cc1dd14c0d6cbe49d97496700dd";
+ sha256 = "1a391aq8svh3ayv4sa5dphg31l0x9rji8jrb6pa91y4b9sdhr6is";
};
meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/";
};
@@ -14426,12 +14522,12 @@ final: prev:
zen-mode-nvim = buildVimPluginFrom2Nix {
pname = "zen-mode.nvim";
- version = "2023-03-19";
+ version = "2023-04-17";
src = fetchFromGitHub {
owner = "folke";
repo = "zen-mode.nvim";
- rev = "d907e638c879642d226d27469b53db6925f69d4c";
- sha256 = "0jidblyqmgrzmzmfkz71qa0p13y66fa8jb66fkrnn4bbk617vryw";
+ rev = "6e6c963d70a8e47854fa656987666bfb863f9c4e";
+ sha256 = "1vkwvbxdqny03p22ngbczkzd4djpiirx7x01v49078217m6b56w3";
};
meta.homepage = "https://github.com/folke/zen-mode.nvim/";
};
@@ -14464,12 +14560,12 @@ final: prev:
pname = "zephyr-nvim";
version = "2022-12-31";
src = fetchFromGitHub {
- owner = "glepnir";
+ owner = "nvimdev";
repo = "zephyr-nvim";
rev = "7fd86b7164442d3b5ec2c81b2694d040e716b5cf";
sha256 = "12ichp7jmawgf1clwpd2w22a2amqlv578lnb89ppzf9hjz5kcxnb";
};
- meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
+ meta.homepage = "https://github.com/nvimdev/zephyr-nvim/";
};
zig-vim = buildVimPluginFrom2Nix {
@@ -14486,12 +14582,12 @@ final: prev:
zk-nvim = buildVimPluginFrom2Nix {
pname = "zk-nvim";
- version = "2023-04-03";
+ version = "2023-04-15";
src = fetchFromGitHub {
owner = "mickael-menu";
repo = "zk-nvim";
- rev = "ff3a9661d9054a74d8baa51743c9dc11f8a215c3";
- sha256 = "1a97yk343rw6af8nvyh8wd33ynyl039hw9va74rd4d4qljnj7qjr";
+ rev = "275578853dc76d282ee5b31f86cd3a4f02d91f2f";
+ sha256 = "0931qp0i0p8cqvz7a5i5b7ijdrd40qr4vriqmxl4hycjag8wcwq6";
};
meta.homepage = "https://github.com/mickael-menu/zk-nvim/";
};
@@ -14510,24 +14606,24 @@ final: prev:
zoxide-vim = buildVimPluginFrom2Nix {
pname = "zoxide.vim";
- version = "2023-02-22";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "nanotee";
repo = "zoxide.vim";
- rev = "e50df0b0160363f5dcae60c4f633ade78e59bdc8";
- sha256 = "0qviqfbdss95jz51afpxwrxbvml4lcqpspn8gzv2q0m8avqnlrq8";
+ rev = "7582d5441f68c46b8fbd42a8721cde0c0dfe344b";
+ sha256 = "0gbnwf535mk29yhn39sdy9bifzk2y8x6ldkybn8l3pwjrlr42cks";
};
meta.homepage = "https://github.com/nanotee/zoxide.vim/";
};
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2023-04-11";
+ version = "2023-04-20";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5";
- sha256 = "0w87h5vdrwn3ch8fyyfxkpz16r150910wmbb5y6wr4ad3scndjsk";
+ rev = "939be5f7fcbc15abeaad9214bb253a4551f6f6e6";
+ sha256 = "16dmasj74szapc0p9kv35yb0smci7zk4k17p5d301lslrhr5jg35";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -14546,12 +14642,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2023-04-09";
+ version = "2023-04-16";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "f7d98de1e1c22b057248981bf531e8fa6132e225";
- sha256 = "183qkns5idryq2izng4lg3ah20d6wqrlz21vmsgwhal9594ppzkj";
+ rev = "bac02812a4ccb695a02dcc46ed6b33d56b31b147";
+ sha256 = "1d0hhlia4s9nb81ah5f3qilmsflyax5w38w3fjpqvffikxn9rvzs";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -14570,12 +14666,12 @@ final: prev:
embark-vim = buildVimPluginFrom2Nix {
pname = "embark-vim";
- version = "2023-02-25";
+ version = "2023-04-21";
src = fetchFromGitHub {
owner = "embark-theme";
repo = "vim";
- rev = "484eb68c69345b5185e370d91ba631accd522776";
- sha256 = "1l74j5hq3gs4pfln7inbidza1vfrrl8z5pg77njmb7yx1ilc4l9q";
+ rev = "0e2c7d36b766dcebba2d8a3a0639784446dea086";
+ sha256 = "1q3a6ix01wmw0qkir0v246gjp5dxr30ih0h0q28gv3s2hfk75a4w";
};
meta.homepage = "https://github.com/embark-theme/vim/";
};
@@ -14594,12 +14690,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
- version = "2023-04-11";
+ version = "2023-04-19";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
- rev = "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0";
- sha256 = "14k02srgqdzglzbn6yvr12qgpkmngaamlpb97p4h27d6di9zpkkm";
+ rev = "c483c9b43fa6cb47fb8c18a8ebd4ece45bbf07f4";
+ sha256 = "10gy1jvqkxq20bdq4k3mhc6ib1d15h0p9vmnmx55bgp5z1hby44c";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};
@@ -14642,12 +14738,12 @@ final: prev:
rose-pine = buildVimPluginFrom2Nix {
pname = "rose-pine";
- version = "2023-03-30";
+ version = "2023-04-18";
src = fetchFromGitHub {
owner = "rose-pine";
repo = "neovim";
- rev = "f8e210df52a4f418eae3690eb744b06c13a6c556";
- sha256 = "1d2ll2x66f7v854xdmp65l23mnv5qhzqci1bri5v2gj7hqs18r4f";
+ rev = "667851c05f87874826084474b5f04829940b6451";
+ sha256 = "0j7f7fj3gy2p6q3vnkwxxll49p36fi8glzlzgbc08knwksdkgi30";
};
meta.homepage = "https://github.com/rose-pine/neovim/";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix
new file mode 100644
index 0000000000..0aaec333c2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix
@@ -0,0 +1,19 @@
+with import {};
+let
+ inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
+ inherit (neovimUtils) buildNeovimPluginFrom2Nix;
+
+ generated = callPackage {
+ inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
+ } {} {};
+ hasChecksum = value:
+ lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
+ getChecksum = name: value:
+ if hasChecksum value then {
+ submodules = value.src.fetchSubmodules or false;
+ sha256 = value.src.outputHash;
+ rev = value.src.rev;
+ } else null;
+ checksums = lib.mapAttrs getChecksum generated;
+in
+ lib.filterAttrs (n: v: v != null) checksums
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 257f01b1ae..8d1654913f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -60,12 +60,12 @@
};
bash = buildGrammar {
language = "bash";
- version = "0.0.0+rev=b338fa9";
+ version = "0.0.0+rev=422a07c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
- rev = "b338fa9f4807b9e0336cd4dde04948a8c324a4cf";
- hash = "sha256-2ARBWfjtnM9+FKfASk1s6L7cDnUFIV6U9wBld2s8WWM=";
+ rev = "422a07cb221b92c6b117e854efa8945a506b5214";
+ hash = "sha256-P5ne6DIQZElbGpSpwxbEQrufcUhekWWEhOhD0GHJ/AQ=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
};
@@ -137,12 +137,12 @@
};
c_sharp = buildGrammar {
language = "c_sharp";
- version = "0.0.0+rev=92d572e";
+ version = "0.0.0+rev=0dd182a";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-c-sharp";
- rev = "92d572eef5ffdd4117e7ba36b56850a90cb79151";
- hash = "sha256-Zp8aEoLv/FPaTQPJzS2gS3htU9wpUwWB1gvRfYh4gsY=";
+ rev = "0dd182a14a519a70dc60c3727fdc2fdb65c030ae";
+ hash = "sha256-yIZUsEJvQkxD4gNp4jQRGtEeSTLeSdgFdJs03nvt9ko=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
};
@@ -192,12 +192,12 @@
};
comment = buildGrammar {
language = "comment";
- version = "0.0.0+rev=a37ca37";
+ version = "0.0.0+rev=f08e7d4";
src = fetchFromGitHub {
owner = "stsewd";
repo = "tree-sitter-comment";
- rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e";
- hash = "sha256-wiFY2uMNv8Wet3qKh0bSe8FSO1sjGu1uTOBxnt/HHHg=";
+ rev = "f08e7d44b2923e9da2bf487a2f365d08677d368e";
+ hash = "sha256-v3h4x3R+9xbCEFezZlWPPM2Hb4575mbRkkyw7oz7K+U=";
};
meta.homepage = "https://github.com/stsewd/tree-sitter-comment";
};
@@ -236,12 +236,12 @@
};
cpp = buildGrammar {
language = "cpp";
- version = "0.0.0+rev=0b6d0eb";
+ version = "0.0.0+rev=670404d";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
- rev = "0b6d0eb9abdf7cea31961cd903eeed5bbd0aae74";
- hash = "sha256-rsxRiZCrsEB/ixAP4YmxFtnCoDQrLAp75c74DFR0/nk=";
+ rev = "670404d7c689be1c868a46f919ba2a3912f2b7ef";
+ hash = "sha256-T+Ha2hlI7ucEsTYvDmk7xjHNEoyvnotp/1EWfyCwnWM=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@@ -258,12 +258,12 @@
};
cuda = buildGrammar {
language = "cuda";
- version = "0.0.0+rev=967e7d7";
+ version = "0.0.0+rev=a358542";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
- rev = "967e7d74a1a04a680674199e12141963a8dd6336";
- hash = "sha256-3rkmxnf1YzshBUEOXBXj9Zpg9IHh2uS0QzdncOU99IQ=";
+ rev = "a35854270463a96e79096bb854aae30a4f0e6cd2";
+ hash = "sha256-8CRFEUxTge0EJQQQVabCjstUGkOIPlC1duj2jD4R89E=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@@ -392,12 +392,12 @@
};
elm = buildGrammar {
language = "elm";
- version = "0.0.0+rev=28bb193";
+ version = "0.0.0+rev=692c50c";
src = fetchFromGitHub {
owner = "elm-tooling";
repo = "tree-sitter-elm";
- rev = "28bb193640d916dfaf947912c1413cebb0484841";
- hash = "sha256-Ijw9Ov8+IBLl0fQlkuH6rQ6E7tlKeD+huj0GZdz6XH8=";
+ rev = "692c50c0b961364c40299e73c1306aecb5d20f40";
+ hash = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg=";
};
meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm";
};
@@ -579,12 +579,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
- version = "0.0.0+rev=1723599";
+ version = "0.0.0+rev=04dcb2c";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
- rev = "17235998809be904892f14ee57730d96795e9323";
- hash = "sha256-UhPlEanOBUpzqVPCqe8t5MIwdUwSeaoFJFsxpnUqwn8=";
+ rev = "04dcb2cb9a4cf638252b8bd4a829f9acadf2cc4c";
+ hash = "sha256-plu1qzMfvMfSqapQ4q+ZYNULDM8mBwlNeOzHoSSC3Hc=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@@ -612,12 +612,12 @@
};
glimmer = buildGrammar {
language = "glimmer";
- version = "0.0.0+rev=16c3786";
+ version = "0.0.0+rev=21805f4";
src = fetchFromGitHub {
owner = "alexlafroscia";
repo = "tree-sitter-glimmer";
- rev = "16c3786e1a2c87a236c823d1a8859574778a3436";
- hash = "sha256-fLRA4Rm92hVezbAdMxmrXPb5ax6wNaaBYIo+U64nD+8=";
+ rev = "21805f429c5b7536be9f5f61dcabb5d3a4173bec";
+ hash = "sha256-EMcPjnf0SPa8Jk0GkkLTsOEGqRVdjbUt/DklRmXOGUA=";
};
meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer";
};
@@ -766,12 +766,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
- version = "0.0.0+rev=fce5ea2";
+ version = "0.0.0+rev=40472c1";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
- rev = "fce5ea2e842404ce1af13fffdcf0daa02240c3dd";
- hash = "sha256-7/HJPPLUwwnxgmNP0Vzm+nTJ1YfnUYbqMcOEZZj5uRA=";
+ rev = "40472c119b5740d9a1fa0b0dc0b013502b636708";
+ hash = "sha256-PfShqPSIsYVMPpW9hQhbEz378vBwDiNkBKR3rLXcIdM=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@@ -788,12 +788,12 @@
};
html = buildGrammar {
language = "html";
- version = "0.0.0+rev=29f53d8";
+ version = "0.0.0+rev=594f23e";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
- rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a";
- hash = "sha256-v84N9erFL+QMoxh1dtfVdAJ5iTCoiFcT3kQ2+yq8TXE=";
+ rev = "594f23eb6da580cf269a59d966db68f2cde7d0c8";
+ hash = "sha256-DgYcJjMCQ0C96l1J4if6FdArj5atxy3LsJr+SnZqiQo=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@@ -964,12 +964,12 @@
};
latex = buildGrammar {
language = "latex";
- version = "0.0.0+rev=376f640";
+ version = "0.0.0+rev=cd3cc49";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "tree-sitter-latex";
- rev = "376f64097b7a26691a2ca60dc94e4dfa417be932";
- hash = "sha256-9hcmCr9HfhKt5dkNN24haubrOySqpxzMoLVEGO53lxk=";
+ rev = "cd3cc493a92b6bac7be4b3bd6d006d35d3c36d4c";
+ hash = "sha256-CHN54T4+eD7EGx4nzAIryAHOu8NCiBDjM2A7Njjt87w=";
};
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
};
@@ -1008,12 +1008,12 @@
};
luadoc = buildGrammar {
language = "luadoc";
- version = "0.0.0+rev=5c9572f";
+ version = "0.0.0+rev=1e11522";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-luadoc";
- rev = "5c9572faf56d1fa0f7e0740c94de1c4f67c6af5e";
- hash = "sha256-90FXGhzTpPVVBPpAdAvfqdIOVCPKTUtRC0WWQyCR0Eg=";
+ rev = "1e1152264cc68e11d65d9e2493566f5717a13d11";
+ hash = "sha256-CNSo4m5peO1WBncZ1RGmmbA3V8qefh5LJJpFYFTAlsY=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc";
};
@@ -1076,12 +1076,12 @@
};
matlab = buildGrammar {
language = "matlab";
- version = "0.0.0+rev=2d5d3d5";
+ version = "0.0.0+rev=dd95e1f";
src = fetchFromGitHub {
owner = "mstanciu552";
repo = "tree-sitter-matlab";
- rev = "2d5d3d5193718a86477d4335aba5b34e79147326";
- hash = "sha256-Rpa/F3MIFRmHunJFsuvbs3h3vDlR3U7UZ+sTN5tJS8U=";
+ rev = "dd95e1fc1b5514aa3a882d5fb8ddbf4683e953f0";
+ hash = "sha256-0CSwSFf4mUtz4lg06Fi24Szo5WpD18M9Fiu8KIg2QB8=";
};
meta.homepage = "https://github.com/mstanciu552/tree-sitter-matlab";
};
@@ -1245,12 +1245,12 @@
};
perl = buildGrammar {
language = "perl";
- version = "0.0.0+rev=3d3a95e";
+ version = "0.0.0+rev=60aa138";
src = fetchFromGitHub {
owner = "ganezdragon";
repo = "tree-sitter-perl";
- rev = "3d3a95ee6645d7bcd993e77b252ffd33fd297c8e";
- hash = "sha256-YM4lxdcvkX2l4KkdktDSoNXaN2zCqAS4W0mXMh8GJOs=";
+ rev = "60aa138f9e1db15becad53070f4d5898b0e8a98c";
+ hash = "sha256-GpgUSm/kFFXgJOSBVBxPQiMfykZUgxLdmQfDfJE3Jq8=";
};
meta.homepage = "https://github.com/ganezdragon/tree-sitter-perl";
};
@@ -1344,12 +1344,12 @@
};
prql = buildGrammar {
language = "prql";
- version = "0.0.0+rev=4045dcf";
+ version = "0.0.0+rev=02b1e96";
src = fetchFromGitHub {
owner = "PRQL";
repo = "tree-sitter-prql";
- rev = "4045dcff3f8ac04669855b32584053dec065bba4";
- hash = "sha256-+uyCgWon/yCRAOTpzpcDovxyXrIZ4UDwwWG4ndMz0iY=";
+ rev = "02b1e967ede00aaa5d7c9fcd4a604b83825a6261";
+ hash = "sha256-3pdfcCfHdusphn7vQX/d1gS5kKyNTE9qf0YBvsa/BjM=";
};
meta.homepage = "https://github.com/PRQL/tree-sitter-prql";
};
@@ -1575,12 +1575,12 @@
};
smali = buildGrammar {
language = "smali";
- version = "0.0.0+rev=a67a429";
+ version = "0.0.0+rev=b002dce";
src = fetchFromSourcehut {
owner = "~yotam";
repo = "tree-sitter-smali";
- rev = "a67a429784dafa0ca4342d71e6530137ca803883";
- hash = "sha256-Pby6RZKPXyPR41E9m2iRsLgVt7bOn2AZyyb4lvcwYwY=";
+ rev = "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3";
+ hash = "sha256-KZ5+3xqQkxAZcOY8UVxfycQWlaGHq9pv4MzjiIaVtLY=";
};
meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali";
};
@@ -1685,12 +1685,12 @@
};
swift = buildGrammar {
language = "swift";
- version = "0.0.0+rev=ca3a370";
+ version = "0.0.0+rev=05467af";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
- rev = "ca3a37055069277ad91d6a2c35faf9f247dcfbfb";
- hash = "sha256-H/6BBBB+vITl91FwiM6/aiv8OEgGjLt3HihTTsYzTVE=";
+ rev = "05467af73ac315fc80c7f3ef397e261f30395e2a";
+ hash = "sha256-4/5ZzxkMiv8qXCXM/M/+NBX9uMw46DnGTEFKbPgNNzU=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -1708,13 +1708,13 @@
};
t32 = buildGrammar {
language = "t32";
- version = "0.0.0+rev=f8106fc";
+ version = "0.0.0+rev=0802b36";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "xasc";
repo = "tree-sitter-t32";
- rev = "f8106fcf5a27f905b3d9d55d9cd3e910bea70c60";
- hash = "sha256-hKddSekx67Yqm4+LqVaH8Sf1+73RlCnXE6th2FTHB34=";
+ rev = "0802b3638a1c5022b4d55bdafa64f856ed43d7d6";
+ hash = "sha256-9c5EUgtvoXXZQY5AtahyfmG9SGxcjhrrOxWa0eyicqU=";
};
meta.homepage = "https://codeberg.org/xasc/tree-sitter-t32";
};
@@ -1878,12 +1878,12 @@
};
v = buildGrammar {
language = "v";
- version = "0.0.0+rev=4cd190d";
+ version = "0.0.0+rev=234c102";
src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
- rev = "4cd190d1aaced458e8f1548e11b3beae5e4ea806";
- hash = "sha256-rbIRx/LA5kvq7vI5WdR8be0WCyyTxsWB87ENNO7Qkao=";
+ rev = "234c1028883187c6b48e030780b7332229faefa3";
+ hash = "sha256-4DqMn9rPTxOtQOfy8fy6R7z/+z50XnCLV0J/4QFrRz4=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";
@@ -2011,12 +2011,12 @@
};
zig = buildGrammar {
language = "zig";
- version = "0.0.0+rev=2c7b630";
+ version = "0.0.0+rev=9b84cb6";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
- rev = "2c7b6308d906d7aec4b3e1fafaaeca447a8a2c2f";
- hash = "sha256-uN/B4YasWdgAWV8IAwKd4MP/L73+RiQJGQD00ZA8d6E=";
+ rev = "9b84cb66e7d480e7c0370f4e33e8325bac6ad09f";
+ hash = "sha256-IyVYRqSAqCxUK5ADXlTfNK9MhcdvDVwCJ2Y5VF/oYVs=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index bacebe9a74..67aa374056 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -27,6 +27,25 @@ let
})
generatedDerivations;
+ grammarToPlugin = grammar:
+ let
+ name = lib.pipe grammar [
+ lib.getName
+
+ # added in buildGrammar
+ (lib.removeSuffix "-grammar")
+
+ # grammars from tree-sitter.builtGrammars
+ (lib.removePrefix "tree-sitter-")
+ (lib.replaceStrings [ "-" ] [ "_" ])
+ ];
+ in
+
+ runCommand "nvim-treesitter-grammar-${name}" { } ''
+ mkdir -p $out/parser
+ ln -s ${grammar}/parser $out/parser/${name}.so
+ '';
+
allGrammars = lib.attrValues generatedDerivations;
# Usage:
@@ -35,26 +54,7 @@ let
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
withPlugins =
f: self.nvim-treesitter.overrideAttrs (_: {
- passthru.dependencies = map
- (grammar:
- let
- name = lib.pipe grammar [
- lib.getName
-
- # added in buildGrammar
- (lib.removeSuffix "-grammar")
-
- # grammars from tree-sitter.builtGrammars
- (lib.removePrefix "tree-sitter-")
- (lib.replaceStrings [ "-" ] [ "_" ])
- ];
- in
-
- runCommand "nvim-treesitter-${name}-grammar" { } ''
- mkdir -p $out/parser
- ln -s ${grammar}/parser $out/parser/${name}.so
- ''
- )
+ passthru.dependencies = map grammarToPlugin
(f (tree-sitter.builtGrammars // builtGrammars));
});
@@ -67,7 +67,9 @@ in
'';
passthru = {
- inherit builtGrammars allGrammars withPlugins withAllGrammars;
+ inherit builtGrammars allGrammars grammarToPlugin withPlugins withAllGrammars;
+
+ grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
tests.check-queries =
let
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
index d480b97b01..e610e7c14c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -90,9 +90,7 @@
, makeWrapper
, procps
- # vim-clap dependencies
-, libgit2
-, libiconv
+ # sg-nvim dependencies
, openssl
, pkg-config
@@ -852,18 +850,18 @@ self: super: {
sniprun =
let
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "michaelb";
repo = "sniprun";
rev = "v${version}";
- hash = "sha256-6UDjrrEtOuB+lrCZVBO4BcZm78qwq8YbQcXAdjNbicY=";
+ hash = "sha256-grrrqvdqoYTBtlU+HLrSQJsAmMA/+OHbuoVvOwHYPnk=";
};
sniprun-bin = rustPlatform.buildRustPackage {
pname = "sniprun-bin";
inherit version src;
- cargoSha256 = "sha256-ghXYUgXqXvK9RySG/hQR5zpLsyk6L9Htb/UYgMPyWUk=";
+ cargoSha256 = "sha256-hmZXYJFIeKgYyhT6mSrmX+7M9GQQHHzliYHjsBoHgOc=";
nativeBuildInputs = [ makeWrapper ];
@@ -884,11 +882,6 @@ self: super: {
substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin}
'';
- postInstall = ''
- mkdir $out/doc
- ln -s $out/docs/sniprun.txt $out/doc/sniprun.txt
- '';
-
propagatedBuildInputs = [ sniprun-bin ];
};
@@ -1159,35 +1152,7 @@ self: super: {
passthru.python3Dependencies = ps: with ps; [ beancount ];
});
- vim-clap = super.vim-clap.overrideAttrs (old: {
- preFixup =
- let
- maple-bin = rustPlatform.buildRustPackage {
- name = "maple";
- inherit (old) src;
-
- nativeBuildInputs = [
- pkg-config
- ];
-
- buildInputs = [
- openssl
- ] ++ lib.optionals stdenv.isDarwin [
- CoreServices
- curl
- libgit2
- libiconv
- ];
-
- cargoHash = "sha256-BFUC6fQ5LpTKx2ztCuFVzXTWzSDl03VYsmVcxBXbiT4=";
- };
- in
- ''
- ln -s ${maple-bin}/bin/maple $target/bin/maple
- '';
-
- meta.platforms = lib.platforms.all;
- });
+ vim-clap = callPackage ./vim-clap { };
vim-codefmt = super.vim-codefmt.overrideAttrs (old: {
dependencies = with self; [ vim-maktaba ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
index 20336c66ed..09606634f9 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py
@@ -42,28 +42,14 @@ sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "mainta
import pluginupdate
from pluginupdate import run_nix_expr, PluginDesc
-GET_PLUGINS = f"""(with import {{}};
-let
- inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
- generated = callPackage {ROOT}/generated.nix {{
- inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
- }};
- hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
- getChecksum = name: value:
- if hasChecksum value then {{
- submodules = value.src.fetchSubmodules or false;
- sha256 = value.src.outputHash;
- rev = value.src.rev;
- }} else null;
- checksums = lib.mapAttrs getChecksum generated;
-in lib.filterAttrs (n: v: v != null) checksums)"""
+
GET_PLUGINS_LUA = """
with import {};
lib.attrNames lua51Packages"""
HEADER = (
- "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
+ "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
)
def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:
@@ -118,34 +104,39 @@ class VimEditor(pluginupdate.Editor):
""".format(
buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
- print(content)
+ log.debug(content)
return content
+
+ def update(self, args):
+ pluginupdate.update_plugins(self, args)
+
+ if self.nvim_treesitter_updated:
+ print("updating nvim-treesitter grammars")
+ nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter")
+ subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")])
+
+ if self.nixpkgs_repo:
+ index = self.nixpkgs_repo.index
+ for diff in index.diff(None):
+ if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix":
+ msg = "vimPlugins.nvim-treesitter: update grammars"
+ print(f"committing to nixpkgs: {msg}")
+ index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))])
+ index.commit(msg)
+ return
+ print("no updates to nvim-treesitter grammars")
+
+
def main():
global luaPlugins
luaPlugins = run_nix_expr(GET_PLUGINS_LUA)
+ with open(f"{ROOT}/get-plugins.nix") as f:
+ GET_PLUGINS = f.read()
editor = VimEditor("vim", ROOT, GET_PLUGINS)
- parser = editor.create_parser()
- args = parser.parse_args()
- pluginupdate.update_plugins(editor, args)
-
- if editor.nvim_treesitter_updated:
- print("updating nvim-treesitter grammars")
- nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter")
- subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")])
-
- if editor.nixpkgs_repo:
- index = editor.nixpkgs_repo.index
- for diff in index.diff(None):
- if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix":
- msg = "vimPlugins.nvim-treesitter: update grammars"
- print(f"committing to nixpkgs: {msg}")
- index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))])
- index.commit(msg)
- return
- print("no updates to nvim-treesitter grammars")
+ editor.run()
if __name__ == "__main__":
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
similarity index 59%
rename from third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock
rename to third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
index 7349b26f7d..9bb6200d68 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock
@@ -2,23 +2,6 @@
# It is not intended for manual editing.
version = 3
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
[[package]]
name = "aho-corasick"
version = "0.7.20"
@@ -29,39 +12,29 @@ dependencies = [
]
[[package]]
-name = "anes"
-version = "0.1.6"
+name = "android_system_properties"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
dependencies = [
- "winapi",
+ "libc",
]
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
[[package]]
-name = "arc-swap"
-version = "1.6.0"
+name = "async-trait"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
-
-[[package]]
-name = "assert_unordered"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74323b7881323eb351134e08ee5331594826789557afef8e309baf481b2264"
+checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
dependencies = [
- "ansi_term",
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
@@ -82,10 +55,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
-name = "beef"
-version = "0.5.2"
+name = "base64"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "bitflags"
@@ -93,42 +66,66 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
[[package]]
name = "bstr"
-version = "1.3.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
dependencies = [
"memchr",
+ "once_cell",
+ "regex-automata",
"serde",
]
[[package]]
-name = "bumpalo"
-version = "3.12.0"
+name = "built"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738"
+dependencies = [
+ "cargo-lock",
+ "git2",
+]
[[package]]
-name = "cast"
-version = "0.3.0"
+name = "bumpalo"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+
+[[package]]
+name = "bytecount"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+
+[[package]]
+name = "bytes"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+
+[[package]]
+name = "cargo-lock"
+version = "8.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996"
+dependencies = [
+ "semver",
+ "serde",
+ "toml",
+ "url",
+]
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+dependencies = [
+ "jobserver",
+]
[[package]]
name = "cfg-if"
@@ -142,35 +139,14 @@ version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [
+ "iana-time-zone",
+ "js-sys",
"num-integer",
"num-traits",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
"serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
-dependencies = [
- "ciborium-io",
- "half",
+ "time 0.1.45",
+ "wasm-bindgen",
+ "winapi",
]
[[package]]
@@ -179,32 +155,22 @@ version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
+ "atty",
"bitflags",
- "clap_lex 0.2.4",
+ "clap_derive",
+ "clap_lex",
"indexmap",
+ "once_cell",
+ "strsim",
+ "termcolor",
"textwrap",
]
-[[package]]
-name = "clap"
-version = "4.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex 0.3.2",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
[[package]]
name = "clap_derive"
-version = "4.1.8"
+version = "3.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
dependencies = [
"heck",
"proc-macro-error",
@@ -223,105 +189,65 @@ dependencies = [
]
[[package]]
-name = "clap_lex"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
+name = "cli"
+version = "0.1.0"
dependencies = [
- "os_str_bytes",
+ "anyhow",
+ "clap",
+ "filter",
+ "futures",
+ "icon",
+ "itertools",
+ "maple_core",
+ "matcher",
+ "num_cpus",
+ "pattern",
+ "printer",
+ "rayon",
+ "regex",
+ "serde_json",
+ "subprocess",
+ "tokio",
+ "tracing",
+ "tracing-appender",
+ "tracing-subscriber",
+ "types",
+ "utils",
+]
+
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
]
[[package]]
name = "console"
-version = "0.15.5"
+version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60"
+checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys",
]
[[package]]
-name = "countme"
-version = "3.0.1"
+name = "core-foundation-sys"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
-dependencies = [
- "anes",
- "atty",
- "cast",
- "ciborium",
- "clap 3.2.23",
- "criterion-plot",
- "itertools",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
-dependencies = [
- "cfg-if",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
[[package]]
name = "crossbeam-channel"
-version = "0.5.7"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -329,9 +255,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -340,74 +266,75 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.14"
+version = "0.9.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.8.0",
+ "memoffset",
"scopeguard",
]
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-utils"
-version = "0.8.15"
+version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
dependencies = [
"cfg-if",
]
[[package]]
-name = "crypto-common"
-version = "0.1.6"
+name = "cxx"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
dependencies = [
- "generic-array",
- "typenum",
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
]
[[package]]
-name = "dashmap"
-version = "5.4.0"
+name = "cxx-build"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
dependencies = [
- "cfg-if",
- "hashbrown",
- "lock_api",
+ "cc",
+ "codespan-reporting",
"once_cell",
- "parking_lot_core",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
]
[[package]]
-name = "digest"
-version = "0.10.6"
+name = "cxxbridge-flags"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
dependencies = [
- "block-buffer",
- "crypto-common",
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
-name = "dirs"
-version = "4.0.0"
+name = "directories"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
dependencies = [
"dirs-sys",
]
@@ -423,11 +350,19 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "dumb_analyzer"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "serde_json",
+]
+
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "encode_unicode"
@@ -437,9 +372,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
dependencies = [
"cfg-if",
]
@@ -454,87 +389,26 @@ dependencies = [
]
[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
+name = "extracted_fzy"
+version = "0.1.0"
[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+name = "filter"
+version = "0.1.0"
dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fern"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
-dependencies = [
- "futures-core",
- "futures-sink",
- "nanorand",
- "pin-project",
- "spin",
+ "anyhow",
+ "icon",
+ "matcher",
+ "parking_lot",
+ "pattern",
+ "printer",
+ "rayon",
+ "serde",
+ "serde_json",
+ "subprocess",
+ "tracing",
+ "types",
+ "utils",
]
[[package]]
@@ -553,25 +427,93 @@ dependencies = [
]
[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
+name = "futures"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
dependencies = [
- "libc",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+dependencies = [
+ "futures-core",
+ "futures-sink",
]
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
[[package]]
name = "futures-sink"
-version = "0.3.26"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+
+[[package]]
+name = "futures-task"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+
+[[package]]
+name = "futures-util"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
[[package]]
name = "fuzzy-matcher"
@@ -582,16 +524,6 @@ dependencies = [
"thread_local",
]
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
[[package]]
name = "getrandom"
version = "0.2.8"
@@ -599,10 +531,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
- "wasi",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "git2"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
+dependencies = [
+ "bitflags",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "url",
]
[[package]]
@@ -619,34 +562,74 @@ dependencies = [
]
[[package]]
-name = "half"
-version = "1.8.2"
+name = "grep-matcher"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "grep-regex"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "grep-matcher",
+ "log",
+ "regex",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "grep-searcher"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
+dependencies = [
+ "bstr",
+ "bytecount",
+ "encoding_rs",
+ "encoding_rs_io",
+ "grep-matcher",
+ "log",
+ "memmap2",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
-dependencies = [
- "hashbrown",
-]
[[package]]
name = "heck"
-version = "0.4.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
[[package]]
name = "hermit-abi"
@@ -667,29 +650,107 @@ dependencies = [
]
[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+name = "http"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
[[package]]
-name = "human_name"
-version = "2.0.1"
+name = "http-body"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42af7ece82db04720531abb16506781d40a72c8e62ecb0762d39746d2173255e"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
- "crossbeam-utils",
- "libc",
- "phf",
- "phf_codegen",
- "serde",
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "hyper"
+version = "0.14.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+dependencies = [
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
+[[package]]
+name = "icon"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "pattern",
"serde_json",
- "smallstr",
- "smallvec",
- "unicode-case-mapping",
- "unicode-normalization",
- "unicode-segmentation",
- "unidecode",
]
[[package]]
@@ -703,10 +764,21 @@ dependencies = [
]
[[package]]
-name = "indenter"
-version = "0.3.3"
+name = "ignore"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3"
+dependencies = [
+ "globset",
+ "lazy_static",
+ "log",
+ "memchr",
+ "regex",
+ "same-file",
+ "thread_local",
+ "walkdir",
+ "winapi-util",
+]
[[package]]
name = "indexmap"
@@ -719,83 +791,22 @@ dependencies = [
]
[[package]]
-name = "inotify"
-version = "0.9.6"
+name = "indicatif"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
-dependencies = [
- "bitflags",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "insta"
-version = "1.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099"
+checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
dependencies = [
"console",
- "globset",
"lazy_static",
- "linked-hash-map",
- "pest",
- "pest_derive",
- "serde",
- "similar",
- "walkdir",
- "yaml-rust",
+ "number_prefix",
+ "regex",
]
[[package]]
-name = "instant"
-version = "0.1.12"
+name = "ipnet"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
-dependencies = [
- "libc",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "is-terminal"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
-dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "isocountry"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea1dc4bf0fb4904ba83ffdb98af3d9c325274e92e6e295e4151e86c96363e04"
-dependencies = [
- "serde",
- "thiserror",
-]
+checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
[[package]]
name = "itertools"
@@ -808,45 +819,28 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.6"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
-name = "joinery"
-version = "2.1.0"
+name = "jobserver"
+version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "kqueue"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
-dependencies = [
- "bitflags",
- "libc",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -855,21 +849,42 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.140"
+version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
+name = "libgit2-sys"
+version = "0.14.2+1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "pkg-config",
+]
[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
+name = "libz-sys"
+version = "1.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "link-cplusplus"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+dependencies = [
+ "cc",
+]
[[package]]
name = "lock_api"
@@ -891,51 +906,64 @@ dependencies = [
]
[[package]]
-name = "logos"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1"
+name = "maple"
+version = "0.1.42"
dependencies = [
- "logos-derive",
+ "built",
+ "chrono",
+ "clap",
+ "cli",
+ "tokio",
+ "upgrade",
]
[[package]]
-name = "logos-derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c"
+name = "maple_core"
+version = "0.1.0"
dependencies = [
- "beef",
- "fnv",
- "proc-macro2",
- "quote",
- "regex-syntax",
- "syn",
-]
-
-[[package]]
-name = "lsp-server"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305"
-dependencies = [
- "crossbeam-channel",
- "log",
+ "anyhow",
+ "async-trait",
+ "base64",
+ "bytecount",
+ "chrono",
+ "directories",
+ "dumb_analyzer",
+ "filter",
+ "futures",
+ "grep-matcher",
+ "grep-searcher",
+ "icon",
+ "ignore",
+ "itertools",
+ "matcher",
+ "once_cell",
+ "parking_lot",
+ "pattern",
+ "printer",
+ "rayon",
+ "regex",
+ "rpc",
"serde",
"serde_json",
+ "subprocess",
+ "tokio",
+ "toml",
+ "tracing",
+ "types",
+ "utils",
]
[[package]]
-name = "lsp-types"
-version = "0.94.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
+name = "matcher"
+version = "0.1.0"
dependencies = [
- "bitflags",
- "serde",
- "serde_json",
- "serde_repr",
- "url",
+ "dumb_analyzer",
+ "extracted_fzy",
+ "fuzzy-matcher",
+ "grep-matcher",
+ "grep-regex",
+ "pattern",
+ "types",
]
[[package]]
@@ -945,69 +973,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "memmap2"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
dependencies = [
"autocfg",
]
[[package]]
-name = "memoffset"
-version = "0.8.0"
+name = "mime"
+version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
dependencies = [
"libc",
"log",
- "wasi",
- "windows-sys 0.45.0",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
]
[[package]]
-name = "nanorand"
-version = "0.7.0"
+name = "nu-ansi-term"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "notify"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9"
-dependencies = [
- "bitflags",
- "crossbeam-channel",
- "filetime",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "mio",
- "walkdir",
- "windows-sys 0.42.0",
+ "overload",
+ "winapi",
]
[[package]]
@@ -1040,16 +1048,16 @@ dependencies = [
]
[[package]]
-name = "once_cell"
-version = "1.17.1"
+name = "number_prefix"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
-name = "oorandom"
-version = "11.1.3"
+name = "once_cell"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "os_str_bytes"
@@ -1057,6 +1065,12 @@ version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
[[package]]
name = "parking_lot"
version = "0.12.1"
@@ -1069,15 +1083,23 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-sys 0.45.0",
+ "windows-sys",
+]
+
+[[package]]
+name = "pattern"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "regex",
]
[[package]]
@@ -1087,133 +1109,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
-name = "pest"
-version = "2.5.6"
+name = "pin-project-lite"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
[[package]]
-name = "pest_derive"
-version = "2.5.6"
+name = "pin-utils"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7"
-dependencies = [
- "pest",
- "pest_generator",
-]
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
-name = "pest_generator"
-version = "2.5.6"
+name = "pkg-config"
+version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
-name = "pest_meta"
-version = "2.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80"
+name = "printer"
+version = "0.1.0"
dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "plotters"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
-dependencies = [
- "plotters-backend",
+ "icon",
+ "pattern",
+ "serde",
+ "serde_json",
+ "types",
+ "unicode-width",
+ "utils",
]
[[package]]
@@ -1242,9 +1165,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
dependencies = [
"unicode-ident",
]
@@ -1258,26 +1181,11 @@ dependencies = [
"proc-macro2",
]
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-
[[package]]
name = "rayon"
-version = "1.7.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
dependencies = [
"either",
"rayon-core",
@@ -1285,9 +1193,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.11.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -1317,15 +1225,21 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.7.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+
[[package]]
name = "regex-syntax"
version = "0.6.28"
@@ -1333,79 +1247,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
-name = "rowan"
-version = "0.15.10"
+name = "reqwest"
+version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5811547e7ba31e903fe48c8ceab10d40d70a101f3d15523c847cce91aa71f332"
+checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
dependencies = [
- "countme",
- "hashbrown",
- "memoffset 0.6.5",
- "rustc-hash",
- "text-size",
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "winreg",
]
[[package]]
-name = "rustc-hash"
-version = "1.1.0"
+name = "ring"
+version = "0.16.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustix"
-version = "0.36.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
+ "cc",
"libc",
- "linux-raw-sys",
- "windows-sys 0.45.0",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
]
[[package]]
-name = "rustversion"
-version = "1.0.12"
+name = "rpc"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+dependencies = [
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+dependencies = [
+ "base64",
+]
[[package]]
name = "ryu"
-version = "1.0.13"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-
-[[package]]
-name = "salsa-2022"
-version = "0.1.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=ef7c0f12c8159e7025316e959c26f6278a576fa5#ef7c0f12c8159e7025316e959c26f6278a576fa5"
-dependencies = [
- "arc-swap",
- "crossbeam",
- "crossbeam-utils",
- "dashmap",
- "hashlink",
- "indexmap",
- "log",
- "parking_lot",
- "rustc-hash",
- "salsa-2022-macros",
- "smallvec",
-]
-
-[[package]]
-name = "salsa-2022-macros"
-version = "0.1.0"
-source = "git+https://github.com/salsa-rs/salsa?rev=ef7c0f12c8159e7025316e959c26f6278a576fa5#ef7c0f12c8159e7025316e959c26f6278a576fa5"
-dependencies = [
- "eyre",
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "same-file"
@@ -1423,19 +1353,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
-name = "serde"
-version = "1.0.154"
+name = "scratch"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.154"
+version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
@@ -1444,9 +1399,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.94"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
"itoa",
"ryu",
@@ -1454,56 +1409,48 @@ dependencies = [
]
[[package]]
-name = "serde_regex"
-version = "1.1.0"
+name = "serde_urlencoded"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
- "regex",
+ "form_urlencoded",
+ "itoa",
+ "ryu",
"serde",
]
[[package]]
-name = "serde_repr"
-version = "0.1.11"
+name = "sharded-slab"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "lazy_static",
]
[[package]]
-name = "sha2"
-version = "0.10.6"
+name = "signal-hook-registry"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
+ "libc",
]
[[package]]
-name = "similar"
-version = "2.2.1"
+name = "simdutf8"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
[[package]]
-name = "siphasher"
-version = "0.3.10"
+name = "slab"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
-[[package]]
-name = "smallstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b1aefdf380735ff8ded0b15f31aab05daf1f70216c01c02a12926badd1df9d"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
dependencies = [
- "smallvec",
+ "autocfg",
]
[[package]]
@@ -1513,22 +1460,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
-name = "smol_str"
-version = "0.1.24"
+name = "socket2"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
dependencies = [
- "serde",
+ "libc",
+ "winapi",
]
[[package]]
name = "spin"
-version = "0.9.5"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
-dependencies = [
- "lock_api",
-]
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "strsim"
@@ -1537,111 +1482,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+name = "subprocess"
+version = "0.2.10"
+source = "git+https://github.com/hniksic/rust-subprocess#5e89ac093f378bcfc03c69bdb1b4bcacf4313ce4"
dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
+ "libc",
+ "winapi",
]
[[package]]
name = "syn"
-version = "1.0.109"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
-[[package]]
-name = "tempfile"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
-dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall",
- "rustix",
- "windows-sys 0.42.0",
-]
-
[[package]]
name = "termcolor"
-version = "1.2.0"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
dependencies = [
"winapi-util",
]
-[[package]]
-name = "texlab"
-version = "5.4.1"
-dependencies = [
- "anyhow",
- "assert_unordered",
- "chrono",
- "clap 4.1.8",
- "criterion",
- "crossbeam-channel",
- "dashmap",
- "dirs",
- "encoding_rs",
- "encoding_rs_io",
- "fern",
- "flate2",
- "flume",
- "fuzzy-matcher",
- "human_name",
- "insta",
- "isocountry",
- "itertools",
- "log",
- "logos",
- "lsp-server",
- "lsp-types",
- "notify",
- "once_cell",
- "regex",
- "rowan",
- "rustc-hash",
- "salsa-2022",
- "serde",
- "serde_json",
- "serde_regex",
- "serde_repr",
- "smol_str",
- "strum",
- "tempfile",
- "thiserror",
- "threadpool",
- "titlecase",
- "unicode-normalization",
-]
-
-[[package]]
-name = "text-size"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
-
[[package]]
name = "textwrap"
version = "0.16.0"
@@ -1650,18 +1518,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.39"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.39"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
@@ -1670,31 +1538,49 @@ dependencies = [
[[package]]
name = "thread_local"
-version = "1.1.7"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
dependencies = [
- "cfg-if",
"once_cell",
]
[[package]]
-name = "threadpool"
-version = "1.8.1"
+name = "time"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
- "num_cpus",
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
]
[[package]]
-name = "tinytemplate"
-version = "1.2.1"
+name = "time"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
+ "itoa",
"serde",
- "serde_json",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
+[[package]]
+name = "time-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+dependencies = [
+ "time-core",
]
[[package]]
@@ -1708,50 +1594,174 @@ dependencies = [
[[package]]
name = "tinyvec_macros"
-version = "0.1.1"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
-name = "titlecase"
-version = "2.2.1"
+name = "tokio"
+version = "1.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042"
+checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
dependencies = [
- "joinery",
- "lazy_static",
- "regex",
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys",
]
[[package]]
-name = "typenum"
-version = "1.16.0"
+name = "tokio-macros"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
[[package]]
-name = "ucd-trie"
-version = "0.1.5"
+name = "tokio-rustls"
+version = "0.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+dependencies = [
+ "rustls",
+ "tokio",
+ "webpki",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-appender"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
+dependencies = [
+ "crossbeam-channel",
+ "time 0.3.17",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+dependencies = [
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "types"
+version = "0.1.0"
+dependencies = [
+ "icon",
+ "pattern",
+]
[[package]]
name = "unicode-bidi"
-version = "0.3.11"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c"
-
-[[package]]
-name = "unicode-case-mapping"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916a391c62ffbc5b6220fdafa353e93b530d21904d82ca1a2e29cdb5cfb4399f"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-normalization"
@@ -1763,16 +1773,27 @@ dependencies = [
]
[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
+name = "unicode-width"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
-name = "unidecode"
-version = "0.3.0"
+name = "untrusted"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402bb19d8e03f1d1a7450e2bd613980869438e0666331be3e073089124aa1adc"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "upgrade"
+version = "0.1.0"
+dependencies = [
+ "indicatif",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tokio",
+]
[[package]]
name = "url"
@@ -1783,9 +1804,30 @@ dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
- "serde",
]
+[[package]]
+name = "utils"
+version = "0.1.0"
+dependencies = [
+ "bytecount",
+ "memchr",
+ "simdutf8",
+ "types",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
[[package]]
name = "version_check"
version = "0.9.4"
@@ -1803,6 +1845,22 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log",
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -1811,9 +1869,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -1821,9 +1879,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
dependencies = [
"bumpalo",
"log",
@@ -1835,10 +1893,22 @@ dependencies = [
]
[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.84"
+name = "wasm-bindgen-futures"
+version = "0.4.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -1846,9 +1916,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [
"proc-macro2",
"quote",
@@ -1859,20 +1929,39 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
dependencies = [
"js-sys",
"wasm-bindgen",
]
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -1919,77 +2008,53 @@ dependencies = [
"windows_x86_64_msvc",
]
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
-name = "yaml-rust"
-version = "0.4.5"
+name = "winreg"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
- "linked-hash-map",
+ "winapi",
]
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
new file mode 100644
index 0000000000..51ec65134a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
@@ -0,0 +1,66 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libgit2
+, zlib
+, stdenv
+, darwin
+, vimUtils
+}:
+
+let
+ version = "0.42";
+
+ src = fetchFromGitHub {
+ owner = "liuchengxu";
+ repo = "vim-clap";
+ rev = "v${version}";
+ hash = "sha256-Vd0T8RrpJb2aybuxIY2PaLT7bDtbkZF/N9VgbcZfPIE=";
+ };
+
+ meta = with lib; {
+ description = "A modern performant fuzzy picker for Vim and NeoVim";
+ homepage = "https://github.com/liuchengxu/vim-clap";
+ changelog = "https://github.com/liuchengxu/vim-clap/blob/${src.rev}/CHANGELOG.md";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ];
+ };
+
+ maple = rustPlatform.buildRustPackage {
+ pname = "maple";
+ inherit version src meta;
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM=";
+ };
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ libgit2
+ zlib
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.CoreFoundation
+ darwin.apple_sdk.frameworks.Security
+ ];
+ };
+in
+
+vimUtils.buildVimPluginFrom2Nix {
+ pname = "vim-clap";
+ inherit version src meta;
+
+ postInstall = ''
+ ln -s ${maple}/bin/maple $out/bin/maple
+ '';
+
+ passthru = {
+ inherit maple;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 82d5760973..c930956424 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -77,6 +77,7 @@ https://github.com/jamespwilliams/bat.vim/,HEAD,
https://github.com/vim-scripts/bats.vim/,,
https://github.com/rbgrouleff/bclose.vim/,,
https://github.com/max397574/better-escape.nvim/,,
+https://github.com/LunarVim/bigfile.nvim/,,
https://github.com/sblumentritt/bitbake.vim/,,
https://github.com/APZelos/blamer.nvim/,HEAD,
https://github.com/blueballs-theme/blueballs-neovim/,,
@@ -237,6 +238,7 @@ https://github.com/Shougo/echodoc.vim/,,
https://github.com/sainnhe/edge/,,
https://github.com/editorconfig/editorconfig-vim/,,
https://github.com/gpanders/editorconfig.nvim/,,
+https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
https://github.com/elmcast/elm-vim/,,
https://github.com/dmix/elvish.vim/,,
https://github.com/mattn/emmet-vim/,,
@@ -246,7 +248,7 @@ https://github.com/fenetikm/falcon/,,
https://github.com/brooth/far.vim/,,
https://github.com/konfekt/fastfold/,,
https://github.com/lilydjwg/fcitx.vim/,fcitx5,
-https://github.com/feline-nvim/feline.nvim/,,
+https://github.com/freddiehaddad/feline.nvim/,,
https://github.com/bakpakin/fennel.vim/,,
https://github.com/lambdalisue/fern.vim/,,
https://github.com/wincent/ferret/,,
@@ -566,6 +568,7 @@ https://github.com/dstein64/nvim-scrollview/,,
https://github.com/dcampos/nvim-snippy/,HEAD,
https://github.com/ishan9299/nvim-solarized-lua/,,
https://github.com/nvim-pack/nvim-spectre/,,
+https://github.com/chrisgrieser/nvim-spider/,HEAD,
https://github.com/kylechui/nvim-surround/,main,
https://github.com/svermeulen/nvim-teal-maker/,HEAD,
https://github.com/norcalli/nvim-terminal.lua/,,
@@ -616,6 +619,7 @@ https://github.com/motus/pig.vim/,,
https://github.com/aklt/plantuml-syntax/,,
https://github.com/nvim-treesitter/playground/,,
https://github.com/nvim-lua/plenary.nvim/,,
+https://github.com/olivercederborg/poimandres.nvim/,HEAD,
https://github.com/dleonard0/pony-vim-syntax/,,
https://github.com/RishabhRD/popfix/,,
https://github.com/nvim-lua/popup.nvim/,,
@@ -676,6 +680,7 @@ https://github.com/camspiers/snap/,,
https://github.com/norcalli/snippets.nvim/,,
https://github.com/shaunsingh/solarized.nvim/,HEAD,
https://github.com/sainnhe/sonokai/,,
+https://github.com/sQVe/sort.nvim/,HEAD,
https://github.com/chikatoike/sourcemap.vim/,,
https://github.com/liuchengxu/space-vim/,,
https://github.com/ctjhoa/spacevim/,,
@@ -693,6 +698,7 @@ https://github.com/cshuaimin/ssr.nvim/,HEAD,
https://github.com/luukvbaal/stabilize.nvim/,,
https://github.com/eigenfoo/stan-vim/,,
https://github.com/darfink/starsearch.vim/,,
+https://github.com/luukvbaal/statuscol.nvim/,,
https://github.com/teto/stylish.nvim/,HEAD,
https://github.com/kvrohit/substrata.nvim/,HEAD,
https://github.com/lambdalisue/suda.vim/,,
@@ -834,6 +840,7 @@ https://github.com/benizi/vim-automkdir/,,
https://github.com/gioele/vim-autoswap/,,
https://github.com/bazelbuild/vim-bazel/,,
https://github.com/moll/vim-bbye/,,
+https://github.com/ThePrimeagen/vim-be-good/,HEAD,
https://github.com/nathangrigg/vim-beancount/,,
https://github.com/sheoak/vim-bepoptimist/,HEAD,
https://github.com/ntpeters/vim-better-whitespace/,,
@@ -850,7 +857,6 @@ https://github.com/kristijanhusak/vim-carbon-now-sh/,,
https://github.com/m-pilia/vim-ccls/,,
https://github.com/t9md/vim-choosewin/,,
https://github.com/rhysd/vim-clang-format/,,
-https://github.com/liuchengxu/vim-clap/,,
https://github.com/guns/vim-clojure-highlight/,,
https://github.com/guns/vim-clojure-static/,,
https://github.com/rstacruz/vim-closer/,,
@@ -1105,6 +1111,7 @@ https://github.com/justinmk/vim-sneak/,,
https://github.com/garbas/vim-snipmate/,,
https://github.com/honza/vim-snippets/,,
https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
+https://github.com/lifepillar/vim-solarized8/,HEAD,
https://github.com/tomlion/vim-solidity/,,
https://github.com/christoomey/vim-sort-motion/,,
https://github.com/tpope/vim-speeddating/,,
@@ -1195,6 +1202,7 @@ https://github.com/navicore/vissort.vim/,,
https://github.com/liuchengxu/vista.vim/,,
https://github.com/dylanaraps/wal.vim/,,
https://github.com/mattn/webapi-vim/,,
+https://github.com/DingDean/wgsl.vim/,HEAD,
https://github.com/folke/which-key.nvim/,,
https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
https://github.com/gelguy/wilder.nvim/,,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix
new file mode 100644
index 0000000000..077b522b59
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix
@@ -0,0 +1,36 @@
+{ graphviz
+, jre
+, lib
+, makeWrapper
+, vscode-utils
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension rec {
+ mktplcRef = {
+ name = "context-mapper-vscode-extension";
+ publisher = "contextmapper";
+ version = "6.7.0";
+ sha256 = "sha256-vlDVqn1Je0eo5Nf2gyotSvhIa07tWCINe79RZSyMzcA=";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ buildInputs = [
+ graphviz
+ ];
+
+ postInstall = ''
+ wrapProgram $out/share/vscode/extensions/contextmapper.context-mapper-vscode-extension/lsp/bin/context-mapper-lsp \
+ --set JAVA_HOME "${jre}"
+ '';
+
+ meta = {
+ description = "A VSCode extension for Context Mapper";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=${mktplcRef.publisher}.${mktplcRef.name}";
+ homepage = "https://github.com/ContextMapper/vscode-extension";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.rhoriguchi ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
index 70f1de32f9..776b1b03ef 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
@@ -19,6 +19,9 @@
, alejandra
, millet
, shfmt
+, autoPatchelfHook
+, zlib
+, stdenv
}:
let
@@ -608,8 +611,8 @@ let
mktplcRef = {
name = "chatgpt-reborn";
publisher = "chris-hayes";
- version = "3.11.2";
- sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo=";
+ version = "3.16.1";
+ sha256 = "sha256-RVPA+O0QOtFArWzcuwXMZSpwB3zrPAzVCbEjOzUNH4I=";
};
};
@@ -669,6 +672,8 @@ let
};
};
+ contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { };
+
coolbear.systemd-unit-file = buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "coolbear";
@@ -802,8 +807,8 @@ let
mktplcRef = {
name = "composer-php-vscode";
publisher = "devsense";
- version = "1.33.12924";
- sha256 = "sha256-9Uz8B4qQ57gfETitzRAVEq/Ou/s3jOF/p2EyEDo1jP8=";
+ version = "1.33.13032";
+ sha256 = "sha256-4SL7hPcnxN6Bq0Cclaszk2zlYF1xR2w/8zaJo16OT+U=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";
@@ -816,12 +821,44 @@ let
};
devsense.phptools-vscode = buildVscodeMarketplaceExtension {
- mktplcRef = {
+ mktplcRef = let
+ sources = {
+ "x86_64-linux" = {
+ arch = "linux-x64";
+ sha256 = "sha256-ccMkaXppkgdsN2XtSFaw85xLUCFMDF1z+XidP0KAHCA=";
+ };
+ "x86_64-darwin" = {
+ arch = "darwin-x64";
+ sha256 = "17lsf736jagw2q6dwxvpj2dspiqrlyvmmhv6p6cf81vxijpgmq9d";
+ };
+ "aarch64-linux" = {
+ arch = "linux-arm64";
+ sha256 = "1cnfzzpikcsp1l1a8amim0fz5r1pkszn231cfl745ggiksbjyhsp";
+ };
+ "aarch64-darwin" = {
+ arch = "darwin-arm64";
+ sha256 = "0jli6l9qrssnpm5a3m1g7g1dw2i5bv9wxd0gqg6vda7dwfs2f494";
+ };
+ };
+ in {
name = "phptools-vscode";
publisher = "devsense";
- version = "1.33.12924";
- sha256 = "sha256-ImaGkIe+MTO/utfVh3Giu0+jTSN0mmhgg6LvOod1suE=";
- };
+ version = "1.33.13032";
+ } // sources.${stdenv.system};
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ zlib
+ stdenv.cc.cc.lib
+ ];
+
+ postInstall = ''
+ chmod +x $out/share/vscode/extensions/devsense.phptools-vscode/out/server/devsense.php.ls
+ '';
+
meta = {
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.phptools-vscode/changelog";
description = "A visual studio code extension for full development integration for the PHP language.";
@@ -829,6 +866,7 @@ let
homepage = "https://github.com/DEVSENSE/phptools-docs";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.drupol ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
};
};
@@ -836,8 +874,8 @@ let
mktplcRef = {
name = "profiler-php-vscode";
publisher = "devsense";
- version = "1.33.12924";
- sha256 = "sha256-6+spMS+oypq8KFW5vsoy0Cmn7RD5L1JQnHSyJAvYhTk=";
+ version = "1.33.13032";
+ sha256 = "sha256-P0lzZkCHtLHJI/gwB+wbrZPR3OOia5VxTMCC2ZQULBg=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";
@@ -1077,8 +1115,8 @@ let
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
- version = "9.10.4";
- sha256 = "sha256-khtyB0Qbm+iuM1GsAaF32YRv1VBTIy7daeCKdgwCIC8=";
+ version = "9.12.0";
+ sha256 = "sha256-b7EaYYJNZQBqhyKJ04tytmD9DDRcvA68HTo5JHTr9Fo=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
@@ -1276,8 +1314,8 @@ let
mktplcRef = {
name = "chatgpt-vscode";
publisher = "genieai";
- version = "0.0.3";
- sha256 = "sha256-eSRZ9AdXGqGLQw/jt8JCAsTmkvP0N1g5tFP7s1rBtjM=";
+ version = "0.0.7";
+ sha256 = "sha256-dWp9OYj9OCsNdZiYbgAWWo/OXMjBSlB7sIupdqnQTiU=";
};
};
@@ -1311,8 +1349,8 @@ let
mktplcRef = {
name = "github-vscode-theme";
publisher = "github";
- version = "6.3.3";
- sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk=";
+ version = "6.3.4";
+ sha256 = "sha256-JbI0B7jxt/2pNg/hMjAE5pBBa3LbUdi+GF0iEZUDUDM=";
};
meta = {
description = "GitHub theme for VS Code";
@@ -1328,8 +1366,8 @@ let
mktplcRef = {
name = "vscode-github-actions";
publisher = "github";
- version = "0.25.3";
- sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI=";
+ version = "0.25.6";
+ sha256 = "sha256-HRj/AQI9E6HDkZ2ok/h/+c9HHq1wVXQPAt5mb/Ij+BI=";
};
meta = {
description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
@@ -1657,8 +1695,8 @@ let
mktplcRef = {
name = "magit";
publisher = "kahole";
- version = "0.6.39";
- sha256 = "sha256-B9+McdoC7FkfD4yGDIRUtoF0c7cCUfAeIK1r0/zLVVI=";
+ version = "0.6.40";
+ sha256 = "sha256-AwkjfKBlAl6hTRN1nE6UuUuDXMJUXXDK2+3YzUp9drc=";
};
meta = {
license = lib.licenses.mit;
@@ -1942,8 +1980,8 @@ let
mktplcRef = {
name = "direnv";
publisher = "mkhl";
- version = "0.10.1";
- sha256 = "0m89sx1qqdkwa9pfmd9b11lp8z0dqpi6jn27js5q4ymscyg41bqd";
+ version = "0.12.0";
+ sha256 = "sha256-UMGTWAiPAxSjy5ALUkijD0GE9TW37TZ3UvMmgFBNYsU=";
};
meta = {
description = "direnv support for Visual Studio Code";
@@ -2232,8 +2270,8 @@ let
mktplcRef = {
name = "typst-lsp";
publisher = "nvarner";
- version = "0.3.0";
- sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8=";
+ version = "0.4.1";
+ sha256 = "sha256-NZejUb99JDcnqjihLTPkNzVCgpqDkbiwAySbBVZ0esY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
@@ -2714,8 +2752,8 @@ let
mktplcRef = {
name = "code-spell-checker";
publisher = "streetsidesoftware";
- version = "2.20.3";
- sha256 = "sha256-28ybNBobXoq194d9VGD9kOq/OWscJkSlgSZ7ViaNQtw=";
+ version = "2.20.4";
+ sha256 = "sha256-GOXKXZPEynyqRUUY0pdNwt+141kJleg74IbCP4/34R8=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
@@ -3286,6 +3324,9 @@ let
};
aliases = super: {
+ _1Password = super."1Password";
+ _2gua = super."2gua";
+ _4ops = super."4ops";
Arjun.swagger-viewer = super.arjun.swagger-viewer;
jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls;
jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components;
@@ -3294,9 +3335,6 @@ let
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"'';
};
# TODO: add overrides overlay, so that we can have a generated.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 5289a3cb41..a170385f9a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
@@ -5,12 +5,12 @@
, icu
, stdenv
, openssl
+, coreutils
}:
let
inherit (stdenv.hostPlatform) system;
- version = "1.25.0";
-
+ version = "1.25.4";
vsixInfo =
let
@@ -27,7 +27,7 @@ let
".debugger/arm64/vsdbg"
];
omniSharpBins = [
- ".omnisharp/1.39.0-net6.0/OmniSharp"
+ ".omnisharp/1.39.4-net6.0/OmniSharp"
];
razorBins = [
".razor/createdump"
@@ -37,22 +37,22 @@ let
{
x86_64-linux = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix";
- sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl";
+ sha256 = "08k0wxyj8wz8npw1yqrkdpbvwbnrdnsngdkrd2p5ayn3v608ifc2";
binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
};
aarch64-linux = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix";
- sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd";
- binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server
+ sha256 = "09r2d463dk35905f2c3msqzxa7ylcf0ynhbp3n6d12y3x1200pr2";
+ binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins;
};
x86_64-darwin = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix";
- sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8";
+ sha256 = "0mp550kq33zwmlvrhymwnixl4has62imw3ia5z7a01q7mp0w9wpn";
binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
};
aarch64-darwin = {
url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix";
- sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634";
+ sha256 = "08406xz2raal8f10bmnkz1mwdfprsbkjxzc01v0i4sax1hr2a2yl";
binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins;
};
}.${system} or (throw "Unsupported system: ${system}");
@@ -89,6 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
-E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \
"$PWD/dist/extension.js"
+ # Fix reference to uname
+ sed -i \
+ -E -e 's_uname -m_${coreutils}/bin/uname -m_g' \
+ "$PWD/dist/extension.js"
+
patchelf_add_icu_as_needed() {
declare elf="''${1?}"
declare icu_major_v="${
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
index d0d1b990f4..dadb291aa5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
@@ -29,7 +29,7 @@ let
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
};
- build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps";
+ build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";
# FIXME: Making a new derivation to link `node_modules` and run `npm run package`
# will cause a build failure.
vsix = build-deps.override {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
index 08f947ea46..b795f708f1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
index c2036566b3..bd9b7b4681 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
, atomEnv, at-spi2-atk, autoPatchelfHook
-, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland
+, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland
# Populate passthru.tests
, tests
@@ -150,9 +150,9 @@ let
# in order to create or update extensions.
# See: #83288 #91179 #73810 #41189
#
- # buildFHSUserEnv allows for users to use the existing vscode
+ # buildFHSEnv allows for users to use the existing vscode
# extension tooling without significant pain.
- fhs = { additionalPkgs ? pkgs: [] }: buildFHSUserEnvBubblewrap {
+ fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnv {
# also determines the name of the wrapped command
name = executableName;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index 1af8429f20..872bc81d5d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0znr64f0rs513vkj7f3by2dzllxk3msic5sajc5scv9cwy3j6xld";
- x86_64-darwin = "0qqqbmmhr1r7rxij6cc4d7shyjvm3ni4cwv0xy3qikfr7v9w948a";
- aarch64-linux = "0qjrz73q0ilshhqcgk6lxzkpd617p5153nrba9islxrashsqb9bj";
- aarch64-darwin = "0cdrkn756817whr476inn5j9myhbz6dq11bli0byn829g2jh8s4h";
- armv7l-linux = "1dqw1ha69zsdhvf2n2ps0mvqbamqs90wnc6z02pzs3jz9cxxl15j";
+ x86_64-linux = "0sf8kkhvz73b8q7dxy53vikgpksgdffzj9qbkd9mbx6qjv0k60yw";
+ x86_64-darwin = "1223c05vinlkm6y7f9k31wlsncg3c0yz8j8ja5xilgjgq8ynr1kw";
+ aarch64-linux = "013bhl630zvdxwxgjs7rzd3a254jx4axp2mavar06fwgysz83q3y";
+ aarch64-darwin = "0hqjcrdy7x8pc6zvzx7rv8dp39dwpmmkri36jwxaq86zhqhf650c";
+ armv7l-linux = "1vb068c2aqjihdhsrd42vy60aw4ffrqbmisajm3yz84b2hcfmjy2";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.77.1";
+ version = "1.77.3";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
index 5d479cba90..6e9cefae79 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0i73nkcja70k64ndwsajy69pb1x2cy71n6i42cmk5qh5mw56brxp";
- x86_64-darwin = "08vx79aq4s6xsmvg6dv3klbg2yq1k1l6m3nq90kpng7j8anjh954";
- aarch64-linux = "1bcn40j83pmssdzw0990fsm3hp8fbx9xblyc6zmf53f0yz41528p";
- aarch64-darwin = "0w3gyrp01qflk6gcqzy54nd7wgmrlpsdpin0gfyk4fg46fss9b78";
- armv7l-linux = "1bm26cgx2038alzxpcib8r4hd40zbr27kaixrrzamsn6wslg9p1f";
+ x86_64-linux = "049vn3gwwl0sxf8hvd8raaamy9f0x2z9p3sz8xzafa1h129iiybr";
+ x86_64-darwin = "1gbpbi3b0ag6v9znm02amvp35j05kpxs2mfsdq6dwmvg3hxmff2f";
+ aarch64-linux = "14pvsrpl7rsjvni7n2ch7wmvgpj9n8mwla7s7mlmi7wv46ykpk2a";
+ aarch64-darwin = "1x5bw928yp4fb57bc3qff46w7020zlyp1mfpm7vakjfaqnfwzzzn";
+ armv7l-linux = "0xliai5c3dd6qbgb9agvmn18n230zh4qxx3jjmaqn2851d6sx5xz";
}.${system} or throwSystem;
sourceRoot = if stdenv.isDarwin then "" else ".";
@@ -29,7 +29,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.77.1.23095";
+ version = "1.77.3.23102";
pname = "vscodium";
executableName = "codium";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/atari++/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/atari++/default.nix
index 5e35dcaebd..f78bf7e4cf 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/atari++/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/atari++/default.nix
@@ -1,32 +1,49 @@
-{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsa-lib, gcc-unwrapped, libXext }:
+{ lib
+, stdenv
+, fetchurl
+, SDL
+, alsa-lib
+, gcc-unwrapped
+, libICE
+, libSM
+, libX11
+, libXext
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "atari++";
- version = "1.83";
+ version = "1.85";
src = fetchurl {
- url = "http://www.xl-project.com/download/${pname}_${version}.tar.gz";
- sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47";
+ url = "http://www.xl-project.com/download/atari++_${finalAttrs.version}.tar.gz";
+ hash = "sha256-LbGTVUs1XXR+QfDhCxX9UMkQ3bnk4z0ckl94Cwwe9IQ=";
};
- buildInputs = [ libSM libX11 SDL libICE alsa-lib gcc-unwrapped libXext ];
+ buildInputs = [
+ SDL
+ alsa-lib
+ gcc-unwrapped
+ libICE
+ libSM
+ libX11
+ libXext
+ ];
postFixup = ''
- patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++"
+ patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs} "$out/bin/atari++"
'';
meta = with lib; {
homepage = "http://www.xl-project.com/";
description = "An enhanced, cycle-accurated Atari emulator";
longDescription = ''
- The Atari++ Emulator is a Unix based emulator of the Atari eight
- bit computers, namely the Atari 400 and 800, the Atari 400XL,
- 800XL and 130XE, and the Atari 5200 game console. The emulator
- is auto-configurable and will compile on a variety of systems
- (Linux, Solaris, Irix).
+ The Atari++ Emulator is a Unix based emulator of the Atari eight bit
+ computers, namely the Atari 400 and 800, the Atari 400XL, 800XL and 130XE,
+ and the Atari 5200 game console. The emulator is auto-configurable and
+ will compile on a variety of systems (Linux, Solaris, Irix).
'';
maintainers = [ maintainers.AndersonTorres ];
license = licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
index 45257fbf75..45b4736b3d 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
- version = "2.0-28";
+ version = "2.0-36";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
- hash = "sha256-qKrj3XPtFVy0/KH18D0oCeVUQQmIdkYJYrCKD82c/+s=";
+ hash = "sha256-RO8c9gLK00LLwDzcD8UOS3kh3kwTwFyrpuRlIXcInPo=";
};
patches = [
@@ -86,9 +86,12 @@ stdenv.mkDerivation rec {
"-DPORTABLE=OFF"
];
- preConfigure = ''
+ preConfigure = with lib; let
+ tag = last (splitString "-" version);
+ in ''
rm -rf dependencies/imgui
ln -s ${imgui}/include/imgui dependencies/imgui
+ sed 's/\(EMULATOR_VERSION_SUFFIX\).*experimental.*/\1 "-${tag} (experimental)"/' -i src/Common/version.h
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix
index ddf4554733..bd7c84402c 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/cen64/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cen64";
- version = "unstable-2021-03-12";
+ version = "unstable-2022-10-02";
src = fetchFromGitHub {
owner = "n64dev";
repo = "cen64";
- rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8";
- sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z";
+ rev = "ee6db7d803a77b474e73992fdc25d76b9723d806";
+ sha256 = "sha256-/CraSu/leNA0dl8NVgFjvKdOWrC9/namAz5NSxtPr+I=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix
index 13eec39fef..825340beee 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -46,6 +46,7 @@
# Darwin-only dependencies
, CoreBluetooth
, ForceFeedback
+, IOBluetooth
, IOKit
, moltenvk
, OpenGL
@@ -106,6 +107,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
CoreBluetooth
ForceFeedback
+ IOBluetooth
IOKit
moltenvk
OpenGL
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix
index 62331bd621..fca2cf4210 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/dosbox-staging/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, SDL2
, SDL2_image
, SDL2_net
@@ -28,17 +29,36 @@
, speexdsp
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "dosbox-staging";
version = "0.80.1";
src = fetchFromGitHub {
owner = "dosbox-staging";
repo = "dosbox-staging";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc=";
};
+ patches = [
+ # Pull missind SDL2_net dependency:
+ # https://github.com/dosbox-staging/dosbox-staging/pull/2358
+ (fetchpatch {
+ name = "sdl2-net.patch";
+ url = "https://github.com/dosbox-staging/dosbox-staging/commit/1b02f187a39263f4b0285323dcfe184bccd749c2.patch";
+ hash = "sha256-Ev97xApInu6r5wvI9Q7FhkSXqtMW/rwJj48fExvqnT0=";
+ })
+
+ # Pull missing SDL2_image dependency:
+ # https://github.com/dosbox-staging/dosbox-staging/pull/2239
+ (fetchpatch {
+ name = "sdl2-image.patch";
+ url = "https://github.com/dosbox-staging/dosbox-staging/commit/ca8b7a906d29a3f8ce956c4af7dc829a6ac3e229.patch";
+ hash = "sha256-WtTVSWWSlfXrdPVsnlDe4P5K/Fnj4QsOzx3Wo/Kusmg=";
+ includes = [ "src/gui/meson.build" ];
+ })
+ ];
+
nativeBuildInputs = [
copyDesktopItems
gtest
@@ -69,11 +89,6 @@ stdenv.mkDerivation (self: {
speexdsp
];
- env.NIX_CFLAGS_COMPILE = toString [
- "-I${SDL2_image}/include/SDL2"
- "-I${SDL2_net}/include/SDL2"
- ];
-
desktopItems = [
(makeDesktopItem {
name = "dosbox-staging";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix
index 0f48dd71e6..ed2d50138b 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation {
pname = "duckstation";
- version = "unstable-2023-01-01";
+ version = "unstable-2023-04-14";
src = fetchFromGitHub {
owner = "stenzek";
repo = "duckstation";
- rev = "06d6447e59f208f21ba42f4df1665b789db13fb7";
- sha256 = "sha256-DyuQ7J7MVSQHpvPZhMtwqNM8ifjI8UFYQ9SxY5kikBI=";
+ rev = "5fee6f5abee7f3aad65da5523e57896e10e2a53a";
+ sha256 = "sha256-sRs/b4GVXhF3zrOef8DSBKJJGYECUER/nNWZAqv7suA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix
index 29b64ebb6b..afa361903f 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix
@@ -29,7 +29,7 @@ let
in
# Only SDL frontend needs to specify whether to use Wayland
assert forceWayland -> !enableQt;
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "ppsspp"
+ lib.optionalString enableQt "-qt"
+ lib.optionalString (!enableQt) "-sdl"
@@ -39,13 +39,13 @@ stdenv.mkDerivation (self: {
src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
fetchSubmodules = true;
sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc=";
};
postPatch = ''
- substituteInPlace git-version.cmake --replace unknown ${self.src.rev}
+ substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev}
substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
'';
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix
index 9befb172fe..9fad372520 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix
@@ -7,13 +7,13 @@
let
inherit (qt5) qtbase qtmultimedia wrapQtAppsHook;
in
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "rpcemu";
version = "0.9.4";
src = fetchhg {
url = "http://www.home.marutan.net/hg/rpcemu";
- rev = "release_${self.version}";
+ rev = "release_${finalAttrs.version}";
sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
index c9e6833e6a..61318b300b 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix
@@ -29,13 +29,13 @@
buildDotnetModule rec {
pname = "ryujinx";
- version = "1.1.700"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+ version = "1.1.733"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
- rev = "a1efd87c45027a347e91fd22d42f33c3eed89030";
- sha256 = "0ng8ph2sdlcrsy4nlyjhff2n0c76nzkakpnks7qrv6ljr911yck1";
+ rev = "9f12e50a546b15533778ed0d8290202af91c10a2";
+ sha256 = "1d1hg2sv0h56a56xnarcfp73df3rbw3iax85g258l6w2kxhkc42a";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix
index d22bef7073..2eff905dea 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/deps.nix
@@ -20,7 +20,7 @@
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
- (fetchNuGet { pname = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; })
+ (fetchNuGet { pname = "DynamicData"; version = "7.13.5"; sha256 = "088ry176ba314m4hc1vbcxisflqzs7p7vvn8vqzxy3kj1rimgfmf"; })
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; })
@@ -50,10 +50,10 @@
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.28.1"; sha256 = "1smsbv400nk4b6x1y9gsk60rlfjmrdvni26d1jnqsxpm1250zdvf"; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.29.0"; sha256 = "06sdjg78764ycaq3bd32daacd9pjsvkihdzrw8d1cnmk3c42kvq3"; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.29.0"; sha256 = "0iydfzz4vzzpx24q8mgvc3n289s00inc19x6a0w2v378mx4jkfl0"; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.29.0"; sha256 = "04vj5h638ljz2fylr2idgjbfq5lzbw79m5ixcj1ikl4ydl9jhp9p"; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.29.0"; sha256 = "05crx7w79m3jxlbnfc2c8i63m5z6h28y04qv6sc84312rzi2yw8c"; })
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
@@ -177,7 +177,7 @@
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
- (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.28.1"; sha256 = "0pn9bk0n15136z434x7yxikda5ggwjwka2c7k0qkprnkmk3yifcl"; })
+ (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.29.0"; sha256 = "09bpj7gginq25fiyq3za5i8wm482qbnx6qhm4dxb95jrl3mmb126"; })
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })
@@ -189,7 +189,7 @@
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
- (fetchNuGet { pname = "System.Management"; version = "7.0.0"; sha256 = "1x3xwjzkmlcrj6rl6f2y8lkkp1s8xkhwqlpqk9ylpwqz7w3mhis0"; })
+ (fetchNuGet { pname = "System.Management"; version = "7.0.1"; sha256 = "02sca1yg3inkqsh1lsjrv5hn10ijp2rsbgh0k5cvnf5k54d422vj"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
index 099fc5acca..50f2b57f88 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/xemu/default.nix
@@ -25,14 +25,14 @@
, wrapGAppsHook
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "xemu";
version = "0.7.85";
src = fetchFromGitHub {
owner = "xemu-project";
repo = "xemu";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
hash = "sha256-sVUkB2KegdKlHlqMvSwB1nLdJGun2x2x9HxtNHnpp1s=";
fetchSubmodules = true;
};
@@ -94,7 +94,7 @@ stdenv.mkDerivation (self: {
# to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar)
branch = "master";
commit = "d8fa50e524c22f85ecb2e43108fd6a5501744351";
- inherit (self) version;
+ inherit (finalAttrs) version;
in ''
patchShebangs .
configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls")
@@ -133,7 +133,7 @@ stdenv.mkDerivation (self: {
Xbox game console, enabling people to play their original Xbox games on
Windows, macOS, and Linux systems.
'';
- changelog = "https://github.com/xemu-project/xemu/releases/tag/v${self.version}";
+ changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ];
platforms = with lib.platforms; linux;
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix
index 2ea3583edd..136e6ce4eb 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/yapesdl/default.nix
@@ -5,14 +5,14 @@
, SDL2
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "yapesdl";
version = "0.71.2";
src = fetchFromGitHub {
owner = "calmopyrin";
repo = "yapesdl";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock
index b5dff0ece8..ee1a105fae 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/Cargo.lock
@@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "felix"
-version = "2.2.5"
+version = "2.2.6"
dependencies = [
"chrono",
"content_inspector",
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
index 07ea745aba..6dbffd06be 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix
@@ -9,13 +9,13 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
- version = "2.2.5";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg=";
+ sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM=";
};
cargoLock = {
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
index befbffb46e..27fbcfa4f0 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix
@@ -21,13 +21,13 @@ assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation (finalAttrs: {
pname = "nnn";
- version = "4.7";
+ version = "4.8";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${finalAttrs.version}";
- hash = "sha256-ttG0aEqMlNyJaMhcVfrxbxlrhr1GSydrV58CYSq4CTM=";
+ hash = "sha256-QbKW2wjhUNej3zoX18LdeUHqjNLYhEKyvPH2MXzp/iQ=";
};
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix
index 8357076b31..3848487cbd 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "worker";
- version = "4.11.0";
+ version = "4.12.1";
src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
- sha256 = "sha256-lpR9eHiKOkQ6/rHTJLFUDrMHdSx4rZgppc36CyZlSXg=";
+ sha256 = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs=";
};
buildInputs = [ libX11 ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
similarity index 62%
rename from third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix
rename to third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
index 0b1aa7eb91..6fd3565bfa 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
@@ -2,23 +2,28 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
- version = "0.20.2";
+ version = "0.21.1";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8=";
+ sha256 = "sha256-WUv0F7etmJFNRnHXkQ5G3p/5BWL30kfSYnxXYpAdo+I=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
- cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU=";
+ cargoSha256 = "sha256-0JJpGSOwayPB3cn7OpBjsOiK4WQNbil3gYrfkqG2cS8=";
+
+ checkFlags = [
+ # failure: path::tests::test_relative_to_parent
+ "--skip=path::tests::test_relative_to_parent"
+ ];
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";
homepage = "https://xplr.dev";
license = licenses.mit;
- maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ];
+ maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
index d535625c71..2bdd5b75dd 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix
@@ -31,11 +31,11 @@
mkDerivation rec {
pname = "saga";
- version = "8.5.1";
+ version = "9.0.1";
src = fetchurl {
url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
- sha256 = "sha256-JnZ0m0GAgfz3BbiKxqLoMoa4pX//r5t+mbhMCdAo9OE=";
+ sha256 = "sha256-8S8Au+aLwl8X0GbqPPv2Q6EL98KSoT665aILc5vcbpA=";
};
sourceRoot = "saga-${version}/saga-gis";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
index 5df20c5cb9..7a7967d988 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix
@@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
- version = "7.1.1-6";
+ version = "7.1.1-8";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
- hash = "sha256-D1ZKTL3c+engyvBwCdjYqeoHx2v/6gwmK8UfaAxjnWI=";
+ hash = "sha256-2wAm2y8YQwhgsPNqxGGJ65emL/kMYoVvF2phZMXTpZc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
index 5747c88b24..f03489ef4e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "artem";
- version = "1.1.5";
+ version = "1.1.7";
src = fetchFromGitHub {
owner = "finefindus";
repo = pname;
rev = "v${version}";
- sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh";
+ sha256 = "sha256-wd8csdt7qOWFhUBRjqfJSEGnNDyHD7lJA8CtW+q4Kxg=";
};
- cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U=";
+ cargoSha256 = "sha256-zFXQUQVPqTur7m+aL0JhSiZI+EEFo9nCTVu1yAOgp/I=";
nativeBuildInputs = [ installShellFiles pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix
index 7e0787c4ff..2a0853fb22 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "brlcad";
- version = "7.34.0";
+ version = "7.34.2";
src = fetchFromGitHub {
owner = "BRL-CAD";
repo = pname;
rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}";
- hash = "sha256-Re5gEXlqdPxniaEP13Q0v0O9rt40V5NrxoUpcNBwn7s=";
+ hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
index 9f68964f42..263bfe490b 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/digikam/default.nix
@@ -56,11 +56,11 @@
mkDerivation rec {
pname = "digikam";
- version = "7.9.0";
+ version = "7.10.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
- sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ=";
+ sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE=";
};
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
index 872bae0b3c..28ce1cbc3d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "21.1.2";
+ version = "21.2.1";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
- sha256 = "sha256-cyw8wfwaFbDxPJn3eqiuQyQebTf7x1wMH9c0zKIGq4c=";
+ sha256 = "sha256-269kMXKGlGig4Dt7cvCTRDGFsBZE5RBoi1ajqT3rIVc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix
index 76409860ff..ea07e23142 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix
@@ -103,6 +103,7 @@ in mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.unix;
+ broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock
index b6150241c2..a4b83feabc 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/graphics/emblem/Cargo.lock
@@ -21,10 +21,50 @@ dependencies = [
]
[[package]]
-name = "anyhow"
-version = "1.0.66"
+name = "anstream"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-wincon",
+ "concolor-override",
+ "concolor-query",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "approx"
@@ -66,15 +106,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[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 = "bytemuck"
-version = "1.12.3"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
@@ -84,9 +124,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "cairo-rs"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "247e1183fa769ac22121f92276dae52f89acaf297f24b1320019f439b6e3b46f"
+checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -98,9 +138,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
+checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e"
dependencies = [
"glib-sys",
"libc",
@@ -115,15 +155,15 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.77"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"
dependencies = [
"smallvec",
]
@@ -136,64 +176,67 @@ 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",
- "js-sys",
"num-integer",
"num-traits",
- "time",
- "wasm-bindgen",
"winapi",
]
[[package]]
name = "clap"
-version = "4.0.29"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
dependencies = [
- "bitflags",
+ "clap_builder",
"clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
"clap_lex",
- "is-terminal",
"once_cell",
"strsim",
- "termcolor",
]
[[package]]
name = "clap_complete"
-version = "4.0.6"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b3c9eae0de7bf8e3f904a5e40612b21fb2e2e566456d177809a48b892d24da"
+checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.0.21"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
dependencies = [
"heck",
- "proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "clap_lex"
-version = "0.3.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
[[package]]
name = "codespan-reporting"
@@ -205,6 +248,21 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "concolor-override"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+
+[[package]]
+name = "concolor-query"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+dependencies = [
+ "windows-sys",
+]
+
[[package]]
name = "convert_case"
version = "0.4.0"
@@ -213,15 +271,15 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -229,9 +287,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -240,41 +298,41 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset",
"scopeguard",
]
[[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",
]
[[package]]
name = "cssparser"
-version = "0.28.1"
+version = "0.29.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db8599a9761b371751fbf13e076fa03c6e1a78f8c5288e6ab9467f10a2322c1"
+checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
dependencies = [
"cssparser-macros",
"dtoa-short",
"itoa",
"matches",
- "phf 0.8.0",
+ "phf 0.10.1",
"proc-macro2",
"quote",
"smallvec",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -284,14 +342,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "cxx"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -301,9 +359,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -311,24 +369,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -346,8 +404,8 @@ dependencies = [
"convert_case",
"proc-macro2",
"quote",
- "rustc_version 0.4.0",
- "syn",
+ "rustc_version",
+ "syn 1.0.109",
]
[[package]]
@@ -367,16 +425,16 @@ dependencies = [
[[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 = "emblem"
-version = "1.1.0"
+version = "1.2.0"
dependencies = [
"anyhow",
- "futures",
+ "futures-channel",
"gettext-rs",
"gtk4",
"libadwaita",
@@ -385,72 +443,18 @@ dependencies = [
"once_cell",
"pretty_env_logger",
"regex",
+ "xml-rs",
]
[[package]]
-name = "encoding"
-version = "0.2.33"
+name = "encoding_rs"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
+ "cfg-if",
]
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -466,13 +470,13 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys",
]
[[package]]
@@ -487,12 +491,12 @@ dependencies = [
[[package]]
name = "field-offset"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
dependencies = [
- "memoffset 0.6.5",
- "rustc_version 0.3.3",
+ "memoffset",
+ "rustc_version",
]
[[package]]
@@ -523,42 +527,26 @@ dependencies = [
"new_debug_unreachable",
]
-[[package]]
-name = "futures"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
- "futures-sink",
]
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -567,46 +555,36 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
-[[package]]
-name = "futures-sink"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
-
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
- "futures-channel",
"futures-core",
- "futures-io",
"futures-macro",
- "futures-sink",
"futures-task",
- "memchr",
"pin-project-lite",
"pin-utils",
"slab",
@@ -623,22 +601,23 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.16.4"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3094f2b8578136d1929cade4e0fff82f573521b579e96cfc24af2458431f176"
+checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
"glib",
"libc",
+ "once_cell",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
+checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b"
dependencies = [
"gio-sys",
"glib-sys",
@@ -649,9 +628,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272db1bbb9b152ea1fea946f9d464085c86cfe14cafba450d7defa433caff8ec"
+checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
dependencies = [
"bitflags",
"cairo-rs",
@@ -665,9 +644,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b571f36b889ab529b2e173248dafe83d75c703f5685b9845e490c7994ae309"
+checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -724,9 +703,9 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.16.6"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fac6c15256cdf84beb9a4948f786f9605799ad69675ea1b8932753f3aa94cf"
+checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125"
dependencies = [
"bitflags",
"futures-channel",
@@ -744,9 +723,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
+checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -757,9 +736,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.16.6"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89359c8c338310b46300502814fc5a0350bb731ddfea03d0ec725d32163244b7"
+checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773"
dependencies = [
"bitflags",
"futures-channel",
@@ -772,6 +751,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
+ "memchr",
"once_cell",
"smallvec",
"thiserror",
@@ -779,9 +759,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.16.3"
+version = "0.17.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf"
+checksum = "32e73a9790e243f6d55d8e302426419f6084a1de7a84cd07f7268300408a19de"
dependencies = [
"anyhow",
"heck",
@@ -789,14 +769,14 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
+checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5"
dependencies = [
"libc",
"system-deps",
@@ -804,9 +784,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
+checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0"
dependencies = [
"glib-sys",
"libc",
@@ -815,9 +795,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.16.3"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
+checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256"
dependencies = [
"glib",
"graphene-sys",
@@ -826,9 +806,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
+checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9"
dependencies = [
"glib-sys",
"libc",
@@ -838,9 +818,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4053293b79099bdfecd9ab0d811d118a0eafce613dfe0b26075419d955f1f652"
+checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
dependencies = [
"bitflags",
"cairo-rs",
@@ -854,9 +834,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08e0642edffdb35028d7d67b830678da98844216b6442e11eee52c91ad2a6dc2"
+checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -870,9 +850,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.5.4"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8954da3659ff1cb35aa95110021b33fadcd8e306e8fe41f32146ffa009665a79"
+checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed"
dependencies = [
"bitflags",
"cairo-rs",
@@ -893,23 +873,23 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.5.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58138cd3c595e04f82df050390aa7d2bd093795ce569e5f1d49eb496ef67fe7b"
+checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef29e09e055b2f2550eb1882caa6961a1ae3c971a70bcb25cb9d5ab6cbd63821"
+checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -925,10 +905,16 @@ dependencies = [
]
[[package]]
-name = "heck"
-version = "0.4.0"
+name = "hashbrown"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
@@ -948,6 +934,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "humantime"
version = "1.3.0"
@@ -959,16 +951,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows",
]
[[package]]
@@ -992,22 +984,33 @@ dependencies = [
]
[[package]]
-name = "io-lifetimes"
-version = "1.0.3"
+name = "indexmap"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
+dependencies = [
+ "hermit-abi 0.3.1",
"libc",
"windows-sys",
]
[[package]]
name = "is-terminal"
-version = "0.4.1"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
"windows-sys",
@@ -1024,15 +1027,15 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.8"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[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",
]
@@ -1051,9 +1054,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libadwaita"
-version = "0.2.1"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
+checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700"
dependencies = [
"bitflags",
"futures-channel",
@@ -1070,9 +1073,9 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.2.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
+checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -1086,15 +1089,16 @@ 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 = "librsvg"
-version = "2.55.90"
-source = "git+https://gitlab.gnome.org/gnome/librsvg#b25889ade2a875ef079f322101c1f2f0804e9dcb"
+version = "2.56.0"
+source = "git+https://gitlab.gnome.org/gnome/librsvg#d597831ff93b09cc41ce4768a833bc6407c95184"
dependencies = [
+ "anyhow",
"byteorder",
"cairo-rs",
"cast",
@@ -1103,7 +1107,7 @@ dependencies = [
"clap_complete",
"cssparser",
"data-url",
- "encoding",
+ "encoding_rs",
"float-cmp",
"gdk-pixbuf",
"gio",
@@ -1125,6 +1129,7 @@ dependencies = [
"selectors",
"string_cache",
"system-deps",
+ "thiserror",
"tinyvec",
"url",
"xml5ever",
@@ -1132,18 +1137,18 @@ 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",
]
[[package]]
name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "locale_config"
@@ -1208,9 +1213,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 = "matrixmultiply"
@@ -1229,27 +1234,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg",
]
[[package]]
name = "nalgebra"
-version = "0.31.4"
+version = "0.32.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bd243ab3dbb395b39ee730402d2e5405e448c75133ec49cc977762c4cba3d1"
+checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
dependencies = [
"approx",
"matrixmultiply",
@@ -1263,13 +1259,13 @@ dependencies = [
[[package]]
name = "nalgebra-macros"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
+checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1286,9 +1282,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "num-complex"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [
"num-traits",
]
@@ -1325,11 +1321,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 0.1.19",
+ "hermit-abi 0.2.6",
"libc",
]
@@ -1364,21 +1360,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "pango"
-version = "0.16.5"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
+checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37"
dependencies = [
"bitflags",
"gio",
@@ -1390,9 +1380,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
+checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1402,9 +1392,9 @@ dependencies = [
[[package]]
name = "pangocairo"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ad2ec87789371b551fd2367c10aa37060412ffd3e60abd99491b21b93a3f9b"
+checksum = "2feeb7ea7874507f83f5e7ba869c54e321959431c8fbd70d4b735c8b15d90506"
dependencies = [
"bitflags",
"cairo-rs",
@@ -1416,9 +1406,9 @@ dependencies = [
[[package]]
name = "pangocairo-sys"
-version = "0.16.3"
+version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848d2df9b7f1a8c7a19d994de443bcbe5d4382610ccb8e64247f932be74fcf76"
+checksum = "f60f1be8ef08087ddcbdcc1350e06073bff11113d425d12b622b716d96b9611c"
dependencies = [
"cairo-sys-rs",
"glib-sys",
@@ -1439,9 +1429,9 @@ 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",
@@ -1452,9 +1442,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.9"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "percent-encoding"
@@ -1462,25 +1452,13 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-[[package]]
-name = "pest"
-version = "2.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
[[package]]
name = "phf"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [
- "phf_macros",
"phf_shared 0.8.0",
- "proc-macro-hack",
]
[[package]]
@@ -1489,7 +1467,9 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
+ "phf_macros",
"phf_shared 0.10.0",
+ "proc-macro-hack",
]
[[package]]
@@ -1534,16 +1514,16 @@ dependencies = [
[[package]]
name = "phf_macros"
-version = "0.8.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
"proc-macro-hack",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1606,13 +1586,12 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
]
[[package]]
@@ -1624,7 +1603,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1641,15 +1620,15 @@ dependencies = [
[[package]]
name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@@ -1662,9 +1641,9 @@ 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",
]
@@ -1758,9 +1737,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
@@ -1768,9 +1747,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.10.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -1795,9 +1774,9 @@ dependencies = [
[[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",
@@ -1806,42 +1785,33 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rgb"
-version = "0.8.34"
+version = "0.8.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3"
+checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
dependencies = [
"bytemuck",
]
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.14",
+ "semver",
]
[[package]]
name = "rustix"
-version = "0.36.5"
+version = "0.37.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
dependencies = [
"bitflags",
"errno",
@@ -1868,15 +1838,15 @@ 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 = "selectors"
-version = "0.23.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdea87c686be721aab36607728047801ee21561bfdbd6bf0da7ace2536d5879f"
+checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
dependencies = [
"bitflags",
"cssparser",
@@ -1892,39 +1862,30 @@ dependencies = [
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
-version = "1.0.150"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
+]
[[package]]
name = "servo_arc"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
+checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
dependencies = [
"nodrop",
"stable_deref_trait",
@@ -1932,9 +1893,9 @@ dependencies = [
[[package]]
name = "simba"
-version = "0.7.3"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176"
+checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
dependencies = [
"approx",
"num-complex",
@@ -1951,9 +1912,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",
]
@@ -1972,9 +1933,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "string_cache"
-version = "0.8.4"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
@@ -2004,9 +1965,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[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.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
dependencies = [
"proc-macro2",
"quote",
@@ -2015,9 +1987,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"
dependencies = [
"cfg-expr",
"heck",
@@ -2045,42 +2017,31 @@ dependencies = [
[[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",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
+ "syn 2.0.13",
]
[[package]]
@@ -2094,17 +2055,42 @@ 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 = "toml"
-version = "0.5.9"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
dependencies = [
"serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
]
[[package]]
@@ -2113,23 +2099,17 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[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"
@@ -2163,6 +2143,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
[[package]]
name = "version-compare"
version = "0.1.1"
@@ -2181,12 +2167,6 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -2195,9 +2175,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",
@@ -2205,24 +2185,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-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",
@@ -2230,28 +2210,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wide"
-version = "0.7.5"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae41ecad2489a1655c8ef8489444b0b113c0a0c795944a3572a0931cf7d2525c"
+checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
dependencies = [
"bytemuck",
"safe_arch",
@@ -2289,61 +2269,151 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]]
name = "xml5ever"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix
index 04e1aa7235..0ec8a48f3c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/emblem/default.nix
@@ -2,42 +2,43 @@
, stdenv
, fetchFromGitLab
, rustPlatform
-, pkg-config
-, meson
-, ninja
-, glib
-, gobject-introspection
-, libadwaita
-, libxml2
-, librsvg
-, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
+, glib
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook4
+, gtk4
+, libadwaita
+, libxml2
+, darwin
}:
stdenv.mkDerivation rec {
pname = "emblem";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
- owner = "World/design";
- repo = pname;
+ group = "World";
+ owner = "design";
+ repo = "emblem";
rev = version;
- sha256 = "sha256-kNPV1SHkNTBXbMzDJGuDbaGz1WkBqMpVgZKjsh7ejmo=";
+ sha256 = "sha256-sgo6rGwmybouTTBTPFrPJv8Wo9I6dcoT7sUVQGFUqkQ=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "librsvg-2.55.90" = "sha256-IegUvM1HcsRiYS6woaP1aeWKtgBxim9FkdZY9BSscPY=";
+ "librsvg-2.56.0" = "sha256-PIrec3nfeMo94bkYUrp6B7lie9O1RtiBdPMFUKKLtTQ=";
};
};
nativeBuildInputs = [
appstream-glib
+ desktop-file-utils
glib
- gobject-introspection
meson
ninja
pkg-config
@@ -49,17 +50,18 @@ stdenv.mkDerivation rec {
]);
buildInputs = [
- desktop-file-utils
+ gtk4
libadwaita
- librsvg
libxml2
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Foundation
];
meta = with lib; {
description = "Generate project icons and avatars from a symbolic icon";
homepage = "https://gitlab.gnome.org/World/design/emblem";
license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ foo-dogsquared ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ figsoda foo-dogsquared ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix
index 942a6d63bd..b4ba26bd01 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/epeg/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "epeg";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "mattes";
repo = "epeg";
rev = "v${version}";
- sha256 = "14bjl9v6zzac4df25gm3bkw3n0mza5iazazsi65gg3m6661x6c5g";
+ sha256 = "sha256-lttqarR8gScNIlSrc5uU3FLfvwxxJ2A1S4oESUW7oIw=";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
index d32662937a..67938d9d15 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "f3d";
- version = "1.3.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "f3d-app";
repo = "f3d";
rev = "v${version}";
- hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q=";
+ hash = "sha256-od8Wu8+HyQb8qTA6C4kiw5hNI2WPBs/EMt321BJDZoc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
index 428ddc5073..afa7234446 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ];
- nativeBuildInputs = [ makeWrapper xorg.libXt ];
+ nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
+ buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
makeFlags = [
"PREFIX=${placeholder "out"}" "exif=1"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix
new file mode 100644
index 0000000000..0b189419a6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, fontconfig
+, freetype
+, libclang
+}:
+let
+ inherit (rustPlatform) buildRustPackage bindgenHook;
+
+ version = "0.2.7";
+in
+buildRustPackage {
+ pname = "figma-agent";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "neetly";
+ repo = "figma-agent-linux";
+ rev = version;
+ sha256 = "sha256-Cq1hWNwJLBY9Bb41WFJxnr9fcygFZ8eNsn5cPXmGTyw=";
+ };
+
+ cargoSha256 = "sha256-Gc94Uk/Ikxjnb541flQL7AeblgU/yS6zQ/187ZGRYco=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [
+ fontconfig
+ freetype
+ bindgenHook
+ ];
+
+ LIBCLANG_PATH = "${libclang.lib}/lib";
+
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/neetly/figma-agent-linux";
+ description = "Figma Agent for Linux (a.k.a. Font Helper)";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ercao ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
index ce15b42576..29f8746b38 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix
@@ -39,7 +39,7 @@
, soqt
, spaceNavSupport ? stdenv.isLinux
, swig
-, vtk_8
+, vtk
, wrapQtAppsHook
, wrapGAppsHook
, xercesc
@@ -97,7 +97,7 @@ mkDerivation rec {
shiboken2
soqt
swig
- vtk_8
+ vtk
xercesc
zlib
] ++ lib.optionals spaceNavSupport [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
index e7b257cea4..5e1fbe3758 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/default.nix
@@ -44,6 +44,7 @@
, libheif
, libgudev
, openexr
+, desktopToDarwinBundle
, AppKit
, Cocoa
, gtk-mac-integration-gtk2
@@ -84,6 +85,8 @@ in stdenv.mkDerivation (finalAttrs: {
gettext
makeWrapper
gtk-doc
+ ] ++ lib.optionals stdenv.isDarwin [
+ desktopToDarwinBundle
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gnome-decoder/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gnome-decoder/default.nix
index 47cd856c79..f957a8c291 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -11,6 +11,7 @@
, libadwaita
, zbar
, sqlite
+, openssl
, pipewire
, gstreamer
, gst-plugins-base
@@ -22,20 +23,20 @@
clangStdenv.mkDerivation rec {
pname = "gnome-decoder";
- version = "0.3.1";
+ version = "0.3.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "decoder";
rev = version;
- hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ=";
+ hash = "sha256-eMyPN3UxptqavY9tEATW2AP+kpoWaLwUKCwhNQrarVc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4=";
+ hash = "sha256-3j1hoFffQzWBy4IKtmoMkLBJmNbntpyn0sjv1K0MmDo=";
};
nativeBuildInputs = [
@@ -57,6 +58,7 @@ clangStdenv.mkDerivation rec {
libadwaita
zbar
sqlite
+ openssl
pipewire
gstreamer
gst-plugins-base
@@ -65,12 +67,6 @@ clangStdenv.mkDerivation rec {
LIBCLANG_PATH = "${libclang.lib}/lib";
- # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream
- # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55
- preBuild = ''
- export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED"
- '';
-
meta = with lib; {
description = "Scan and Generate QR Codes";
homepage = "https://gitlab.gnome.org/World/decoder";
@@ -78,6 +74,5 @@ clangStdenv.mkDerivation rec {
platforms = platforms.linux;
mainProgram = "decoder";
maintainers = with maintainers; [ zendo ];
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
index d3323a827c..78f25a0df3 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -130,6 +130,12 @@ perlPackages.buildPerlPackage rec {
# Non-zero wait status: 139
rm t/0601_Dialog_Scan.t
+ # Disable a test which failed due to convert returning an exit value of 1
+ # convert: negative or zero image size `/build/KL5kTVnNCi/YfgegFM53e.pnm' @ error/resize.c/ResizeImage/3743.
+ # *** unhandled exception in callback:
+ # *** "convert" unexpectedly returned exit value 1 at t/357_unpaper_rtl.t line 63.
+ rm t/357_unpaper_rtl.t
+
xvfb-run -s '-screen 0 800x600x24' \
make test
'';
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
new file mode 100644
index 0000000000..187d4a0154
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
@@ -0,0 +1,25 @@
+From a4822ee9e894f5f5b3110f41f65a698dd845a41d Mon Sep 17 00:00:00 2001
+From: Richard Davis
+Date: Fri, 24 Mar 2023 11:45:23 -0400
+Subject: [PATCH] Changing paths to be nix-compatible.
+
+---
+ dist/desktop/gscreenshot.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dist/desktop/gscreenshot.desktop b/dist/desktop/gscreenshot.desktop
+index a5d2bcd..9d289e2 100644
+--- a/dist/desktop/gscreenshot.desktop
++++ b/dist/desktop/gscreenshot.desktop
+@@ -2,7 +2,7 @@
+ Type=Application
+ Name=gscreenshot
+ Comment=A simple screenshot utility
+-TryExec=/usr/bin/gscreenshot
++TryExec=gscreenshot
+ Exec=gscreenshot
+ Icon=gscreenshot
+ Categories=Graphics;
+--
+2.39.2
+
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
new file mode 100644
index 0000000000..0847bc87cf
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/gscreenshot/default.nix
@@ -0,0 +1,90 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, gettext
+, gobject-introspection
+, gtk3
+, wrapGAppsHook
+, xdg-utils
+, scrot
+, slop
+, xclip
+, grim
+, slurp
+, wl-clipboard
+, waylandSupport ? true
+, x11Support ? true
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "gscreenshot";
+ version = "3.4.0";
+
+ src = fetchFromGitHub {
+ owner = "thenaterhood";
+ repo = "${pname}";
+ rev = "v${version}";
+ sha256 = "YuISiTUReX9IQpckIgbt03CY7klnog/IeOtfBoQ1DZM=";
+ };
+
+ # needed for wrapGAppsHook to function
+ strictDeps = false;
+ # tests require a display and fail
+ doCheck = false;
+
+ nativeBuildInputs = [ wrapGAppsHook ];
+ propagatedBuildInputs = [
+ gettext
+ gobject-introspection
+ gtk3
+ xdg-utils
+ ] ++ lib.optionals waylandSupport [
+ # wayland deps
+ grim
+ slurp
+ wl-clipboard
+ ] ++ lib.optionals x11Support [
+ # X11 deps
+ scrot
+ slop
+ xclip
+ python3Packages.xlib
+ ] ++ (with python3Packages; [
+ pillow
+ pygobject3
+ setuptools
+ ]);
+
+ patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ];
+
+ meta = {
+ description = "A screenshot frontend (CLI and GUI) for a variety of screenshot backends";
+
+ longDescription = ''
+ gscreenshot provides a common frontend and expanded functionality to a
+ number of X11 and Wayland screenshot and region selection utilties.
+
+ In a nutshell, gscreenshot supports the following:
+
+ - Capturing a full-screen screenshot
+ - Capturing a region of the screen interactively
+ - Capturing a window interactively
+ - Capturing the cursor
+ - Capturing the cursor, using an alternate cursor glyph
+ - Capturing a screenshot with a delay
+ - Showing a notification when a screenshot is taken
+ - Capturing a screenshot from the command line or a custom script
+ - Capturing a screenshot using a GUI
+ - Saving to a variety of image formats including 'bmp', 'eps', 'gif', 'jpeg', 'pcx', 'pdf', 'ppm', 'tiff', 'png', and 'webp'.
+ - Copying a screenshot to the system clipboard
+ - Opening a screenshot in the configured application after capture
+
+ Other than region selection, gscreenshot's CLI is non-interactive and is suitable for use in scripts.
+ '';
+
+ homepage = "https://github.com/thenaterhood/gscreenshot";
+ license = lib.licenses.gpl2Only;
+ platforms = lib.platforms.linux;
+ maintainers = [ lib.maintainers.davisrichard437 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
index 7ecc43c449..afc8e76405 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/hello-wayland/default.nix
@@ -1,16 +1,17 @@
{ stdenv, lib, fetchFromGitHub
, imagemagick, pkg-config, wayland, wayland-protocols
+, unstableGitUpdater
}:
stdenv.mkDerivation {
pname = "hello-wayland";
- version = "unstable-2023-03-16";
+ version = "unstable-2023-04-23";
src = fetchFromGitHub {
owner = "emersion";
repo = "hello-wayland";
- rev = "f6a8203309977af03cda94765dd61367c189bea6";
- sha256 = "FNtc6OApW/epAFortvujNVWJJVI44IY+Pa0qU0QdecA=";
+ rev = "77e270c19672f3ad863e466093f429cde8eb1f16";
+ sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
};
nativeBuildInputs = [ imagemagick pkg-config ];
@@ -23,6 +24,8 @@ stdenv.mkDerivation {
runHook postBuild
'';
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with lib; {
description = "Hello world Wayland client";
homepage = "https://github.com/emersion/hello-wayland";
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
index 045ac5d665..c30bef90f3 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/default.nix
@@ -1,5 +1,5 @@
{ lib
-, mkDerivation
+, stdenv
, makeDesktopItem
, fetchurl
, pkg-config
@@ -14,21 +14,24 @@
, lua5
, qtbase
, texlive
+, wrapQtAppsHook
, zlib
+, withTeXLive ? true
}:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "ipe";
- version = "7.2.24";
+ version = "7.2.26";
src = fetchurl {
url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
- sha256 = "sha256-/rh58k0dziWRB5B3BEbVCwPkbuLr19KBV7FwWXFkT28=";
+ sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU=";
};
+ patches = [
+ ./headers-lookup.patch
+ ];
- sourceRoot = "${pname}-${version}/src";
-
- nativeBuildInputs = [ pkg-config copyDesktopItems ];
+ nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
buildInputs = [
cairo
@@ -40,15 +43,19 @@ mkDerivation rec {
libspiro
lua5
qtbase
- texlive
zlib
+ ] ++ (lib.optionals withTeXLive [
+ texlive
+ ]);
+
+ makeFlags = [
+ "-C src"
+ "IPEPREFIX=${placeholder "out"}"
+ "LUA_PACKAGE=lua"
+ "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
];
- IPEPREFIX = placeholder "out";
- URWFONTDIR = "${texlive}/texmf-dist/fonts/type1/urw/";
- LUA_PACKAGE = "lua";
-
- qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];
+ qtWrapperArgs = lib.optional withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch b/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch
new file mode 100644
index 0000000000..a6adf1b164
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/graphics/ipe/headers-lookup.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile
+index ae3664e..f4f74ff 100644
+--- a/src/ipepresenter/Makefile
++++ b/src/ipepresenter/Makefile
+@@ -8,7 +8,7 @@ include ../common.mak
+
+ TARGET = $(call exe_target,ipepresenter)
+
+-CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \
++CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \
+ $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS)
+ LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \
+ $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS)
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix
index 564af456f0..4f2a7bae49 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix
@@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
- version = "1.17.0";
+ version = "1.19.0";
format = "other";
@@ -27,21 +27,9 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
- hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o=";
+ hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o=";
};
- patches = [
- # https://gitlab.com/valos/Komikku/-/merge_requests/208
- (fetchpatch {
- url = "https://gitlab.com/valos/Komikku/-/commit/c9a09817acd767a7cb4ceea9b212fffd798eae61.patch";
- hash = "sha256-McjQApLY7OKbdelrTeh3aRw90B6T9V5FtLL5Y62BmGA=";
- })
- (fetchpatch {
- url = "https://gitlab.com/valos/Komikku/-/commit/bda93631420f6a69a50be0068f259d60b9558930.patch";
- hash = "sha256-Xu+IaQKf0I99a2uh97j8xSlGYSJHuNPMy/zZtWRxLaM=";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix
index d32cf9d950..35db234f8f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/kphotoalbum/default.nix
@@ -18,11 +18,11 @@
mkDerivation rec {
pname = "kphotoalbum";
- version = "5.9.1";
+ version = "5.10.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
- hash = "sha256-kejzDYpBQEoGKgPzVcUVlGKmd1OoXx+W7t9p3MNNw/A=";
+ hash = "sha256-rdEXgg5hwu52XJit07AbrSw7kLDNK+IpbIwKCV/Lhp8=";
};
# not sure if we really need phonon when we have vlc, but on KDE it's bound to
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix
index fd552df11b..75aa146d3e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix
@@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
mkDerivation rec {
pname = "mandelbulber";
- version = "2.28";
+ version = "2.29";
src = fetchFromGitHub {
owner = "buddhi1980";
repo = "mandelbulber2";
rev = version;
- sha256 = "sha256-NrXfEUoTJSz8C6rNU+tSO4PUUo5YWP0bknzXQieOqDc=";
+ sha256 = "sha256-PVyJnPPNehQ5qzhuoUsDRQ+V3azauEkIk26XfLZOmXg=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mangareader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mangareader/default.nix
index 81073c0511..37a58ea0ba 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/mangareader/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/mangareader/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "mangareader";
- version = "2.0.4";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "g-fb";
repo = pname;
rev = version;
- hash = "sha256-j5b2O5OgDRaaxNssknTTgVscudk1+mFlGQN5KE6CwcU=";
+ hash = "sha256-YZZcp+HS/P/GxWYyOpO35nByJSzv4HahzzrZSVRcCRs=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock
index 2c66202066..8c6486a553 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock
@@ -23,16 +23,16 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
"once_cell",
"version_check",
]
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
@@ -69,10 +69,59 @@ dependencies = [
]
[[package]]
-name = "anyhow"
-version = "1.0.69"
+name = "anstream"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "approx"
@@ -93,7 +142,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -118,9 +167,9 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
dependencies = [
"async-lock",
"async-task",
@@ -144,22 +193,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",
"slab",
"socket2",
"waker-fn",
- "windows-sys 0.42.0",
]
[[package]]
@@ -185,9 +234,9 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
dependencies = [
"async-io",
"async-lock",
@@ -196,16 +245,16 @@ dependencies = [
"cfg-if",
"event-listener",
"futures-lite",
- "libc",
+ "rustix",
"signal-hook",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[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 = "atomic-polyfill"
@@ -218,9 +267,9 @@ dependencies = [
[[package]]
name = "atomic-waker"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
[[package]]
name = "atty"
@@ -241,9 +290,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "autocxx"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c3621dadf601792243257fe956578abed662504c296e22f537433381a9a8026"
+checksum = "9a19c80ba8384f11f11024462523829c2989a3fd7afb8ac70637abdd25bd3b8a"
dependencies = [
"aquamarine",
"autocxx-macro",
@@ -270,27 +319,27 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 1.0.109",
"which",
]
[[package]]
name = "autocxx-build"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5ed44575f2fc241b990e03909634301c9c49f1ff3d921631fdca752c33e297"
+checksum = "37823c07a43c1a8d09aaad7ba8785df1b3160dcf0ee1c4e7e83177e9ebc2d804"
dependencies = [
"autocxx-engine",
"env_logger 0.9.3",
"indexmap",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "autocxx-engine"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6a27d1fcc45584c0b7fe5ce06b7b26cefe72cfa55e5a94264be5e427a418e3"
+checksum = "aa19cbb6614361e61806db4526bd373415dfe0cb95f6bf811a2ddbd6fa4a8115"
dependencies = [
"aquamarine",
"autocxx-bindgen",
@@ -310,7 +359,7 @@ dependencies = [
"rustversion",
"serde_json",
"strum_macros",
- "syn",
+ "syn 1.0.109",
"tempfile",
"thiserror",
"version_check",
@@ -318,22 +367,22 @@ dependencies = [
[[package]]
name = "autocxx-macro"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6022ff3a7c5d5cf54cf37f3dabb54c1bdcbeecb3fab3937903dd0bc562ef7fb6"
+checksum = "7313f823cd7e017cf80b46254d9bd78e4cb86b33b7e2cd08e1af312ee7bc77cf"
dependencies = [
"autocxx-parser",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "autocxx-parser"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884eef6d9cc6d89a2ca043fad1c17424f857c6082db4122dc7f2fb7e5ec5ff74"
+checksum = "a16532d5349c8f165534d95ce2cf70a4aefaf1f33146fe8273f77d3a2f817796"
dependencies = [
"indexmap",
"itertools 0.10.5",
@@ -343,7 +392,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn",
+ "syn 1.0.109",
"thiserror",
]
@@ -357,11 +406,20 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
"object",
"rustc-demangle",
]
+[[package]]
+name = "backtrace-ext"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
+dependencies = [
+ "backtrace",
+]
+
[[package]]
name = "base64"
version = "0.21.0"
@@ -370,9 +428,9 @@ checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bindgen"
-version = "0.61.0"
+version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
+checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
dependencies = [
"bitflags",
"cexpr",
@@ -385,7 +443,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -408,9 +466,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "blocking"
-version = "1.3.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
dependencies = [
"async-channel",
"async-lock",
@@ -418,13 +476,14 @@ dependencies = [
"atomic-waker",
"fastrand",
"futures-lite",
+ "log",
]
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
[[package]]
name = "bytemuck"
@@ -501,11 +560,12 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -530,9 +590,9 @@ dependencies = [
[[package]]
name = "clang-sys"
-version = "1.6.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
@@ -541,55 +601,61 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.1.9"
+version = "4.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9d6ada83c1edcce028902ea27dd929069c70df4c7600b131b4d9a1ad2879cc"
+checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
dependencies = [
- "bitflags",
+ "clap_builder",
"clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
"clap_lex",
- "is-terminal",
"once_cell",
"strsim",
- "termcolor",
]
[[package]]
name = "clap_complete"
-version = "4.1.5"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1"
+checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.1.9"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
dependencies = [
"heck",
- "proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "clap_lex"
-version = "0.3.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
[[package]]
name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
@@ -610,6 +676,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
[[package]]
name = "combine"
version = "4.6.6"
@@ -622,9 +694,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
"crossbeam-utils",
]
@@ -656,9 +728,9 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "coreaudio-rs"
@@ -673,21 +745,21 @@ dependencies = [
[[package]]
name = "coreaudio-sys"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb"
+checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
dependencies = [
"bindgen",
]
[[package]]
name = "cpal"
-version = "0.15.1"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1241019dec4a73f874bdf6fe3467a8478b47cecaf79435f7acb01f107ab41b1"
+checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
dependencies = [
"alsa",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"coreaudio-rs",
"dasp_sample",
"jni 0.19.0",
@@ -702,7 +774,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows",
+ "windows 0.46.0",
]
[[package]]
@@ -722,9 +794,9 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
[[package]]
name = "crossbeam-channel"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -783,7 +855,7 @@ dependencies = [
"proc-macro2",
"quote",
"smallvec",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -793,14 +865,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "cxx"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -810,9 +882,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -820,36 +892,36 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "cxx-gen"
-version = "0.7.92"
+version = "0.7.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff01746b8722387dd625f9f6ae0852f73a5b8fef032988bfcd7cd3093c6c2ddd"
+checksum = "ee165c38de64e6761c2f38b7e9beee0721110f8585165987ef9db2a753ee4176"
dependencies = [
"codespan-reporting",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.92"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -873,7 +945,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -884,7 +956,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
"darling_core",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -917,7 +989,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -927,7 +999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
dependencies = [
"derive_builder_core",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -940,27 +1012,27 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "directories"
-version = "4.0.1"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
dependencies = [
"libc",
"redox_users",
- "winapi",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -1097,13 +1169,13 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1118,9 +1190,9 @@ dependencies = [
[[package]]
name = "euclid"
-version = "0.22.7"
+version = "0.22.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
dependencies = [
"num-traits",
]
@@ -1141,7 +1213,7 @@ dependencies = [
"flume",
"half",
"lebe",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
"rayon-core",
"smallvec",
"zune-inflate",
@@ -1156,6 +1228,15 @@ dependencies = [
"instant",
]
+[[package]]
+name = "fdeflate"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
[[package]]
name = "field-offset"
version = "0.3.5"
@@ -1182,7 +1263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
]
[[package]]
@@ -1230,13 +1311,14 @@ dependencies = [
[[package]]
name = "fontdb"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06"
+checksum = "bfec8f19f9b89b2901219cc62604810d2bfef15dc1182e95320f57e7cbbe041a"
dependencies = [
"fontconfig-parser",
"log",
"memmap2",
+ "slotmap",
"ttf-parser",
]
@@ -1267,9 +1349,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -1282,9 +1364,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -1292,15 +1374,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -1309,15 +1391,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
"fastrand",
"futures-core",
@@ -1330,32 +1412,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "futures-sink"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -1407,9 +1489,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5042053ee765aeef08d9d7e3f0f1e36a4d37f1659b3f93ad3d6997515dbb64a"
+checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
dependencies = [
"bitflags",
"cairo-rs",
@@ -1423,9 +1505,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f0fb00507af1e9299681dd09965f720e2b5ea95536d49a5681e8994ef10c7a"
+checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1440,9 +1522,9 @@ dependencies = [
[[package]]
name = "geo"
-version = "0.24.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce129b525496519c00321a00772d4532d2229071699c6dc6c9cefa5fa7d2b9ae"
+checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268"
dependencies = [
"float_next_after",
"geo-types",
@@ -1487,9 +1569,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if",
"js-sys",
@@ -1520,9 +1602,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.11.4"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
dependencies = [
"color_quant",
"weezl",
@@ -1536,9 +1618,9 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
[[package]]
name = "gio"
-version = "0.17.4"
+version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125"
+checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92"
dependencies = [
"bitflags",
"futures-channel",
@@ -1569,9 +1651,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.17.5"
+version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773"
+checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6"
dependencies = [
"bitflags",
"futures-channel",
@@ -1592,9 +1674,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.17.5"
+version = "0.17.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40"
+checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f"
dependencies = [
"anyhow",
"heck",
@@ -1602,7 +1684,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1657,9 +1739,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fa9cd285a72a95124b65c069a9cb1b8fb8e310be71783404c39fccf3bf7774c"
+checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
dependencies = [
"bitflags",
"cairo-rs",
@@ -1673,9 +1755,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a445ae1e50cbf181a1d5c61b920a7e7e8657b96e0ecdbbf8911a86fad462a32"
+checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -1689,9 +1771,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.6.2"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f"
+checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
dependencies = [
"bitflags",
"cairo-rs",
@@ -1712,24 +1794,23 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.6.0"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61"
+checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
- "quick-xml",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65463dc801460e498d5e7ffa6e9ae2cfbed7d05fabd1ca5a8d024adbc89eeda6"
+checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1831,16 +1912,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows 0.48.0",
]
[[package]]
@@ -1871,9 +1952,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.24.5"
+version = "0.24.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
dependencies = [
"bytemuck",
"byteorder",
@@ -1884,7 +1965,7 @@ dependencies = [
"num-rational",
"num-traits",
"png",
- "scoped_threadpool",
+ "qoi",
"tiff",
]
@@ -1896,9 +1977,9 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
[[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",
@@ -1926,7 +2007,7 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
[[package]]
name = "ink-stroke-modeler-rs"
version = "0.1.0"
-source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=6a3f2f1e8691ad09f36a231c7defe78fc448f709#6a3f2f1e8691ad09f36a231c7defe78fc448f709"
+source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=c12302c6f1f87a45cb474b67a02897daa32a46a3#c12302c6f1f87a45cb474b67a02897daa32a46a3"
dependencies = [
"anyhow",
"autocxx",
@@ -1949,25 +2030,25 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.7"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
"hermit-abi 0.3.1",
"libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "is-terminal"
-version = "0.4.4"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2063,18 +2144,9 @@ dependencies = [
[[package]]
name = "kurbo"
-version = "0.8.3"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "kurbo"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8c31eaef73f18e0d938785e01ab471ec73e3f90c3389e84335ade689ba953b"
+checksum = "28a2d0c1781729f69dbea30f968608cadfaeb6582e5ce903a167a5216b53cd0f"
dependencies = [
"arrayvec",
]
@@ -2140,9 +2212,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.140"
+version = "0.2.142"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
[[package]]
name = "libloading"
@@ -2162,8 +2234,8 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
[[package]]
name = "librsvg"
-version = "2.55.92"
-source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.55.92#69342757cb197c3a0ba2b66138d5008283d97209"
+version = "2.56.0"
+source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.0#b831e077174ae608d8cd09e532fc0e7ce1fe5c4f"
dependencies = [
"anyhow",
"byteorder",
@@ -2213,9 +2285,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
[[package]]
name = "locale_config"
@@ -2295,9 +2367,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "matrixmultiply"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
+checksum = "bb99c395ae250e1bf9133673f03ca9f97b7e71b705436bf8f089453445d1e9fe"
dependencies = [
"rawpointer",
]
@@ -2328,11 +2400,12 @@ dependencies = [
[[package]]
name = "miette"
-version = "5.6.0"
+version = "5.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb"
+checksum = "92a992891d5579caa9efd8e601f82e30a1caa79a27a5db075dde30ecb9eab357"
dependencies = [
"backtrace",
+ "backtrace-ext",
"is-terminal",
"miette-derive",
"once_cell",
@@ -2348,13 +2421,13 @@ dependencies = [
[[package]]
name = "miette-derive"
-version = "5.6.0"
+version = "5.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460"
+checksum = "4c65c625186a9bcce6699394bee511e1b1aec689aa7e3be1bf4e996e75834153"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -2372,6 +2445,16 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
[[package]]
name = "moveit"
version = "0.5.1"
@@ -2406,7 +2489,7 @@ checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2415,7 +2498,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
]
[[package]]
@@ -2498,7 +2581,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2560,7 +2643,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2642,12 +2725,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc"
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
[[package]]
name = "owo-colors"
version = "3.5.0"
@@ -2675,7 +2752,7 @@ dependencies = [
"find-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2733,9 +2810,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "parking_lot"
@@ -2755,16 +2832,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"windows-sys 0.45.0",
]
[[package]]
name = "parry2d-f64"
-version = "0.13.3"
+version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bf555d44a3be6c6b6acdea1614af50b12987b4b9651c812d3219e8136c336"
+checksum = "2f612055f319eb83e67841fdf00248eee26045a1759b5d94fa9c6ecce7c1e78d"
dependencies = [
"approx",
"arrayvec",
@@ -2897,7 +2974,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2910,7 +2987,7 @@ dependencies = [
"phf_shared 0.11.1",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2940,19 +3017,25 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
[[package]]
name = "piet"
version = "0.6.2"
-source = "git+https://github.com/linebender/piet?rev=413397445e6772e0a651d60cf58a823b98f67c23#413397445e6772e0a651d60cf58a823b98f67c23"
+source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8"
dependencies = [
- "kurbo 0.9.1",
+ "kurbo",
"unic-bidi",
]
[[package]]
name = "piet-cairo"
version = "0.6.2"
-source = "git+https://github.com/linebender/piet?rev=413397445e6772e0a651d60cf58a823b98f67c23#413397445e6772e0a651d60cf58a823b98f67c23"
+source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8"
dependencies = [
"cairo-rs",
"pango",
@@ -2979,7 +3062,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3002,14 +3085,15 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "png"
-version = "0.17.7"
+version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
dependencies = [
"bitflags",
"crc32fast",
+ "fdeflate",
"flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.1",
]
[[package]]
@@ -3024,9 +3108,9 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.6.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
"bitflags",
@@ -3035,7 +3119,7 @@ dependencies = [
"libc",
"log",
"pin-project-lite",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3102,7 +3186,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3124,7 +3208,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -3147,28 +3231,28 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.52"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-[[package]]
-name = "quick-xml"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "quote"
version = "1.0.26"
@@ -3238,7 +3322,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
]
[[package]]
@@ -3280,9 +3364,9 @@ dependencies = [
[[package]]
name = "raw-window-handle"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rawpointer"
@@ -3327,22 +3411,31 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.9",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.7.1"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
dependencies = [
"aho-corasick",
"memchr",
@@ -3351,9 +3444,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
[[package]]
name = "rgb"
@@ -3366,7 +3459,7 @@ dependencies = [
[[package]]
name = "rnote"
-version = "0.5.18"
+version = "0.6.0"
dependencies = [
"anyhow",
"cairo-rs",
@@ -3376,7 +3469,7 @@ dependencies = [
"gettext-rs",
"gtk4",
"image",
- "kurbo 0.9.1",
+ "kurbo",
"libadwaita",
"log",
"nalgebra",
@@ -3407,7 +3500,7 @@ dependencies = [
[[package]]
name = "rnote-cli"
-version = "0.5.18"
+version = "0.6.0"
dependencies = [
"anyhow",
"clap",
@@ -3426,7 +3519,7 @@ dependencies = [
"anyhow",
"base64",
"ink-stroke-modeler-rs",
- "kurbo 0.9.1",
+ "kurbo",
"log",
"nalgebra",
"num-derive",
@@ -3459,7 +3552,7 @@ dependencies = [
"gtk4",
"image",
"itertools 0.10.5",
- "kurbo 0.9.1",
+ "kurbo",
"librsvg",
"log",
"nalgebra",
@@ -3478,7 +3571,6 @@ dependencies = [
"rnote-compose",
"rnote-fileformats",
"rodio",
- "rosvgtree",
"rstar",
"semver",
"serde",
@@ -3487,7 +3579,6 @@ dependencies = [
"svg",
"unicode-segmentation",
"usvg",
- "usvg-text-layout",
"xmlwriter",
]
@@ -3525,15 +3616,15 @@ dependencies = [
[[package]]
name = "rosvgtree"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
+checksum = "8cdb7996003c5cc8a8c2585b4ab6b422da64ad86a9c99cfa7ba320e15e8739f3"
dependencies = [
"log",
"roxmltree",
"simplecss",
"siphasher",
- "svgtypes 0.9.0",
+ "svgtypes 0.11.0",
]
[[package]]
@@ -3587,9 +3678,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc-hash"
@@ -3608,16 +3699,16 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.36.9"
+version = "0.37.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3666,12 +3757,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
[[package]]
name = "scopeguard"
version = "1.1.0"
@@ -3713,29 +3798,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.156"
+version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.156"
+version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "serde_json"
-version = "1.0.94"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa",
"ryu",
@@ -3788,9 +3873,9 @@ dependencies = [
[[package]]
name = "simba"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
dependencies = [
"approx",
"num-complex",
@@ -3880,9 +3965,9 @@ dependencies = [
[[package]]
name = "spade"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3"
+checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9"
dependencies = [
"num-traits",
"optional",
@@ -3892,9 +3977,9 @@ dependencies = [
[[package]]
name = "spin"
-version = "0.9.6"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
dependencies = [
"lock_api",
]
@@ -3956,7 +4041,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3971,9 +4056,9 @@ dependencies = [
[[package]]
name = "supports-hyperlinks"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60"
+checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d"
dependencies = [
"is-terminal",
]
@@ -3989,9 +4074,9 @@ dependencies = [
[[package]]
name = "svg"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e715e0c3fc987f4c435dc7189641fd9caa6919a74675ace605c38e201d278001"
+checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112"
[[package]]
name = "svg_path_ops"
@@ -4013,11 +4098,11 @@ dependencies = [
[[package]]
name = "svgtypes"
-version = "0.9.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734"
+checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7"
dependencies = [
- "kurbo 0.8.3",
+ "kurbo",
"siphasher",
]
@@ -4103,18 +4188,35 @@ dependencies = [
]
[[package]]
-name = "system-deps"
-version = "6.0.3"
+name = "syn"
+version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
dependencies = [
"cfg-expr",
"heck",
"pkg-config",
- "toml 0.5.11",
+ "toml 0.7.3",
"version-compare",
]
+[[package]]
+name = "target-lexicon"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
+
[[package]]
name = "temp-dir"
version = "0.1.11"
@@ -4123,15 +4225,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[package]]
name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -4177,22 +4279,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.39"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.39"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -4253,9 +4355,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",
@@ -4329,9 +4431,9 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.11"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-bidi-mirroring"
@@ -4413,35 +4515,62 @@ dependencies = [
[[package]]
name = "usvg"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
+checksum = "67a6cab2bc32b5a4310a06c7d3c6b51b5c7897b1f7c7d2bf73bf052f5754950f"
dependencies = [
"base64",
+ "log",
+ "pico-args",
+ "usvg-parser",
+ "usvg-text-layout",
+ "usvg-tree",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg-parser"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2352a2c05655a7e4d3dca76cf65764efce35527472668bae5c6fc876b4c996d"
+dependencies = [
"data-url",
"flate2",
"imagesize",
- "kurbo 0.9.1",
+ "kurbo",
"log",
- "rctree",
"rosvgtree",
"strict-num",
+ "svgtypes 0.11.0",
+ "usvg-tree",
]
[[package]]
name = "usvg-text-layout"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db"
+checksum = "392baafaaa861ff8c9863546f92a60c51380fc49aa185a6840fb2af564c73530"
dependencies = [
"fontdb",
- "kurbo 0.9.1",
+ "kurbo",
"log",
"rustybuzz",
"unicode-bidi",
"unicode-script",
"unicode-vo",
- "usvg",
+ "usvg-tree",
+]
+
+[[package]]
+name = "usvg-tree"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cb92fe40e0ffb45fd01349187e276a695f6c676a016d72ba09510009594829"
+dependencies = [
+ "kurbo",
+ "rctree",
+ "strict-num",
+ "svgtypes 0.11.0",
]
[[package]]
@@ -4450,6 +4579,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
[[package]]
name = "version-compare"
version = "0.1.1"
@@ -4511,7 +4646,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
@@ -4545,7 +4680,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4626,11 +4761,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.44.0"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
]
[[package]]
@@ -4639,13 +4783,13 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
@@ -4654,7 +4798,16 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
]
[[package]]
@@ -4663,13 +4816,28 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
@@ -4678,36 +4846,72 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@@ -4715,10 +4919,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
-name = "winnow"
-version = "0.3.6"
+name = "windows_x86_64_msvc"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
dependencies = [
"memchr",
]
@@ -4764,9 +4974,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
[[package]]
name = "zune-inflate"
-version = "0.2.51"
+version = "0.2.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01728b79fb9b7e28a8c11f715e1cd8dc2cda7416a007d66cac55cebb3a8ac6b"
+checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
dependencies = [
"simd-adler32",
]
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
index 1e4a5b7833..133a72460a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, alsa-lib
, appstream-glib
, cmake
@@ -24,32 +23,24 @@
stdenv.mkDerivation rec {
pname = "rnote";
- version = "0.5.18";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "flxzt";
repo = "rnote";
rev = "v${version}";
- hash = "sha256-N07Y9kmGvMFS0Kq4i2CltJvNTuqbXausZZGjAQRDmNU=";
+ hash = "sha256-47mWlUXp62fMh5c13enFjmuMxzrmEZlwJFsZhYCB1Vs=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "ink-stroke-modeler-rs-0.1.0" = "sha256-+R3T/9Ty+F6YxxtA0Un6UhFyKbGOvqBKwHt4WSHWhsk=";
- "librsvg-2.55.92" = "sha256-WVwxjjWR/TloSmyzH8Jo1mTjLHVifBw1Xn965wuoEDs=";
- "piet-0.6.2" = "sha256-76yeX0yQMC0hh6u2xT/kS/2fjs+GO+nCks2fnOImf0c=";
+ "ink-stroke-modeler-rs-0.1.0" = "sha256-DrbFolHGL3ywk2p6Ly3x0vbjqxy1mXld+5CPrNlJfQM=";
+ "librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w=";
+ "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU=";
};
};
- patches = [
- # https://github.com/flxzt/rnote/pull/569
- (fetchpatch {
- url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";
- hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";
- })
- ];
-
nativeBuildInputs = [
appstream-glib # For appstream-util
cmake
@@ -68,6 +59,10 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
+ mesonFlags = [
+ (lib.mesonBool "cli" true)
+ ];
+
buildInputs = [
glib
gstreamer
@@ -85,7 +80,6 @@ stdenv.mkDerivation rec {
pushd build-aux
chmod +x cargo_build.py meson_post_install.py
patchShebangs cargo_build.py meson_post_install.py
- substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
popd
'';
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
index 623a8d783f..c326b9725b 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
-, fetchpatch2
, meson
, ninja
, gtk3
@@ -42,22 +41,13 @@
stdenv.mkDerivation rec {
pname = "shotwell";
- version = "0.31.7";
+ version = "0.32.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA=";
+ sha256 = "sha256-F3Ky+h56VHnVKAKLyaMD8oVeHZWaWzyReSLmOpipCxk=";
};
- patches = [
- # Fix build with vala 0.56.4, can be removed on next update
- # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69
- (fetchpatch2 {
- url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch";
- hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU=";
- })
- ];
-
nativeBuildInputs = [
meson
ninja
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/unigine-superposition/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/unigine-superposition/default.nix
index b1261bb52f..bc8e128ba4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -22,7 +22,7 @@
, mkDerivation
, xkeyboard_config
, fetchurl
-, buildFHSUserEnv
+, buildFHSEnv
, openal
, makeDesktopItem
}:
@@ -94,9 +94,9 @@ let
in
# We can patch the "/bin/superposition", but "/bin/launcher" checks it for changes.
-# For that we need use a buildFHSUserEnv.
+# For that we need use a buildFHSEnv.
-buildFHSUserEnv {
+buildFHSEnv {
name = "Superposition";
targetPkgs = pkgs: [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
index ba6370a5a4..75f0f87c41 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "yacreader";
- version = "9.11.0";
+ version = "9.12.0";
src = fetchFromGitHub {
owner = "YACReader";
repo = pname;
rev = version;
- sha256 = "sha256-/fSIV+4j516PgHGn6zF+TfVaVW/lVWykf5J8bnQuttg=";
+ sha256 = "sha256-sIQxUiTGQCcHmxBp0Mf49e/XVaJe7onlLHiorMlNLZ8=";
};
nativeBuildInputs = [ qmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
index b1d96f2d1f..7810ea3213 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yEd";
- version = "3.22";
+ version = "3.23.1";
src = fetchzip {
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
- sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac=";
+ sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig=";
};
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix
index 474672dfd7..95ee121b59 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix
@@ -17,4 +17,8 @@ mkDerivation {
kio kmailtransport
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
index d89670d771..2486019ac6 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix
@@ -22,4 +22,8 @@ mkDerivation {
];
propagatedBuildInputs = [ akonadi grantleetheme ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-mime.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-mime.nix
index fbd028b1ec..b498fde26d 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-mime.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-mime.nix
@@ -13,4 +13,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-notes.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-notes.nix
index 1ab0ca7481..411f71440a 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-notes.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-notes.nix
@@ -15,4 +15,8 @@ mkDerivation {
akonadi kcompletion ki18n kitemmodels kmime kxmlgui
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-search.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-search.nix
index 84657177f8..2908748e47 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-search.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-search.nix
@@ -17,4 +17,8 @@ mkDerivation {
akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
index 73d69c5e69..6d4d5a4b36 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
---
CMakeLists.txt | 3 ---
- KF5AkonadiConfig.cmake.in | 6 +++---
+ KPimAkonadiConfig.cmake.in | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,8 +13,8 @@ index 4e8cc81..63161b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -368,9 +368,6 @@ configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+ "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
- AKONADI_INCLUDE_DIR
@@ -22,10 +22,10 @@ index 4e8cc81..63161b7 100644
)
install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
index bcf7320..1574319 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
+--- a/KPimAkonadiConfig.cmake.in
++++ b/KPimAkonadiConfig.cmake.in
@@ -1,10 +1,10 @@
@PACKAGE_INIT@
diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
index e816d3eeb4..ade8ebbcf4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix
@@ -44,10 +44,8 @@ mkDerivation {
cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
- # compatibility symlinks for kmymoney, can probably be removed in next kde bump
postInstall = ''
- ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
- ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
- ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
'';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/alligator.nix b/third_party/nixpkgs/pkgs/applications/kde/alligator.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/alligator.nix
rename to third_party/nixpkgs/pkgs/applications/kde/alligator.nix
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix b/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix
similarity index 90%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix
rename to third_party/nixpkgs/pkgs/applications/kde/angelfish.nix
index 7a7e48d736..45cfcad67d 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix
@@ -3,7 +3,6 @@
, cmake
, corrosion
, extra-cmake-modules
-, gcc12
, kconfig
, kcoreaddons
, kdbusaddons
@@ -15,13 +14,14 @@
, kwindowsystem
, qtfeedback
, qtquickcontrols2
+, qqc2-desktop-style
, qtwebengine
, rustPlatform
, srcs
# These must be updated in tandem with package updates.
-, cargoShaForVersion ? "23.01.0"
-, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk="
+, cargoShaForVersion ? "23.04.0"
+, cargoSha256 ? "sha256-96Qe8zdLZdOrU/t6J+JJ6V0PXyFOnJF18qDrk4PZGsA="
}:
# Guard against incomplete updates.
@@ -46,7 +46,6 @@ mkDerivation rec {
cmake
corrosion
extra-cmake-modules
- gcc12 # doesn't build with GCC 9 from stdenv on aarch64
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
@@ -65,6 +64,7 @@ mkDerivation rec {
kwindowsystem
qtfeedback
qtquickcontrols2
+ qqc2-desktop-style
qtwebengine
];
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix
similarity index 94%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix
rename to third_party/nixpkgs/pkgs/applications/kde/audiotube.nix
index 14bfc6d189..0bd22ee06f 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/audiotube.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix
@@ -2,7 +2,6 @@
, mkDerivation
, extra-cmake-modules
-, gcc12
, wrapGAppsHook
, gst_all_1
@@ -10,6 +9,7 @@
, kcrash
, ki18n
, kirigami2
+, kirigami-addons
, qtimageformats
, qtmultimedia
, qtquickcontrols2
@@ -22,7 +22,6 @@ mkDerivation rec {
nativeBuildInputs = [
extra-cmake-modules
wrapGAppsHook
- gcc12 # doesn't build with GCC 9 from stdenv on aarch64
python3Packages.wrapPython
python3Packages.pybind11
];
@@ -32,6 +31,7 @@ mkDerivation rec {
kcrash
ki18n
kirigami2
+ kirigami-addons
qtimageformats
qtmultimedia
qtquickcontrols2
diff --git a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
index c6a4e36c82..4cc1bb1f1c 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/calendarsupport.nix
@@ -17,4 +17,8 @@ mkDerivation {
];
propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/calindori.nix b/third_party/nixpkgs/pkgs/applications/kde/calindori.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/calindori.nix
rename to third_party/nixpkgs/pkgs/applications/kde/calindori.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix b/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix
index e250df5633..07f34c84d6 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix
@@ -1,11 +1,11 @@
-{ mkDerivation, lib, fetchurl
+{ mkDerivation, lib
, extra-cmake-modules, ki18n
, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
-, kitemviews, lcms2, libXrandr, qtx11extras
+, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras
}:
-mkDerivation rec {
+mkDerivation {
pname = "colord-kde";
nativeBuildInputs = [ extra-cmake-modules ];
@@ -13,7 +13,7 @@ mkDerivation rec {
buildInputs = [
kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons
- kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+ kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix
index c121d0fb53..3e3f31c3a7 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix
@@ -86,6 +86,7 @@ let
falkon = callPackage ./falkon.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
+ ghostwriter = callPackage ./ghostwriter.nix {};
granatier = callPackage ./granatier.nix {};
grantleetheme = callPackage ./grantleetheme {};
gwenview = callPackage ./gwenview.nix {};
@@ -112,6 +113,7 @@ let
kcalutils = callPackage ./kcalutils.nix {};
kcharselect = callPackage ./kcharselect.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
+ kde-inotify-survey = callPackage ./kde-inotify-survey.nix {};
kdebugsettings = callPackage ./kdebugsettings.nix {};
kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
@@ -140,6 +142,7 @@ let
kigo = callPackage ./kigo.nix {};
killbots = callPackage ./killbots.nix {};
kimap = callPackage ./kimap.nix {};
+ kio-admin = callPackage ./kio-admin.nix {};
kio-extras = callPackage ./kio-extras.nix {};
kio-gdrive = callPackage ./kio-gdrive.nix {};
kipi-plugins = callPackage ./kipi-plugins.nix {};
@@ -233,6 +236,26 @@ let
umbrello = callPackage ./umbrello.nix {};
yakuake = callPackage ./yakuake.nix {};
zanshin = callPackage ./zanshin.nix {};
+
+ # Plasma Mobile Gear
+ alligator = callPackage ./alligator.nix {};
+ angelfish = callPackage ./angelfish.nix { inherit srcs; };
+ audiotube = callPackage ./audiotube.nix {};
+ calindori = callPackage ./calindori.nix {};
+ kalk = callPackage ./kalk.nix {};
+ kasts = callPackage ./kasts.nix {};
+ kclock = callPackage ./kclock.nix {};
+ keysmith = callPackage ./keysmith.nix {};
+ koko = callPackage ./koko.nix {};
+ kongress = callPackage ./kongress.nix {};
+ krecorder = callPackage ./krecorder.nix {};
+ ktrip = callPackage ./ktrip.nix {};
+ kweather = callPackage ./kweather.nix {};
+ neochat = callPackage ./neochat.nix {};
+ plasmatube = callPackage ./plasmatube {};
+ qmlkonsole = callPackage ./qmlkonsole.nix {};
+ telly-skout = callPackage ./telly-skout.nix {};
+ tokodon = callPackage ./tokodon.nix {};
};
in lib.makeScope libsForQt5.newScope packages
diff --git a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
index b15c6fea4a..d5340eaf37 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix
@@ -5,8 +5,7 @@
kcompletion, kconfig, kcoreaddons, kdbusaddons,
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
kparts, ktexteditor, kwindowsystem, phonon, solid,
- kuserfeedback,
- wayland, qtwayland
+ kuserfeedback, wayland, qtwayland, qtx11extras
}:
mkDerivation {
@@ -26,6 +25,7 @@ mkDerivation {
phonon solid
kuserfeedback
wayland qtwayland
+ qtx11extras
];
outputs = [ "out" "dev" ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/eventviews.nix b/third_party/nixpkgs/pkgs/applications/kde/eventviews.nix
index 001c1e6cbc..382f0ee48b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/eventviews.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/eventviews.nix
@@ -17,4 +17,8 @@ mkDerivation {
libkdepim qtbase qttools kholidays
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
index c20859f6dd..f5b3561bc3 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
+++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.0/src -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ghostwriter.nix b/third_party/nixpkgs/pkgs/applications/kde/ghostwriter.nix
new file mode 100644
index 0000000000..1fad4669dc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/ghostwriter.nix
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, qttools
+, qtwebengine
+, kcoreaddons
+, kconfigwidgets
+, sonnet
+, kxmlgui
+, hunspell
+, cmark
+, multimarkdown
+, pandoc
+}:
+
+mkDerivation {
+ pname = "ghostwriter";
+
+ nativeBuildInputs = [ extra-cmake-modules qttools ];
+
+ buildInputs = [
+ qtwebengine
+ hunspell
+ kcoreaddons
+ kconfigwidgets
+ sonnet
+ kxmlgui
+ ];
+
+ qtWrapperArgs = [
+ "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
+ ];
+
+ meta = with lib; {
+ description = "A cross-platform, aesthetic, distraction-free Markdown editor";
+ homepage = "https://ghostwriter.kde.org/";
+ changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda erictapen ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
index 92499645e7..2cc532d251 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/grantleetheme/default.nix
@@ -16,4 +16,8 @@ mkDerivation {
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
];
propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix b/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix
index 545b1a2b69..c4dc46f38a 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,8 @@
extra-cmake-modules, kdoctools,
exiv2, lcms2, cfitsio,
baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
- phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator
+ phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator,
+ wayland, wayland-protocols
}:
mkDerivation {
@@ -19,6 +20,7 @@ mkDerivation {
baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
exiv2 lcms2 cfitsio
qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator
+ wayland wayland-protocols
];
propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
index 9c248f199a..2e10c129ee 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/incidenceeditor.nix
@@ -17,4 +17,8 @@ mkDerivation {
kldap kmime pimcommon qtbase
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kaccounts-integration.nix b/third_party/nixpkgs/pkgs/applications/kde/kaccounts-integration.nix
index ef69f564f1..069bedcb53 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kaccounts-integration.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kaccounts-integration.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }:
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond, qcoro }:
mkDerivation {
pname = "kaccounts-integration";
@@ -19,5 +19,6 @@ mkDerivation {
kwallet
accounts-qt
signond
+ qcoro
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix b/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix
index 1bf6f3d1e1..30303cc497 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix
@@ -1,6 +1,5 @@
{ lib
, mkDerivation
-, fetchFromGitLab
, cmake
, extra-cmake-modules
, makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kalk.nix b/third_party/nixpkgs/pkgs/applications/kde/kalk.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/kalk.nix
rename to third_party/nixpkgs/pkgs/applications/kde/kalk.nix
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix b/third_party/nixpkgs/pkgs/applications/kde/kasts.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix
rename to third_party/nixpkgs/pkgs/applications/kde/kasts.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kate.nix b/third_party/nixpkgs/pkgs/applications/kde/kate.nix
index de76a476df..646fedba15 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kate.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kate.nix
@@ -4,8 +4,7 @@
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
- kuserfeedback,
- plasma-framework, qtscript, threadweaver
+ kuserfeedback, plasma-framework, qtscript, threadweaver, qtx11extras
}:
mkDerivation {
@@ -33,8 +32,7 @@ mkDerivation {
kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
- knewstuff
- kuserfeedback
+ knewstuff kuserfeedback qtx11extras
];
propagatedUserEnvPkgs = [ konsole ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kcalutils.nix b/third_party/nixpkgs/pkgs/applications/kde/kcalutils.nix
index 7da9739aad..591e28cd73 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kcalutils.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kcalutils.nix
@@ -17,4 +17,8 @@ mkDerivation {
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kclock.nix b/third_party/nixpkgs/pkgs/applications/kde/kclock.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/kclock.nix
rename to third_party/nixpkgs/pkgs/applications/kde/kclock.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix b/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix
new file mode 100644
index 0000000000..d90d789c57
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix
@@ -0,0 +1,30 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kauth
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+ pname = "kde-inotify-survey";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [
+ kauth
+ kcoreaddons
+ kdbusaddons
+ ki18n
+ knotifications
+ ];
+
+ meta = {
+ description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached";
+ homepage = "https://invent.kde.org/system/kde-inotify-survey";
+ license = lib.licenses.gpl2Plus;
+ maintainers = [];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
index 2ebf9c8894..829f7a26eb 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdebugsettings.nix
@@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
gettext,
- kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
+ kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, kxmlgui,
python3
}:
@@ -16,7 +16,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
+ gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion kxmlgui python3
];
propagatedUserEnvPkgs = [ ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix
index 157ca73ecf..f67a338b34 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix
@@ -16,6 +16,7 @@
, libXtst
, libfakekey
, makeWrapper
+, modemmanager-qt
, pulseaudio-qt
, qca-qt5
, qqc2-desktop-style
@@ -26,6 +27,7 @@
, breeze-icons
, sshfs
, wayland
+, wayland-protocols
, wayland-scanner
, plasma-wayland-protocols
}:
@@ -47,6 +49,7 @@ mkDerivation {
kwayland
libXtst
libfakekey
+ modemmanager-qt
pulseaudio-qt
qca-qt5
qqc2-desktop-style
@@ -55,6 +58,7 @@ mkDerivation {
qtquickcontrols2
qtx11extras
wayland
+ wayland-protocols
wayland-scanner
plasma-wayland-protocols
# otherwise buttons are blank on non-kde
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
index 74ed9386cf..4cff4a84fc 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
+ kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qcoro
}:
mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
+ buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba qcoro ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/keysmith.nix b/third_party/nixpkgs/pkgs/applications/kde/keysmith.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/keysmith.nix
rename to third_party/nixpkgs/pkgs/applications/kde/keysmith.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix b/third_party/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix
index c2f2abcd32..6316a86024 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kidentitymanagement.nix
@@ -17,4 +17,8 @@ mkDerivation {
];
propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kimap.nix b/third_party/nixpkgs/pkgs/applications/kde/kimap.nix
index ece32e3ee0..b910328c2c 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kimap.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kimap.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- cyrus_sasl, kcoreaddons, ki18n, kio, kmime
+ cyrus_sasl, kcoreaddons, ki18n, kio, kmime, kitemmodels
}:
mkDerivation {
@@ -12,6 +12,10 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ ki18n kio ];
- propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
+ propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kio-admin.nix b/third_party/nixpkgs/pkgs/applications/kde/kio-admin.nix
new file mode 100644
index 0000000000..4734d447a1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/kio-admin.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, lib, extra-cmake-modules, qtbase, kio, ki18n, polkit-qt }:
+
+mkDerivation {
+ pname = "kio-admin";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ qtbase kio ki18n polkit-qt ];
+
+ meta = with lib; {
+ description = "Manage files as administrator using the admin:// KIO protocol.";
+ homepage = "https://invent.kde.org/system/kio-admin";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ k900 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix
index d9e8cf8894..cb2ccbb22c 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kio-extras.nix
@@ -3,7 +3,7 @@
exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets,
kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio,
khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc,
- ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib
+ ilmbase, phonon, qtsvg, samba, solid, gperf, taglib
}:
mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
buildInputs = [
exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml
- kpty syntax-highlighting libmtp libssh openexr libtirpc openslp
+ kpty syntax-highlighting libmtp libssh openexr libtirpc
phonon qtsvg samba solid gperf taglib
];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kitinerary.nix b/third_party/nixpkgs/pkgs/applications/kde/kitinerary.nix
index f69e705bb2..d795e4fac4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kitinerary.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kitinerary.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
-, shared-mime-info
+, shared-mime-info, zxing-cpp
}:
mkDerivation {
@@ -16,11 +16,7 @@ mkDerivation {
];
buildInputs = [
qtdeclarative kmime kpkpass poppler
- kcontacts kcalendarcore
- ];
-
- CXXFLAGS = [
- "-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory
+ kcontacts kcalendarcore ki18n zxing-cpp
];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kldap.nix b/third_party/nixpkgs/pkgs/applications/kde/kldap.nix
index 6016cfd090..b7c7777a9a 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kldap.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kldap.nix
@@ -14,4 +14,8 @@ mkDerivation {
buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
propagatedBuildInputs = [ cyrus_sasl openldap ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix b/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix
index a02e7b08aa..fc844796ac 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kleopatra.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
- knotifications, kwindowsystem, kxmlgui, libkleo, kcrash
+ knotifications, kwindowsystem, kxmlgui, libkleo, kcrash, kpipewire
}:
mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
buildInputs = [
boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
- knotifications kwindowsystem kxmlgui libkleo kcrash
+ knotifications kwindowsystem kxmlgui libkleo kcrash kpipewire
];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmailtransport.nix b/third_party/nixpkgs/pkgs/applications/kde/kmailtransport.nix
index 577beb8d5e..ab6700144a 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmailtransport.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kmailtransport.nix
@@ -19,4 +19,8 @@ mkDerivation {
];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmbox.nix b/third_party/nixpkgs/pkgs/applications/kde/kmbox.nix
index d2b4dbde8a..9a835116c4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmbox.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kmbox.nix
@@ -13,4 +13,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kmime qtbase kcodecs ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmime.nix b/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
index 8dfd910eed..fe8442e9d1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kmime.nix
@@ -13,4 +13,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcodecs ki18n qtbase ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/koko.nix b/third_party/nixpkgs/pkgs/applications/kde/koko.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/koko.nix
rename to third_party/nixpkgs/pkgs/applications/kde/koko.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kongress.nix b/third_party/nixpkgs/pkgs/applications/kde/kongress.nix
new file mode 100644
index 0000000000..be5efcdb9e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/kongress.nix
@@ -0,0 +1,36 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcalendarcore
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kirigami2
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+ pname = "kongress";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [
+ qtquickcontrols2
+ kcalendarcore
+ kconfig
+ kcoreaddons
+ kdbusaddons
+ kirigami2
+ ki18n
+ knotifications
+ ];
+
+ meta = {
+ description = "A companion application for conferences";
+ homepage = "https://apps.kde.org/kongress/";
+ license = lib.licenses.gpl3;
+ maintainers = [];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/konsole.nix b/third_party/nixpkgs/pkgs/applications/kde/konsole.nix
index 220cd6a16d..9771e269fa 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/konsole.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/konsole.nix
@@ -4,7 +4,7 @@
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
ki18n, kiconthemes, kinit, kio, knotifications,
knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
- kwindowsystem, kxmlgui, qtscript, knewstuff
+ kwindowsystem, kxmlgui, qtscript, knewstuff, qtmultimedia
}:
mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
buildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
- kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
+ kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff qtmultimedia
];
passthru.tests.test = nixosTests.terminal-emulators.konsole;
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kontactinterface.nix b/third_party/nixpkgs/pkgs/applications/kde/kontactinterface.nix
index b680a088a6..43e09777bd 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kontactinterface.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kontactinterface.nix
@@ -1,7 +1,8 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- kiconthemes, kparts, kwindowsystem, kxmlgui
+ kiconthemes, kparts, kwindowsystem, kxmlgui,
+ qtx11extras
}:
mkDerivation {
@@ -12,7 +13,11 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- kiconthemes kwindowsystem kxmlgui
+ kiconthemes kwindowsystem kxmlgui qtx11extras
];
propagatedBuildInputs = [ kparts ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$out/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix b/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
index 040fbd122e..de5afb72d1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kpimtextedit.nix
@@ -19,4 +19,8 @@ mkDerivation {
];
propagatedBuildInputs = [ ktextwidgets ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix b/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix
index fbfd3fcc8a..0678aa10da 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kpublictransport.nix
@@ -1,6 +1,9 @@
{ mkDerivation
, lib
, extra-cmake-modules
+, qtquickcontrols2
+, networkmanager-qt
+, ki18n
}:
mkDerivation {
@@ -10,4 +13,10 @@ mkDerivation {
maintainers = [ maintainers.samueldr ];
};
nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [
+ qtquickcontrols2
+ networkmanager-qt
+ ki18n
+ ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/krecorder.nix b/third_party/nixpkgs/pkgs/applications/kde/krecorder.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/krecorder.nix
rename to third_party/nixpkgs/pkgs/applications/kde/krecorder.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix
index 65213fa15a..367e9ab010 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix
@@ -1,7 +1,7 @@
{ mkDerivation, lib
, extra-cmake-modules, kdoctools
, kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
+, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire
, libvncserver, libXtst, libXdamage
, qtx11extras, pipewire, plasma-wayland-protocols, wayland
}:
@@ -18,7 +18,7 @@ mkDerivation {
buildInputs = [
libvncserver libXtst libXdamage
kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
- kwindowsystem kxmlgui kwayland
+ kwindowsystem kxmlgui kwayland kpipewire
qtx11extras
pipewire
plasma-wayland-protocols
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/third_party/nixpkgs/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
deleted file mode 100644
index 5f0ad9fac2..0000000000
--- a/third_party/nixpkgs/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
-From: gnidorah
-Date: Fri, 22 Dec 2017 19:32:47 +0300
-Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 83c2bcb..5f6d47c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
- REQUIRED_HEADERS KSMTP_HEADERS
- )
-
--install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
---
-2.15.1
-
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ksmtp/default.nix b/third_party/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
index 1e5a43f352..591426e141 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/ksmtp/default.nix
@@ -13,5 +13,8 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kio kmime ];
propagatedBuildInputs = [ cyrus_sasl ];
- patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$out/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ktnef.nix b/third_party/nixpkgs/pkgs/applications/kde/ktnef.nix
index fec85644aa..4b0e751734 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ktnef.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/ktnef.nix
@@ -15,4 +15,8 @@ mkDerivation {
kcalendarcore kcalutils kcontacts
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/ktrip.nix b/third_party/nixpkgs/pkgs/applications/kde/ktrip.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/ktrip.nix
rename to third_party/nixpkgs/pkgs/applications/kde/ktrip.nix
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix b/third_party/nixpkgs/pkgs/applications/kde/kweather.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/kweather.nix
rename to third_party/nixpkgs/pkgs/applications/kde/kweather.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libgravatar.nix b/third_party/nixpkgs/pkgs/applications/kde/libgravatar.nix
index 2055d7bd36..0335ded006 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libgravatar.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libgravatar.nix
@@ -15,4 +15,8 @@ mkDerivation {
kconfig kio ktextwidgets kwidgetsaddons pimcommon
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libkcddb.nix b/third_party/nixpkgs/pkgs/applications/kde/libkcddb.nix
index 3dde496050..d7523de0db 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkcddb.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libkcddb.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
-, kcodecs, ki18n, kio, kwidgetsaddons
+, kcodecs, ki18n, kio, kwidgetsaddons, kcmutils
, libmusicbrainz5 }:
mkDerivation {
@@ -9,7 +9,7 @@ mkDerivation {
maintainers = with maintainers; [ peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ qtbase ];
+ buildInputs = [ qtbase kcmutils ];
propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libkdepim.nix b/third_party/nixpkgs/pkgs/applications/kde/libkdepim.nix
index 5fafd2e1ef..7e66a17e5d 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkdepim.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libkdepim.nix
@@ -18,4 +18,8 @@ mkDerivation {
kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
kwallet
];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$out/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libkleo.nix b/third_party/nixpkgs/pkgs/applications/kde/libkleo.nix
index 0cd858ea6e..32369495ae 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkleo.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libkleo.nix
@@ -18,4 +18,8 @@ mkDerivation {
];
propagatedBuildInputs = [ qgpgme ];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/mailcommon.nix b/third_party/nixpkgs/pkgs/applications/kde/mailcommon.nix
index af29ff4168..d9885058ef 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/mailcommon.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/mailcommon.nix
@@ -19,4 +19,8 @@ mkDerivation {
kwindowsystem mailimporter messagelib phonon libkdepim
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix b/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix
index 745316fbaf..08503ba9e8 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/mailimporter.nix
@@ -16,4 +16,8 @@ mkDerivation {
akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
kxmlgui libkdepim pimcommon
];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$out/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
index d52989d3ff..abd9382a1f 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/messagelib.nix
@@ -26,4 +26,8 @@ mkDerivation {
qtwebengine
];
outputs = [ "out" "dev" ];
+ postInstall = ''
+ # added as an include directory by cmake files and fails to compile if it's missing
+ mkdir -p "$dev/include/KF5"
+ '';
}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix b/third_party/nixpkgs/pkgs/applications/kde/neochat.nix
similarity index 88%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix
rename to third_party/nixpkgs/pkgs/applications/kde/neochat.nix
index 8b3da82b8b..4df33add67 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/neochat.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/neochat.nix
@@ -1,6 +1,5 @@
-{ gcc12Stdenv
+{ mkDerivation
, lib
-, srcs
, cmake
, extra-cmake-modules
@@ -30,10 +29,8 @@
, sonnet
}:
-# Workaround for AArch64 not using GCC11 yet.
-gcc12Stdenv.mkDerivation rec {
+mkDerivation {
pname = "neochat";
- inherit (srcs.neochat) version src;
nativeBuildInputs = [
cmake
diff --git a/third_party/nixpkgs/pkgs/applications/kde/okular.nix b/third_party/nixpkgs/pkgs/applications/kde/okular.nix
index e2d468b4ff..727fc673b1 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/okular.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/okular.nix
@@ -5,7 +5,7 @@
, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts
, kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler
, qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
-, withSpeech ? true, qtspeech
+, withSpeech ? true, qtspeech, qtx11extras
}:
mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
- qtdeclarative qtsvg threadweaver kcrash chmlib
+ qtdeclarative qtsvg threadweaver kcrash chmlib qtx11extras
] ++ lib.optional withSpeech qtspeech;
# InitialPreference values are too high and end up making okular
diff --git a/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix b/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix
index 896c202529..d82bc3f506 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/pimcommon.nix
@@ -4,7 +4,7 @@
akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
- kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
+ kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine, ktextaddons
}:
mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
buildInputs = [
akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
- kpurpose kwallet kwindowsystem libkdepim qtwebengine
+ kpurpose kwallet kwindowsystem libkdepim qtwebengine ktextaddons
];
propagatedBuildInputs = [
akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix b/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix
similarity index 80%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix
rename to third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix
index c9753babea..555b9f801c 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/plasmatube/default.nix
@@ -11,7 +11,6 @@
, mpv
, qtmultimedia
, qtquickcontrols2
-, yt-dlp
}:
mkDerivation {
@@ -37,15 +36,6 @@ mkDerivation {
gstreamer
]);
- patches = [
- ./0001-Add-placeholders-for-runtime-dependencies.patch
- ];
-
- postPatch = ''
- substituteInPlace src/videomodel.cpp \
- --replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp"
- '';
-
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/qmlkonsole.nix b/third_party/nixpkgs/pkgs/applications/kde/qmlkonsole.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/qmlkonsole.nix
rename to third_party/nixpkgs/pkgs/applications/kde/qmlkonsole.nix
diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
index cbba15beeb..93e3f85639 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
@@ -4,20 +4,30 @@
, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
+, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
+, wrapGAppsHook
}:
mkDerivation {
pname = "spectacle";
- nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
- knewstuff kwayland kcolorpicker kimageannotator
+ knewstuff kwayland kcolorpicker kimageannotator qcoro qtquickcontrols2
+ wayland plasma-wayland-protocols kpurpose kpipewire
];
postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
--replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
'';
+
+ dontWrapGApps = true;
+
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
meta = with lib; {
homepage = "https://apps.kde.org/spectacle/";
diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
index 91f2e0be1c..09fa4856ed 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix
@@ -4,1875 +4,2051 @@
{
akonadi = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-22.12.3.tar.xz";
- sha256 = "18w0rrdqawxsgzzv3a9f6fic0dcj3cgq58xa74d09s7150k377mp";
- name = "akonadi-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-23.04.0.tar.xz";
+ sha256 = "1kjf148mxlsq9gb1civic4vrgmv5izqp2nrlb7iv4hn76zbw6a75";
+ name = "akonadi-23.04.0.tar.xz";
};
};
akonadi-calendar = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-22.12.3.tar.xz";
- sha256 = "1bksdbghqzql055lz7k90npjd7ql925ykpprshdgsaf3kxrw9qpb";
- name = "akonadi-calendar-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-calendar-23.04.0.tar.xz";
+ sha256 = "1nkc1vdsm5mc26hslm96f3pwcwd1wjra88a1s58rrbr0x1vcyn7f";
+ name = "akonadi-calendar-23.04.0.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-tools-22.12.3.tar.xz";
- sha256 = "0fi96vdh92y9in1yzphc59zjnisd9i9wck1d28542c2s2qbmjmcn";
- name = "akonadi-calendar-tools-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-calendar-tools-23.04.0.tar.xz";
+ sha256 = "1wav48zg9hxh9s80w3096v7528cyskqjr0hq8vizgs3vbhdkk0db";
+ name = "akonadi-calendar-tools-23.04.0.tar.xz";
};
};
akonadi-contacts = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-contacts-22.12.3.tar.xz";
- sha256 = "1vh34g7665all7bxps3akxvlg40rhddrwk8mw9nfpv4gfzyqv33p";
- name = "akonadi-contacts-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-contacts-23.04.0.tar.xz";
+ sha256 = "0fzqsx0j26hwn8nm55cnd4ibhisdn99g1w31kfkzvm13hw2idn5g";
+ name = "akonadi-contacts-23.04.0.tar.xz";
};
};
akonadi-import-wizard = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-import-wizard-22.12.3.tar.xz";
- sha256 = "0j7jav3nymhajwwhixapip9dvw7gx8wcjrf94ap1d1xr44kvmh32";
- name = "akonadi-import-wizard-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-import-wizard-23.04.0.tar.xz";
+ sha256 = "16ym0dsvrrrax3araz0626sh6yja2apw2hv2z4mg2yh2gzcccs89";
+ name = "akonadi-import-wizard-23.04.0.tar.xz";
};
};
akonadi-mime = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-mime-22.12.3.tar.xz";
- sha256 = "00y1w9nzvdy7124552gi587z320c17gfqghxacvc45hiwq4c5p45";
- name = "akonadi-mime-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-mime-23.04.0.tar.xz";
+ sha256 = "105pjp303jyc5x1j7d8cxvzr1snd50i0qhvnvb4yyzi7rv2pa4m9";
+ name = "akonadi-mime-23.04.0.tar.xz";
};
};
akonadi-notes = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-notes-22.12.3.tar.xz";
- sha256 = "13gc8ihraqh80a467cw7q9yf9h4l5m55n27h38inj4aw503zb4j7";
- name = "akonadi-notes-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-notes-23.04.0.tar.xz";
+ sha256 = "0gzr9zcx1vyl8c273pb9mskfv6qxjyq2mq4kzkc19bhnk3w4zxn4";
+ name = "akonadi-notes-23.04.0.tar.xz";
};
};
akonadi-search = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadi-search-22.12.3.tar.xz";
- sha256 = "1hp5aq4w85fwml8r45q6gxwss2ihh6rsb3hdhxsdsvyyx5lr0mqv";
- name = "akonadi-search-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadi-search-23.04.0.tar.xz";
+ sha256 = "18bg2qn041skiscqv63273g6hfz6nvl5dcjrnr8l51zc08wqkla6";
+ name = "akonadi-search-23.04.0.tar.xz";
};
};
akonadiconsole = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akonadiconsole-22.12.3.tar.xz";
- sha256 = "0ch93g5dajgp96yzsrh9sj0xbhy494bci1xx8jrfz6zdl3m6l9hr";
- name = "akonadiconsole-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akonadiconsole-23.04.0.tar.xz";
+ sha256 = "018sdkd6fpca9jcdbapb9582ga3gzv4gxxp7yaxg3a5k03rmbp50";
+ name = "akonadiconsole-23.04.0.tar.xz";
};
};
akregator = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/akregator-22.12.3.tar.xz";
- sha256 = "1zrcfw9h8plrmba7ax0pg34mc8zgqc4yvb8bvqfcq635ahgb9cdm";
- name = "akregator-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/akregator-23.04.0.tar.xz";
+ sha256 = "0zh05vbrac59j9fwrsnva0445m6r3345dd96ljyxi5w312nhkv9f";
+ name = "akregator-23.04.0.tar.xz";
+ };
+ };
+ alligator = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/alligator-23.04.0.tar.xz";
+ sha256 = "1zdm37bzbczd5149zynd6wxk51ipccmifr1if0km2igg5ajw687s";
+ name = "alligator-23.04.0.tar.xz";
};
};
analitza = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/analitza-22.12.3.tar.xz";
- sha256 = "155rv5lg4acf5bpamv2ksw63m61zndmjybvh64mr9cdgpip2db3r";
- name = "analitza-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/analitza-23.04.0.tar.xz";
+ sha256 = "137iq0mwyiy007kbm78xv3szzmr7zp89pc80lajng5q76c6ynybx";
+ name = "analitza-23.04.0.tar.xz";
+ };
+ };
+ angelfish = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/angelfish-23.04.0.tar.xz";
+ sha256 = "06v9y3fn1i213rffvyrsj68pjpw76b5svlqvqvjkmp6q17rap543";
+ name = "angelfish-23.04.0.tar.xz";
};
};
ark = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ark-22.12.3.tar.xz";
- sha256 = "06kw6l0r0ynfcaq0icw55xs3yimbl3ybw717i08ksg96ks9rggl2";
- name = "ark-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ark-23.04.0.tar.xz";
+ sha256 = "1r9haddbzbqzngv7867v49rffmv0z9w56sbg37y9gi2w1834armf";
+ name = "ark-23.04.0.tar.xz";
};
};
artikulate = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/artikulate-22.12.3.tar.xz";
- sha256 = "1lpx9rwcfsyhwxa9xzggy2l8kdbrjcfvccb4m309j2ww4n0ym6ij";
- name = "artikulate-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/artikulate-23.04.0.tar.xz";
+ sha256 = "0kd1grmbp9q2ax0bzay19xqlv1hb66s58rsxvlhjdyz9lcn6y7fl";
+ name = "artikulate-23.04.0.tar.xz";
};
};
audiocd-kio = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/audiocd-kio-22.12.3.tar.xz";
- sha256 = "19fi0ph9h5hk2n55qmg3jygq8zzynjz8xxyca2k60z0d426m23mq";
- name = "audiocd-kio-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/audiocd-kio-23.04.0.tar.xz";
+ sha256 = "11z7kdr4xi3361qds6glhs61i9szm08k2pi5bj07vd8rah5nigzy";
+ name = "audiocd-kio-23.04.0.tar.xz";
+ };
+ };
+ audiotube = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/audiotube-23.04.0.tar.xz";
+ sha256 = "0lcxbsajdz34mnjchkbx8nj4iddyqhsjyclyfywknyn8w23vh8mi";
+ name = "audiotube-23.04.0.tar.xz";
};
};
baloo-widgets = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/baloo-widgets-22.12.3.tar.xz";
- sha256 = "0cl4n591yjw6i6wjav56pq0070cn514ydqcap1jhkpw7xhi0d785";
- name = "baloo-widgets-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/baloo-widgets-23.04.0.tar.xz";
+ sha256 = "15aw2ark1nh99adk49lcj33fpci8g6f9d610xkd77rr786g3pbjf";
+ name = "baloo-widgets-23.04.0.tar.xz";
};
};
blinken = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/blinken-22.12.3.tar.xz";
- sha256 = "0kn04iagw9dkpn1l75c9djl20waiyay4dxfs8iq8r7l6ai36v806";
- name = "blinken-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/blinken-23.04.0.tar.xz";
+ sha256 = "03snnh5cdqcjga525bjl5hnnhwbgv9khpqq32z5v9glp97qddp2x";
+ name = "blinken-23.04.0.tar.xz";
};
};
bomber = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/bomber-22.12.3.tar.xz";
- sha256 = "0jwgrca2lq3jg42kk2211040s0z8667ckmh32vip267h2zvs33jd";
- name = "bomber-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/bomber-23.04.0.tar.xz";
+ sha256 = "0lrg5agkkxm0xfjgid2y3vvrbyc73vayfd5y5bhmvcc9j4962dqy";
+ name = "bomber-23.04.0.tar.xz";
};
};
bovo = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/bovo-22.12.3.tar.xz";
- sha256 = "12rffxwshsbmzi3cflx5dl1hpr3nwdx0680qpzpi86vsk46jj9zs";
- name = "bovo-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/bovo-23.04.0.tar.xz";
+ sha256 = "1m7wf4mahcn41b3j6inil0wmwhazb96dbwky1czgplhvm3ijpv31";
+ name = "bovo-23.04.0.tar.xz";
};
};
calendarsupport = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/calendarsupport-22.12.3.tar.xz";
- sha256 = "1dbvn1n947r4miabh2hqfgfs2b02i0wdvd0dxlpmc44xm2r0a8ka";
- name = "calendarsupport-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/calendarsupport-23.04.0.tar.xz";
+ sha256 = "1jij2a8dqhski6m2rs0r2vpbyn4bpw9m8mysfj5bbn68dv3crw1a";
+ name = "calendarsupport-23.04.0.tar.xz";
+ };
+ };
+ calindori = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/calindori-23.04.0.tar.xz";
+ sha256 = "0c14gbf3h50g049kl4npirrdb3x20sr23r2la2nbgb2x057b65x6";
+ name = "calindori-23.04.0.tar.xz";
};
};
cantor = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/cantor-22.12.3.tar.xz";
- sha256 = "0awjlnqwvy003gpsmyhp3g865xfxfl1h3vmqgxhrjwwgnv0f4xxn";
- name = "cantor-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/cantor-23.04.0.tar.xz";
+ sha256 = "19zw91v4snxh18l3n0i8mik8f1rczcd7n520m4rr7kay0v03p7j4";
+ name = "cantor-23.04.0.tar.xz";
};
};
cervisia = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/cervisia-22.12.3.tar.xz";
- sha256 = "0ksvidsvnzc678gar1dry5yv535x9q022c4cxspl02kyiaqwm2y2";
- name = "cervisia-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/cervisia-23.04.0.tar.xz";
+ sha256 = "00p4x68zrh6njnaz6pjd0ai3h4z3ax5ic8w195dcymkd1s4jfvdj";
+ name = "cervisia-23.04.0.tar.xz";
};
};
colord-kde = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/colord-kde-22.12.3.tar.xz";
- sha256 = "0k2qjhlwdm4q7xhlzwxhafcf4fq88saq3v8m4m50xs2gipanmvxf";
- name = "colord-kde-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/colord-kde-23.04.0.tar.xz";
+ sha256 = "1p4p7j6qswk99xzm99x1s2ci6qsvw38hnxzrp885cpfq85wkl02i";
+ name = "colord-kde-23.04.0.tar.xz";
};
};
dolphin = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/dolphin-22.12.3.tar.xz";
- sha256 = "0nhbfra4gkk5338fhv91gbndznr3mkki7m1kcvrzs91x067m79qs";
- name = "dolphin-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/dolphin-23.04.0.tar.xz";
+ sha256 = "0l3c015z737l88m97rpp3nanrci5zvgzn96lhwsja2837f52cjfd";
+ name = "dolphin-23.04.0.tar.xz";
};
};
dolphin-plugins = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/dolphin-plugins-22.12.3.tar.xz";
- sha256 = "0fglzs9gix4lqnrb4h3bw4dxxmzx6gmv1dbc5q52q3k1ihgi9fyb";
- name = "dolphin-plugins-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/dolphin-plugins-23.04.0.tar.xz";
+ sha256 = "1mnhmv7zrnai8ns06cwsdmj7afhsbq1d32vsqy3w8h37kh9di938";
+ name = "dolphin-plugins-23.04.0.tar.xz";
};
};
dragon = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/dragon-22.12.3.tar.xz";
- sha256 = "1qiq626wm1skrcz2xvhadr8d3rxypvhal1f8ii9qgra1nwhbmxls";
- name = "dragon-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/dragon-23.04.0.tar.xz";
+ sha256 = "1fx9r74y5hf1w8c9m3z7jk25l5sgx1gb8ji7pzpj7779igbw7if4";
+ name = "dragon-23.04.0.tar.xz";
};
};
elisa = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/elisa-22.12.3.tar.xz";
- sha256 = "0gxjrf5vxxaz3pwq2vnibxmsw0ppmp1cdkjysg6sl1zy5rj2zcbr";
- name = "elisa-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/elisa-23.04.0.tar.xz";
+ sha256 = "0qsdg1bp2l1nb8spla1g200swxncq7kli1qs0x5868gps0n5g1m0";
+ name = "elisa-23.04.0.tar.xz";
};
};
eventviews = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/eventviews-22.12.3.tar.xz";
- sha256 = "0s9n7gq6s4dc5xrx1snc9c4qp79il1r55mjkcjjc7a38h1j0xzrn";
- name = "eventviews-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/eventviews-23.04.0.tar.xz";
+ sha256 = "03a3yiyljiyzlwrxywyl3lp2fnzwdfs5fszvcmm3cw04ahzq7aqn";
+ name = "eventviews-23.04.0.tar.xz";
};
};
falkon = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/falkon-22.12.3.tar.xz";
- sha256 = "081cf6qs3ziimzmhx2m976i3cfn0d89ncaxnnmqbamalsdvs5hcf";
- name = "falkon-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/falkon-23.04.0.tar.xz";
+ sha256 = "0x0jq3vr2w5fkqvbpvpw9zn072b9syf2yvxdy2kqn073x2yj86cz";
+ name = "falkon-23.04.0.tar.xz";
};
};
ffmpegthumbs = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ffmpegthumbs-22.12.3.tar.xz";
- sha256 = "14y1w7v34ilmbs4hb1sypgmq67cxrik5yfa63z1wlvmx3ww37w7s";
- name = "ffmpegthumbs-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ffmpegthumbs-23.04.0.tar.xz";
+ sha256 = "0p3giicpp7a5vr7vq4lpsnan47g1k7s0v1jbiq6makjlyzch93fc";
+ name = "ffmpegthumbs-23.04.0.tar.xz";
};
};
filelight = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/filelight-22.12.3.tar.xz";
- sha256 = "105v861b8w3a89rng7agjhhcx4kh58djrpi6n0azd6r01f8yxhmc";
- name = "filelight-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/filelight-23.04.0.tar.xz";
+ sha256 = "09hg0n9bm9v22g48jmfhh69j9dl0a6y56aqgq2hyzbpfsw74baic";
+ name = "filelight-23.04.0.tar.xz";
+ };
+ };
+ ghostwriter = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/ghostwriter-23.04.0.tar.xz";
+ sha256 = "1ymwsg9a9x7a18kgir5ji76salll39llqkwsd4qwhnb4nfl7q31x";
+ name = "ghostwriter-23.04.0.tar.xz";
};
};
granatier = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/granatier-22.12.3.tar.xz";
- sha256 = "1l8w9frqnh6lqyq8345igilsabavg37wk8vaabzjh4bg5lv5ngxl";
- name = "granatier-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/granatier-23.04.0.tar.xz";
+ sha256 = "0qp7d9hxzjqnr2ap9icbl99r33xn9d6yfzgi640bjri49607c1dh";
+ name = "granatier-23.04.0.tar.xz";
};
};
grantlee-editor = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/grantlee-editor-22.12.3.tar.xz";
- sha256 = "09rrgqwjk1430vl84bp3xm3wbfdm0kz952kk723jz9b7xhm0sz0k";
- name = "grantlee-editor-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/grantlee-editor-23.04.0.tar.xz";
+ sha256 = "0mf2f08i1fabs3s23i1p0014c8rsphnksxq9r79rkmi96dzppg92";
+ name = "grantlee-editor-23.04.0.tar.xz";
};
};
grantleetheme = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/grantleetheme-22.12.3.tar.xz";
- sha256 = "0lpsjj8k3dq0b9i2q9psk1smgkh07kjc7bsha3z0kxwy7ldadaz4";
- name = "grantleetheme-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/grantleetheme-23.04.0.tar.xz";
+ sha256 = "15bkmgkkg2paanva0hwgq8dlbqh43041jjfvc454cms8rga64r2w";
+ name = "grantleetheme-23.04.0.tar.xz";
};
};
gwenview = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/gwenview-22.12.3.tar.xz";
- sha256 = "0q2l01zapw6lnm6qcsp3vhvbfsq837hzszmmzb2w7xnpaq4wf7aa";
- name = "gwenview-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/gwenview-23.04.0.tar.xz";
+ sha256 = "0355fsf5kaiv1p29qz7alp4n0gyzfcrji3ysn0k7blqv8ys82gdn";
+ name = "gwenview-23.04.0.tar.xz";
};
};
incidenceeditor = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/incidenceeditor-22.12.3.tar.xz";
- sha256 = "15g9432175wqrkl5s9mj558lyrc2bdc7w54skkwkaai14i14s0pm";
- name = "incidenceeditor-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/incidenceeditor-23.04.0.tar.xz";
+ sha256 = "0j0c06yr86l5pmjpsdq144sga31fap51z0f2bp565c89wiia24ci";
+ name = "incidenceeditor-23.04.0.tar.xz";
};
};
itinerary = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/itinerary-22.12.3.tar.xz";
- sha256 = "1qlx401vw6xh6hdcypvzm7wbcw72ljkzaxp6sywpcdz4xfpkdml0";
- name = "itinerary-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/itinerary-23.04.0.tar.xz";
+ sha256 = "0zpac80f56bmy90jhv6iwa3qn0vb3kaijyc5imbw4iiqdv1z32j3";
+ name = "itinerary-23.04.0.tar.xz";
};
};
juk = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/juk-22.12.3.tar.xz";
- sha256 = "0y3v0754ax0w6zn9rbydl0jfshgpm5czcckyz3vp7p2sv2bkmqmc";
- name = "juk-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/juk-23.04.0.tar.xz";
+ sha256 = "0ij8galk8g8pcdy9ax4b6cyjrw6gpcwfka7fhj1jnzrxl5c2sbwq";
+ name = "juk-23.04.0.tar.xz";
};
};
k3b = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/k3b-22.12.3.tar.xz";
- sha256 = "0alavrz6rd8i1amb06b0fynadygqsh9pwx9njvli6gl959paj94r";
- name = "k3b-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/k3b-23.04.0.tar.xz";
+ sha256 = "0gh1ib5q8l41891ba1lw89xhsfpq90z9dnyzahq9n3850d0i4m4b";
+ name = "k3b-23.04.0.tar.xz";
};
};
kaccounts-integration = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-integration-22.12.3.tar.xz";
- sha256 = "0rp8km77vbrjmxyg1sizq6cprl7hjx1x31qqj12pnr35vmzbi8fa";
- name = "kaccounts-integration-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kaccounts-integration-23.04.0.tar.xz";
+ sha256 = "1676i8fw8cs8ibc09wni1054nm56nah1rqxygai7d8wwazvqq1ls";
+ name = "kaccounts-integration-23.04.0.tar.xz";
};
};
kaccounts-providers = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-providers-22.12.3.tar.xz";
- sha256 = "1x1lf24aw9phyr20cjfqhwmmlb6r1iqlb4kvk39hdjzapzw3g505";
- name = "kaccounts-providers-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kaccounts-providers-23.04.0.tar.xz";
+ sha256 = "07kvahlnxgcqmnqb6yzgk2vxgk46y5h5qcfjlvara62vrwx82dyg";
+ name = "kaccounts-providers-23.04.0.tar.xz";
};
};
kaddressbook = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kaddressbook-22.12.3.tar.xz";
- sha256 = "1dhcifdm15q0har47z9xicjgk5rffr8q7l6bvzza5i281nkxbdby";
- name = "kaddressbook-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kaddressbook-23.04.0.tar.xz";
+ sha256 = "0v69q1s1vwwqrifkwlrs28bbzyjf5dn0s20v0fadz9cq1mn7749w";
+ name = "kaddressbook-23.04.0.tar.xz";
};
};
kajongg = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kajongg-22.12.3.tar.xz";
- sha256 = "13bn6mgfbjxpp4xp6xn3nbxjrxfhxblvjnhjcvc3qxcbkjniqzlh";
- name = "kajongg-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kajongg-23.04.0.tar.xz";
+ sha256 = "013p7smfsmdp6j7cwdca0n0616jyn8y2rrq3lxgv997ngb4bsc9h";
+ name = "kajongg-23.04.0.tar.xz";
};
};
kalarm = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kalarm-22.12.3.tar.xz";
- sha256 = "074c99an6hawvklgpm6jc415cffa8fadv7r1c5sbiydl7jxkwlh5";
- name = "kalarm-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kalarm-23.04.0.tar.xz";
+ sha256 = "0cd1b8jhnkizj9yy77gd0hz8r5ya8fqng91ggxc0xicqk4w4db9s";
+ name = "kalarm-23.04.0.tar.xz";
};
};
kalendar = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kalendar-22.12.3.tar.xz";
- sha256 = "1d82hs7dlrpixfp097i7kh3s1hi23h61cb491rbx0y76c2kp9ian";
- name = "kalendar-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kalendar-23.04.0.tar.xz";
+ sha256 = "0rl7yrknvbipn04f4rznqgddic3rhyxip5ljv3qmgis49gxk2qzf";
+ name = "kalendar-23.04.0.tar.xz";
};
};
kalgebra = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kalgebra-22.12.3.tar.xz";
- sha256 = "1rv72c3z1zwbym4lrmd1k9mnsh6bk3jhgwg9jynlsbn68wwk2d6y";
- name = "kalgebra-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kalgebra-23.04.0.tar.xz";
+ sha256 = "16pvs4qbwx7k7sz1wk7dl2p1d90clgzpcn9xg0vwqg9qzs7f31dl";
+ name = "kalgebra-23.04.0.tar.xz";
+ };
+ };
+ kalk = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kalk-23.04.0.tar.xz";
+ sha256 = "1xhz1igya9b3g6p3xs90p6ax663biszh27i5biw954h2vjyx3csb";
+ name = "kalk-23.04.0.tar.xz";
};
};
kalzium = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kalzium-22.12.3.tar.xz";
- sha256 = "0vd6r2n3vlszwn4qnapasczgkmi7llh8izk1mn4cfc3dprp2jq8b";
- name = "kalzium-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kalzium-23.04.0.tar.xz";
+ sha256 = "0vl17ni60q8y2rh8ihh9gvqq6f231aclvyiv110bqxhhlmy63jrp";
+ name = "kalzium-23.04.0.tar.xz";
};
};
kamera = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kamera-22.12.3.tar.xz";
- sha256 = "03hfc8rb3ykkmcgyjvm8ywxr5cs98zr6yk468n380pax523c958h";
- name = "kamera-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kamera-23.04.0.tar.xz";
+ sha256 = "1a0x92xm9c62mvav2w7iymjyabzw34d6l5ia4p2aji761lynzghj";
+ name = "kamera-23.04.0.tar.xz";
};
};
kamoso = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kamoso-22.12.3.tar.xz";
- sha256 = "1pisjv5c8d79j8hvssajwc60w1dkp0xnmlask15qaywk1a8ql7p4";
- name = "kamoso-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kamoso-23.04.0.tar.xz";
+ sha256 = "1whj3h328vmnfxw4fn4g223sia17rjn81z670pi8fq318l76kf3a";
+ name = "kamoso-23.04.0.tar.xz";
};
};
kanagram = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kanagram-22.12.3.tar.xz";
- sha256 = "1cliapj1lshs153h012wkqsl6366x96pp69wrn5k70bkxa2pr7hl";
- name = "kanagram-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kanagram-23.04.0.tar.xz";
+ sha256 = "1jhx5l0d15pajpw30v7gpxp9rlhg38sk8sm05lwmzvw41r5jqcas";
+ name = "kanagram-23.04.0.tar.xz";
};
};
kapman = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kapman-22.12.3.tar.xz";
- sha256 = "0wy1b60gpwl6495kq06jxrc604y5k0cglhg9brvqd15yqvrpiwm7";
- name = "kapman-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kapman-23.04.0.tar.xz";
+ sha256 = "0d3078sy9zlnqfz1wdvyfcgf09awz3xajm9xyk4bcgk4viyb7748";
+ name = "kapman-23.04.0.tar.xz";
};
};
kapptemplate = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kapptemplate-22.12.3.tar.xz";
- sha256 = "0v115r2b108l22bf4vyqhw71mnqzkb30vsy7k385hjirzkpfjx1h";
- name = "kapptemplate-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kapptemplate-23.04.0.tar.xz";
+ sha256 = "0yq3z8mfai1b1h4w59f0nzkr7sxh33cr1zmzmv02rp4i96bvm2ak";
+ name = "kapptemplate-23.04.0.tar.xz";
+ };
+ };
+ kasts = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kasts-23.04.0.tar.xz";
+ sha256 = "0kqkx5i8yw0139kycxy51akrxxi2zikhvqcjzfnncn7pr8bkcpwq";
+ name = "kasts-23.04.0.tar.xz";
};
};
kate = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kate-22.12.3.tar.xz";
- sha256 = "0gj4iwc5bs5kb4m92h4gq47cyyny866rk8d03lqcghyhvaw0bysv";
- name = "kate-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kate-23.04.0.tar.xz";
+ sha256 = "038w3kyca2dm498g3rg4dis1z8r2bqamq1z3lwvpkylq3x83772q";
+ name = "kate-23.04.0.tar.xz";
};
};
katomic = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/katomic-22.12.3.tar.xz";
- sha256 = "064khd6c2zrw02f0jjp52qmx073p0zrlzn9vbqbq6rswpzbskam8";
- name = "katomic-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/katomic-23.04.0.tar.xz";
+ sha256 = "16ym7c4w58krdxq0qplfyz9bifdbc5phz4dd69p4zwrl5bq7ibfk";
+ name = "katomic-23.04.0.tar.xz";
};
};
kbackup = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kbackup-22.12.3.tar.xz";
- sha256 = "04nq7sfynk9bsb1jhra7qrhiyc8hm2gwyb4x68jsqajszl3krjqg";
- name = "kbackup-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kbackup-23.04.0.tar.xz";
+ sha256 = "1wzdkcnbqxzwwjvya7ii3fm65p0kmmbsbxpys9cwd5q4cjk9fjvc";
+ name = "kbackup-23.04.0.tar.xz";
};
};
kblackbox = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kblackbox-22.12.3.tar.xz";
- sha256 = "0gn1kj5az1i35jfcsj2dbx8h2ndq5iiqjwhv3v0gil98vfk11zxi";
- name = "kblackbox-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kblackbox-23.04.0.tar.xz";
+ sha256 = "1qmkfvgnx9kmvb9cl3jkqpicwxgrvy6irpgbwwxnncphbcpchja9";
+ name = "kblackbox-23.04.0.tar.xz";
};
};
kblocks = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kblocks-22.12.3.tar.xz";
- sha256 = "0pnad7p16cfb8arffn0b019ciq0li6bnb7qmwr32jad6gvjhnbx4";
- name = "kblocks-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kblocks-23.04.0.tar.xz";
+ sha256 = "04kxwsw9xm8a45ynz6ja0zzkgh4wy3kl9ryghhyklffy2q8q3w2j";
+ name = "kblocks-23.04.0.tar.xz";
};
};
kbounce = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kbounce-22.12.3.tar.xz";
- sha256 = "1hjw9g0wivxyr6qd08dfbqlfhynvaxg5hfr2zrl6kh0fh7wywzpi";
- name = "kbounce-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kbounce-23.04.0.tar.xz";
+ sha256 = "0mdzn74bbg11mzzmgfn7yd97qss8ciqb4cgwpj7y1z4br64k9ywr";
+ name = "kbounce-23.04.0.tar.xz";
};
};
kbreakout = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kbreakout-22.12.3.tar.xz";
- sha256 = "0s32fq3dlakql44db4grizgs0gaavm4scsn8vjj7rabqwmqx2nxs";
- name = "kbreakout-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kbreakout-23.04.0.tar.xz";
+ sha256 = "0i5a8zpj3kqcwm3w6ipb2y0030li487wr287ks0gam9wbgmsw2ck";
+ name = "kbreakout-23.04.0.tar.xz";
};
};
kbruch = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kbruch-22.12.3.tar.xz";
- sha256 = "0pr1440p8cwwf9pixli5si1imj0sxlhkpadjmzy58hdwi5yf8dxg";
- name = "kbruch-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kbruch-23.04.0.tar.xz";
+ sha256 = "0mgn7iylpsw2hcy2cqvs4s70jqnf1x0346r2zdsbfv1nzn5g8m3h";
+ name = "kbruch-23.04.0.tar.xz";
};
};
kcachegrind = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcachegrind-22.12.3.tar.xz";
- sha256 = "1c2azm416xn33val3bf3q9ffa2bva0hqngfh6kd28x96vrj7chr7";
- name = "kcachegrind-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcachegrind-23.04.0.tar.xz";
+ sha256 = "1i1840imhh76rwxrw0f404da4k5mj48ra220j5v6hxfajicz88g7";
+ name = "kcachegrind-23.04.0.tar.xz";
};
};
kcalc = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcalc-22.12.3.tar.xz";
- sha256 = "16gxpxnydqcg59i15dsrbz85wcy7jrr9bqbdcnbl03jiwqjkkrjj";
- name = "kcalc-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcalc-23.04.0.tar.xz";
+ sha256 = "0snsfzlw6nsn01lin9nqg8rpiqwldbsbhyh0l7nnp8lg7kab6sfj";
+ name = "kcalc-23.04.0.tar.xz";
};
};
kcalutils = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcalutils-22.12.3.tar.xz";
- sha256 = "0szw42iyrqxfxq8hy5fnn0iyjxj9l9dwy1z3r6v578390z98gqig";
- name = "kcalutils-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcalutils-23.04.0.tar.xz";
+ sha256 = "0yakkg08190ynpxk3q0pbci6dqi3ifiwwvknwhggfla1z21xqqlv";
+ name = "kcalutils-23.04.0.tar.xz";
};
};
kcharselect = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcharselect-22.12.3.tar.xz";
- sha256 = "1pd3f9vcjfdqfrniz3adksvjq3hkdpdxvhx04qrv0dbq05qzah1l";
- name = "kcharselect-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcharselect-23.04.0.tar.xz";
+ sha256 = "08jdn9gnvpn3jqflkvk66a46m45n62cz83i2jvj0bfsq8binajs7";
+ name = "kcharselect-23.04.0.tar.xz";
+ };
+ };
+ kclock = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kclock-23.04.0.tar.xz";
+ sha256 = "17hw14rsv289ri40y0mc240znvyhkyw237qn7jsvg26y6llflxvx";
+ name = "kclock-23.04.0.tar.xz";
};
};
kcolorchooser = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcolorchooser-22.12.3.tar.xz";
- sha256 = "0h6s4r739n1s54kvn2vsq825qigpdyan2jma9195xf2w5ix42im0";
- name = "kcolorchooser-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcolorchooser-23.04.0.tar.xz";
+ sha256 = "0hlkr3haq998bqrp8hhidvizbvfp997wl4vb6v5k66x9r8jwz5ir";
+ name = "kcolorchooser-23.04.0.tar.xz";
};
};
kcron = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kcron-22.12.3.tar.xz";
- sha256 = "0khqkdgzbxckksy95p4hqqjyk0gv6vi508gf40zy7mwsjzg04jgb";
- name = "kcron-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kcron-23.04.0.tar.xz";
+ sha256 = "0nav7lw81v4nd83nrb7g4526zd31cxfc0ja4d6c35m731jycpd70";
+ name = "kcron-23.04.0.tar.xz";
};
};
kde-dev-scripts = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-scripts-22.12.3.tar.xz";
- sha256 = "0y8jhxcbdmb3kq6aq4zpq80p6flgfxqw12v3phqrma7jzxfbi79c";
- name = "kde-dev-scripts-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kde-dev-scripts-23.04.0.tar.xz";
+ sha256 = "1018mlw151bsn9cbxkvalwqwv7r9gyysldzk6mv5xy0y0zvqr04n";
+ name = "kde-dev-scripts-23.04.0.tar.xz";
};
};
kde-dev-utils = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-utils-22.12.3.tar.xz";
- sha256 = "022vx350xn8kmwvfniclc06qdixw5gi5v70n5alcrw5h7j3l0y10";
- name = "kde-dev-utils-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kde-dev-utils-23.04.0.tar.xz";
+ sha256 = "1hqwrx7qf9ff02yk2psn0zsmby3qh7mvlhsw39nnnqr6gy9kcgg2";
+ name = "kde-dev-utils-23.04.0.tar.xz";
+ };
+ };
+ kde-inotify-survey = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kde-inotify-survey-23.04.0.tar.xz";
+ sha256 = "1g8xw6ir75la212mwp5pq3m99qc3x25sdh7hc6k4ilnsarxinn34";
+ name = "kde-inotify-survey-23.04.0.tar.xz";
};
};
kdebugsettings = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdebugsettings-22.12.3.tar.xz";
- sha256 = "12hhimcclp5xm9wpb027d5j25k9n9q6iqyclpgd4gdcclmzcgmiv";
- name = "kdebugsettings-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdebugsettings-23.04.0.tar.xz";
+ sha256 = "0sycqjlm1109p2rp8079m9529i0zxjwsmvl1xyh40yw2wy5is5gy";
+ name = "kdebugsettings-23.04.0.tar.xz";
};
};
kdeconnect-kde = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdeconnect-kde-22.12.3.tar.xz";
- sha256 = "16c0p8liq8mw56yczq1zckwbpys874f9i43ii9y6j0avfvldxnib";
- name = "kdeconnect-kde-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdeconnect-kde-23.04.0.tar.xz";
+ sha256 = "178139w3y9g9gnqjvjl6dmm3947n9ah2wbl7nwqfx26n7z8f1fl0";
+ name = "kdeconnect-kde-23.04.0.tar.xz";
};
};
kdeedu-data = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdeedu-data-22.12.3.tar.xz";
- sha256 = "1j4x84qhrx5qhp87xmhy11szjx8mzvyg824dxvh9rr7aqycr8543";
- name = "kdeedu-data-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdeedu-data-23.04.0.tar.xz";
+ sha256 = "0njslxdvk9b3h0mpkmck23v6zxy7cz6g42rh2qf1gmhgwkb8p2xg";
+ name = "kdeedu-data-23.04.0.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-mobipocket-22.12.3.tar.xz";
- sha256 = "1wd8z2jkcys91wghp2xfvxm3dhps13agyq98k71069xi77b26h2g";
- name = "kdegraphics-mobipocket-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdegraphics-mobipocket-23.04.0.tar.xz";
+ sha256 = "1hmh88ax4d5z12yaqnl39j29j7dz8n8nh783c3y9hh31hfikjy15";
+ name = "kdegraphics-mobipocket-23.04.0.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-thumbnailers-22.12.3.tar.xz";
- sha256 = "027hlv38f9185pvkjaalyffciskcpahrj1l541sykrbdl9pqy0h7";
- name = "kdegraphics-thumbnailers-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdegraphics-thumbnailers-23.04.0.tar.xz";
+ sha256 = "0qnm6v8bbpm6zfxnvg74f7a677i0jj5x2qfnmc0093ra81rligxx";
+ name = "kdegraphics-thumbnailers-23.04.0.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdenetwork-filesharing-22.12.3.tar.xz";
- sha256 = "1yr7lh46x20b6ra5ax8ikvwy3cr5whz9jmyg7282niw1vjk52pj8";
- name = "kdenetwork-filesharing-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdenetwork-filesharing-23.04.0.tar.xz";
+ sha256 = "0hdw3cis6380l8vvj5gng18qxylpan2i74vq3v1byrdbpzp6f9wl";
+ name = "kdenetwork-filesharing-23.04.0.tar.xz";
};
};
kdenlive = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdenlive-22.12.3.tar.xz";
- sha256 = "0s9wgii294irbxcg9rgnjpwpq0d54zjf1h2900bh6brhwfxhrvkj";
- name = "kdenlive-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdenlive-23.04.0.tar.xz";
+ sha256 = "0slfqjpxkc2nlwshfsw7qrvpcrdhv9cxb69l8fwnxr8l4yv7v8gb";
+ name = "kdenlive-23.04.0.tar.xz";
};
};
kdepim-addons = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdepim-addons-22.12.3.tar.xz";
- sha256 = "0yapb2mq5jk6pysdi95s4ivrdlxap08lh97r2kd95v06028b95bd";
- name = "kdepim-addons-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdepim-addons-23.04.0.tar.xz";
+ sha256 = "1m9785hy7lfwm4m3499c67vi1c6a23y5dcd5pskhaxg5ii4hdd4z";
+ name = "kdepim-addons-23.04.0.tar.xz";
};
};
kdepim-runtime = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdepim-runtime-22.12.3.tar.xz";
- sha256 = "0mvjnzncx52dsr54g6ra8hj06gayxw85chc8ywdv154sch3pbc3x";
- name = "kdepim-runtime-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdepim-runtime-23.04.0.tar.xz";
+ sha256 = "0jbrg70949bqbx1mlfqqak21dg81jvbll6wpb0f4fmai4fj3kjvf";
+ name = "kdepim-runtime-23.04.0.tar.xz";
};
};
kdesdk-kio = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-kio-22.12.3.tar.xz";
- sha256 = "0j3bh7dxgx2javsb3v4c53i15a85x6k00kq0myj9l9272jl9wqbb";
- name = "kdesdk-kio-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdesdk-kio-23.04.0.tar.xz";
+ sha256 = "1bbrh0zyvkyxfb35hh3qdpnfqgjc1qdyc6z9mrn22bgjb73bd8iz";
+ name = "kdesdk-kio-23.04.0.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-thumbnailers-22.12.3.tar.xz";
- sha256 = "0l1hhygdvqcp9rxwwvl0y1is8z86vsqppijvmjvhyyfm6fn5kkg6";
- name = "kdesdk-thumbnailers-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdesdk-thumbnailers-23.04.0.tar.xz";
+ sha256 = "1zb341mwra444bg4bgn1dr9kb9di66hv7kr60pvmdkbf8nqk7q6y";
+ name = "kdesdk-thumbnailers-23.04.0.tar.xz";
};
};
kdev-php = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdev-php-22.12.3.tar.xz";
- sha256 = "1iki8zj4a5z69wv7nvycn3fqfndxgqrcaxy9nn4xd97i7bdfzrm8";
- name = "kdev-php-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdev-php-23.04.0.tar.xz";
+ sha256 = "0zjbv33c8f9z0mcij7r6jm4q41n98c6m2k91dxxhvalvygrxslmy";
+ name = "kdev-php-23.04.0.tar.xz";
};
};
kdev-python = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdev-python-22.12.3.tar.xz";
- sha256 = "0ybfjgdbfwk9hhvh2h1grzkl3zzkqd6bysbrbfkpbhi3kx8l0rps";
- name = "kdev-python-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdev-python-23.04.0.tar.xz";
+ sha256 = "0rldq0x019vbp2r490bamqv8cl64zxi15xl3piczqivw01wjvnv5";
+ name = "kdev-python-23.04.0.tar.xz";
};
};
kdevelop = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdevelop-22.12.3.tar.xz";
- sha256 = "0hq6y0qf572fsqxf5h4k7jxqxdp08d57hx1gw2v6ca5dl69dmrfa";
- name = "kdevelop-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdevelop-23.04.0.tar.xz";
+ sha256 = "1l5lpmd3q0b5h0r4mfmp3fxmc4hv2hhy8cilzzig5gb8xj3x27wd";
+ name = "kdevelop-23.04.0.tar.xz";
};
};
kdf = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdf-22.12.3.tar.xz";
- sha256 = "157bk2mgn7dqn97lnnbhcy9aanymdzx6lgp4wf9camrlkpzlmv20";
- name = "kdf-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdf-23.04.0.tar.xz";
+ sha256 = "1cksxdm63y0k4vkyvjmrwrzmbh4zf6k90bazmrhl1nmhla5lcvnf";
+ name = "kdf-23.04.0.tar.xz";
};
};
kdialog = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdialog-22.12.3.tar.xz";
- sha256 = "0bgcrc0dqjqc4i2c965bkv4jckmj2v4vgga3s7wa1hx8j1qwm323";
- name = "kdialog-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdialog-23.04.0.tar.xz";
+ sha256 = "1binhhlj3wazkiyy6sa9vxwqcn2q607gagi97w94sl4in6yim8sa";
+ name = "kdialog-23.04.0.tar.xz";
};
};
kdiamond = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kdiamond-22.12.3.tar.xz";
- sha256 = "0xf4ganqm6wvzvqi1sy4wy8nh53779fx894kn0khawxivav69r6c";
- name = "kdiamond-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kdiamond-23.04.0.tar.xz";
+ sha256 = "1zxdaqyskqr247yd2850y68difr3wmxik6wn5jx5g65wpi5jimqd";
+ name = "kdiamond-23.04.0.tar.xz";
};
};
keditbookmarks = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/keditbookmarks-22.12.3.tar.xz";
- sha256 = "0b1bpqaf3v4y668sspzangsh6jw9hp3li8a9smkg61qnpxlv0ix6";
- name = "keditbookmarks-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/keditbookmarks-23.04.0.tar.xz";
+ sha256 = "12jmqccr8j1kn2mxs3gc7ymvdb4q4lrg4vxrxfgf73dchp69c0nx";
+ name = "keditbookmarks-23.04.0.tar.xz";
+ };
+ };
+ keysmith = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/keysmith-23.04.0.tar.xz";
+ sha256 = "19vliz3v8ba9i5v8zx5x001xj51z38cfzsap4b1vmyvhni7pywg8";
+ name = "keysmith-23.04.0.tar.xz";
};
};
kfind = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kfind-22.12.3.tar.xz";
- sha256 = "1a0ms6cnzbq3p20q6vfc0m1zddpsdxsaw0y6dsfz804gy1lswk7x";
- name = "kfind-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kfind-23.04.0.tar.xz";
+ sha256 = "1ssc6vslqad56wbfqygws78qvqyzh453crh0vmxrls7dx0vz61p8";
+ name = "kfind-23.04.0.tar.xz";
};
};
kfloppy = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kfloppy-22.12.3.tar.xz";
- sha256 = "119m06av50fj5sbbhdcwcjkwxz7jmzhdl74x7g6k742bzf6nn2b6";
- name = "kfloppy-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kfloppy-23.04.0.tar.xz";
+ sha256 = "0rjz3lw13d9yx0s994fm4lhzb3h3fzcfgxkisjrmgi4dq7x4psd9";
+ name = "kfloppy-23.04.0.tar.xz";
};
};
kfourinline = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kfourinline-22.12.3.tar.xz";
- sha256 = "1b8w96n788md83r8kjk21wjc3wplbsfq385jrcxq1ivjfyzjzzps";
- name = "kfourinline-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kfourinline-23.04.0.tar.xz";
+ sha256 = "1dic48qy2ppapxy8pn819x0wb6b5hmyp3wlqyqz4a5zsqhz170yc";
+ name = "kfourinline-23.04.0.tar.xz";
};
};
kgeography = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kgeography-22.12.3.tar.xz";
- sha256 = "0i7d2n3a2phgvlr3zw2w8lq4mfw2l818z52fqc4y30n85gvzs0m2";
- name = "kgeography-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kgeography-23.04.0.tar.xz";
+ sha256 = "10mmfpmpazmh7qln1y891h33asqbfrkgpascpi8wyfcfsf1cjgvz";
+ name = "kgeography-23.04.0.tar.xz";
};
};
kget = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kget-22.12.3.tar.xz";
- sha256 = "048i7ny857k8fsx3ybmcq316pfxlrag06b11l868hrhxnj361mk1";
- name = "kget-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kget-23.04.0.tar.xz";
+ sha256 = "1wj500xkhlq5kcqnlnn04x3j30p0z1pm7fjpq9j8l64nv3rb451b";
+ name = "kget-23.04.0.tar.xz";
};
};
kgoldrunner = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kgoldrunner-22.12.3.tar.xz";
- sha256 = "10g85x4hks3p35smvfj69g1gfaaggzsms3nqrpmqp5b949z6zjrn";
- name = "kgoldrunner-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kgoldrunner-23.04.0.tar.xz";
+ sha256 = "13wvxvjlqxni6kr3n7fsxy17s9cxylnwj2jwbnayhsp8n971gb2h";
+ name = "kgoldrunner-23.04.0.tar.xz";
};
};
kgpg = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kgpg-22.12.3.tar.xz";
- sha256 = "1qrkgq4q391s20azrs8d2nm9x1raz8fbx7yxkg13mcc4gp7zzvp6";
- name = "kgpg-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kgpg-23.04.0.tar.xz";
+ sha256 = "11qh9h65ww419cv4cj9ypbdfmbp783ybjjswsll0kv95r5myz18b";
+ name = "kgpg-23.04.0.tar.xz";
};
};
khangman = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/khangman-22.12.3.tar.xz";
- sha256 = "1p1szzisdhsbbid6nb7cngapvpw025263d1lfp03r0x767r5w9zx";
- name = "khangman-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/khangman-23.04.0.tar.xz";
+ sha256 = "18dqgkylxyicr4d2ycpjy9ap2r4pz69m9zpvpj3mhx51qywb8cd2";
+ name = "khangman-23.04.0.tar.xz";
};
};
khelpcenter = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/khelpcenter-22.12.3.tar.xz";
- sha256 = "1sv1rpdr57rp2yyfvyfw2iy1k2cq0k0bszd40gb009r0f6zywy0i";
- name = "khelpcenter-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/khelpcenter-23.04.0.tar.xz";
+ sha256 = "1gxm6fm0hr99mb7jphb4hx80k8n8jx8frrawnkw9nwkq0815vq5n";
+ name = "khelpcenter-23.04.0.tar.xz";
};
};
kidentitymanagement = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kidentitymanagement-22.12.3.tar.xz";
- sha256 = "0nr1172ajn4n09zk7dxd1zfsmcrcy50mlmisv9bby7c0lmwzv1pf";
- name = "kidentitymanagement-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kidentitymanagement-23.04.0.tar.xz";
+ sha256 = "167hzf079qi13siy36g4ljjfzirh1182ra63z4lsvpi4sh7nva2r";
+ name = "kidentitymanagement-23.04.0.tar.xz";
};
};
kig = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kig-22.12.3.tar.xz";
- sha256 = "1ndiwmgg2bawq2is4sspdrssfwamnkpghpq81bs5lxazi0ixnyk5";
- name = "kig-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kig-23.04.0.tar.xz";
+ sha256 = "0rb2qfh9l16nk8yfg1xzlc5nf0vdh9mrxi3804h0xcy0ck081np4";
+ name = "kig-23.04.0.tar.xz";
};
};
kigo = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kigo-22.12.3.tar.xz";
- sha256 = "1j5pplhyb6cq76b4avflw0rb4r8lmkas38mh70s2mjw5c8mj19gg";
- name = "kigo-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kigo-23.04.0.tar.xz";
+ sha256 = "0348lmd84gv5qz2d0pk2wrhmkam14737016hdxn8fm1g14q81qgq";
+ name = "kigo-23.04.0.tar.xz";
};
};
killbots = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/killbots-22.12.3.tar.xz";
- sha256 = "1xchgipbs61azzcf0qjm1liwdkppg7nml9ga0mwswhzpw9ylp5yi";
- name = "killbots-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/killbots-23.04.0.tar.xz";
+ sha256 = "0fpsxs10vx65wk48iskmf3x3spf1zcpjg710lm50anwakc2v4kzp";
+ name = "killbots-23.04.0.tar.xz";
};
};
kimagemapeditor = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kimagemapeditor-22.12.3.tar.xz";
- sha256 = "0f2nif2wlcgql345xfg1h0x31ms2l6w1i8wwc2iy0a679971w8mx";
- name = "kimagemapeditor-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kimagemapeditor-23.04.0.tar.xz";
+ sha256 = "0fagwdhm706lnyrj8q0przpvzas6xsajwwvc2gr3gfc12f2mgv3b";
+ name = "kimagemapeditor-23.04.0.tar.xz";
};
};
kimap = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kimap-22.12.3.tar.xz";
- sha256 = "1xn5gmry4fgm9yc5z6dn9g7yp2hyjry5r5fvkdhm3jh3n11bgq6j";
- name = "kimap-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kimap-23.04.0.tar.xz";
+ sha256 = "0r5izw3rscmynj72f7a6v3ra5mi6vgw24scvmak6h8ya4zwhzhk4";
+ name = "kimap-23.04.0.tar.xz";
+ };
+ };
+ kio-admin = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kio-admin-23.04.0.tar.xz";
+ sha256 = "1s5a21biixvcfsdfasfqpig54waifzcyds5w99in1zxd59kg7qwi";
+ name = "kio-admin-23.04.0.tar.xz";
};
};
kio-extras = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kio-extras-22.12.3.tar.xz";
- sha256 = "15qh2w6fm1j33scvlb2cjjimvfvisa0vp7d5n4mwm82s15a7ahv5";
- name = "kio-extras-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kio-extras-23.04.0.tar.xz";
+ sha256 = "1lb0gfyyqs5d7xxvzxg4x0q063q04jf3zgmc0cn9qq3d4xj73f8d";
+ name = "kio-extras-23.04.0.tar.xz";
};
};
kio-gdrive = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kio-gdrive-22.12.3.tar.xz";
- sha256 = "12r44b68vyzc1yhfm4pmp7g1af2ysqybvjzr12pl8xw4zgyd3qd3";
- name = "kio-gdrive-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kio-gdrive-23.04.0.tar.xz";
+ sha256 = "0hjlbdw7cm75hrj5nxxfjn2fxscjqrs9chz2cc4wkk40sf5fx61r";
+ name = "kio-gdrive-23.04.0.tar.xz";
};
};
kio-zeroconf = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kio-zeroconf-22.12.3.tar.xz";
- sha256 = "1azx6f6dh2nwmzp4vbn4qwxlh4f4zxq211p4pqvf29yi2fyp8ix1";
- name = "kio-zeroconf-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kio-zeroconf-23.04.0.tar.xz";
+ sha256 = "0n78qkn9pjm63pb9p2xngyma3aplhhrw47j3g4gq7izhpmwxzisz";
+ name = "kio-zeroconf-23.04.0.tar.xz";
};
};
kipi-plugins = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kipi-plugins-22.12.3.tar.xz";
- sha256 = "1zfp05biddxpggl3b158dg2sdjrqp8rdbymqfbr9p3w7gl6hk7av";
- name = "kipi-plugins-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kipi-plugins-23.04.0.tar.xz";
+ sha256 = "19jrr20b3h1yh6gvjpbnr9902lwll16pf5m277kin6sc4n1lwlah";
+ name = "kipi-plugins-23.04.0.tar.xz";
};
};
kirigami-gallery = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kirigami-gallery-22.12.3.tar.xz";
- sha256 = "1zbsnfs25nqkwfqhkjn7idcypzhzfb0ldjxarlp104ycjh70v5ls";
- name = "kirigami-gallery-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kirigami-gallery-23.04.0.tar.xz";
+ sha256 = "1bfh6ynx5jk5216mmms6ll0md7phcpjwcjs8g3k99cbnccfgh80h";
+ name = "kirigami-gallery-23.04.0.tar.xz";
};
};
kiriki = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kiriki-22.12.3.tar.xz";
- sha256 = "05csmqy7kdn5kga1lrg6bf7qjg36w7wyd23c0nnizzh51d7h13f7";
- name = "kiriki-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kiriki-23.04.0.tar.xz";
+ sha256 = "0ify2g0cd5aagbl3q27k57zlcrcswgsnsp3ii732fywwi6mgllv7";
+ name = "kiriki-23.04.0.tar.xz";
};
};
kiten = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kiten-22.12.3.tar.xz";
- sha256 = "0xqj62hwlqsar1ziwgzrmk7bj9hqwwxpfwhrfm661vib0qsn82kn";
- name = "kiten-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kiten-23.04.0.tar.xz";
+ sha256 = "1aa37is7l09phn6r8pi6xcdpzmdmd1c1i06cshxnklqsh0186a3f";
+ name = "kiten-23.04.0.tar.xz";
};
};
kitinerary = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kitinerary-22.12.3.tar.xz";
- sha256 = "0qrfhrf9fgslagds6qr46a9p5iwzy5d07ilk8r29xcvm6l9s95x6";
- name = "kitinerary-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kitinerary-23.04.0.tar.xz";
+ sha256 = "07xb25q4r5w8yzxm1r9x1ra9lffqrh2h29nc9v6r2mcbjm388yds";
+ name = "kitinerary-23.04.0.tar.xz";
+ };
+ };
+ kjournald = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kjournald-23.04.0.tar.xz";
+ sha256 = "1dnbpvs3cdj9bbp1xayprhh0y03wlkbxs7ch7j63082dk8ps345s";
+ name = "kjournald-23.04.0.tar.xz";
};
};
kjumpingcube = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kjumpingcube-22.12.3.tar.xz";
- sha256 = "09wg0k92yb4wfqfq3hhai2rbviwpj7kwgi3m19dv1xr40n7kfgaz";
- name = "kjumpingcube-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kjumpingcube-23.04.0.tar.xz";
+ sha256 = "0swgngmqf87d87xrah8ipzr3xljrbm5w4rl2q3sj5l7cw4f09ldw";
+ name = "kjumpingcube-23.04.0.tar.xz";
};
};
kldap = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kldap-22.12.3.tar.xz";
- sha256 = "0a0cmr7vjpk7c0mkgvbnf65qq24dqwx8f1cyv6phfb6yr8ffwcqd";
- name = "kldap-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kldap-23.04.0.tar.xz";
+ sha256 = "0cafm0llr46lmzravgfkh1rgy55xix4sp3jb6fpqq6820l66jymj";
+ name = "kldap-23.04.0.tar.xz";
};
};
kleopatra = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kleopatra-22.12.3.tar.xz";
- sha256 = "15nrg63xyb2jaxix8ijnp3ikbnj74d430ilvxa9k7kbzjp59kw9i";
- name = "kleopatra-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kleopatra-23.04.0.tar.xz";
+ sha256 = "1xpr2q5718jyhdgrnpkq52177fr4nhmskac87p5s2q8yc22m0jwq";
+ name = "kleopatra-23.04.0.tar.xz";
};
};
klettres = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/klettres-22.12.3.tar.xz";
- sha256 = "09s2fiyqhbr9jhm76v84rlzvrbcbwrra1m3ajbf2vkrk7fiwaav2";
- name = "klettres-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/klettres-23.04.0.tar.xz";
+ sha256 = "0a2ifnhnsmvsl8vs118mjb43bfq5hx5c4w3zalx5jlq8f9q7wy7j";
+ name = "klettres-23.04.0.tar.xz";
};
};
klickety = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/klickety-22.12.3.tar.xz";
- sha256 = "10xiwd1yr1y7gfw7hb8qsxs2x689xsxcimwdnwyi6bcy5kcj63zi";
- name = "klickety-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/klickety-23.04.0.tar.xz";
+ sha256 = "1addg9797bpzi3a1hnq1xva50bq5vv0w0v97hp1qncg1jh8b0ffk";
+ name = "klickety-23.04.0.tar.xz";
};
};
klines = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/klines-22.12.3.tar.xz";
- sha256 = "1l3j4ig2sjga64vrl75z409dy0kgc2f784ggza94v6hklq39p06z";
- name = "klines-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/klines-23.04.0.tar.xz";
+ sha256 = "087sh57kyq37kmxpxsiqh4yxpv7j59wq69k576bwcl7hlqknbz29";
+ name = "klines-23.04.0.tar.xz";
};
};
kmag = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmag-22.12.3.tar.xz";
- sha256 = "0lj6glichvs0wk9fdzznplas3mdvi98m6m92whimgvkj4fslwknv";
- name = "kmag-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmag-23.04.0.tar.xz";
+ sha256 = "01xjs7bvdra5gigcvgnx71yqqqhhxjzr5nzrpwlck1z9378xirkg";
+ name = "kmag-23.04.0.tar.xz";
};
};
kmahjongg = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmahjongg-22.12.3.tar.xz";
- sha256 = "1rsvk0vy85z27g0ldli8lm6bqywggvwp0kkz860yfjnlbi0wznxr";
- name = "kmahjongg-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmahjongg-23.04.0.tar.xz";
+ sha256 = "1r4rwhy3m25002qnc2l35my2hla9xzhmsjbikv6n7r9wfvmyr0nm";
+ name = "kmahjongg-23.04.0.tar.xz";
};
};
kmail = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmail-22.12.3.tar.xz";
- sha256 = "13h2s78bsmzbdc45iixvpc6ba23zng2f579s81935pvcb412lvbq";
- name = "kmail-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmail-23.04.0.tar.xz";
+ sha256 = "1fyr3w6c1plm41px97vma2yf7n5f6jrh68plk1w507ggvm5ws1ja";
+ name = "kmail-23.04.0.tar.xz";
};
};
kmail-account-wizard = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmail-account-wizard-22.12.3.tar.xz";
- sha256 = "0ij54xx7clz7nxgfzw3kf9xjb84qn1llm041x0l6cydfhw60bjw8";
- name = "kmail-account-wizard-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmail-account-wizard-23.04.0.tar.xz";
+ sha256 = "1i0q6pkfz7lra5921fmcbwli4qna6slhph74f21ggmbhj2zw66hz";
+ name = "kmail-account-wizard-23.04.0.tar.xz";
};
};
kmailtransport = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmailtransport-22.12.3.tar.xz";
- sha256 = "1h53mmd25ydyqdazn4h9k2gq24d694khdbwsb0dpw7fv4x9ihvyk";
- name = "kmailtransport-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmailtransport-23.04.0.tar.xz";
+ sha256 = "1by6jsrry5s8xb510m14bknryviwhsk6yak9igh7s6xlcgbd2723";
+ name = "kmailtransport-23.04.0.tar.xz";
};
};
kmbox = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmbox-22.12.3.tar.xz";
- sha256 = "0wshp1i789j3ijn6p230xx0bdkpx439imaif5acxw0m9bjrvbfrd";
- name = "kmbox-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmbox-23.04.0.tar.xz";
+ sha256 = "0srq4rf18cs0zmqplf3i6vilsjpavzkfkiwm0izqv3imnmzzi1ym";
+ name = "kmbox-23.04.0.tar.xz";
};
};
kmime = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmime-22.12.3.tar.xz";
- sha256 = "1n6353diasl50xd280ydpdmg3c1966q5sxfx8h96gbjfcqgiyg4v";
- name = "kmime-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmime-23.04.0.tar.xz";
+ sha256 = "0jxjj60ba7hvm51lhaamra09qpvgjj7ky8salhrs6q20cjnv1kx3";
+ name = "kmime-23.04.0.tar.xz";
};
};
kmines = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmines-22.12.3.tar.xz";
- sha256 = "05zmhzh09bdgi3jx2hv2m1lycnj6ifhgr86l2jkqfby6yl6n7sf6";
- name = "kmines-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmines-23.04.0.tar.xz";
+ sha256 = "1hvq88gp3dd2gpklv1zfsr1yskvkr79r2zkmlbwa2fdls5nqlgxf";
+ name = "kmines-23.04.0.tar.xz";
};
};
kmix = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmix-22.12.3.tar.xz";
- sha256 = "0s8ff91daa9gf90vz39hzryv19biy4jlvn1slimqvbrlpvii7p2v";
- name = "kmix-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmix-23.04.0.tar.xz";
+ sha256 = "1f3gwkpdn0zzigx1kw74gpxwsvpy72k2pfiy5nb3nhdk5ji0lgjj";
+ name = "kmix-23.04.0.tar.xz";
};
};
kmousetool = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmousetool-22.12.3.tar.xz";
- sha256 = "1j2gqdbrif78cp0jvxhq1dmj5vrqdmnqaipx478h50r8ykzc8yfs";
- name = "kmousetool-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmousetool-23.04.0.tar.xz";
+ sha256 = "0151fwjzlcpkgiadq18hx6x0rrab2zakd6rzcwvzijqj4hdqlgfd";
+ name = "kmousetool-23.04.0.tar.xz";
};
};
kmouth = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmouth-22.12.3.tar.xz";
- sha256 = "1kp03hr07qk8707zqvlh3w6hsdmv6ry9gaydi3klc832w57y21b9";
- name = "kmouth-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmouth-23.04.0.tar.xz";
+ sha256 = "0z2xjn1dg15nwxib2lj84k7sjhv8vjddy0m902mw8mfa5hhrd5ic";
+ name = "kmouth-23.04.0.tar.xz";
};
};
kmplot = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kmplot-22.12.3.tar.xz";
- sha256 = "0hg77qg6yzhk7d7jfbp1544qlmw5wwgv97p9p992lxcm234h560j";
- name = "kmplot-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kmplot-23.04.0.tar.xz";
+ sha256 = "1g3n6mwa0ysrm1f0l9j6klm59d8hb9dz93mfzvni5ffj9d0p1ksx";
+ name = "kmplot-23.04.0.tar.xz";
};
};
knavalbattle = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/knavalbattle-22.12.3.tar.xz";
- sha256 = "17zsmk7n2cxdfaxk63c958aydparcca2dw10yfdafq4a3wjhnqqf";
- name = "knavalbattle-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/knavalbattle-23.04.0.tar.xz";
+ sha256 = "12hqw8p5c5v8vq5y8d3kbxw0jwsnzkszh6b5gpk2xi1jif9r9yih";
+ name = "knavalbattle-23.04.0.tar.xz";
};
};
knetwalk = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/knetwalk-22.12.3.tar.xz";
- sha256 = "16p57ixq1h8wfv4ggv91m8d8pfjy486phi2yvsxnkib12yiv13yj";
- name = "knetwalk-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/knetwalk-23.04.0.tar.xz";
+ sha256 = "0b2r4x5lbv9bgxfa4nq0rm0lfcjw9s8gqnpiivxc5m1p61db2cms";
+ name = "knetwalk-23.04.0.tar.xz";
};
};
knights = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/knights-22.12.3.tar.xz";
- sha256 = "1rc2xrb6s1ncqnbbxr5c3ccy98mk2ljhxp32nmfzxd6l97qm0mnj";
- name = "knights-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/knights-23.04.0.tar.xz";
+ sha256 = "09cqh1m371s021f9pp9bagblbbkxx69v30c9yzhf2s417q64fzq6";
+ name = "knights-23.04.0.tar.xz";
};
};
knotes = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/knotes-22.12.3.tar.xz";
- sha256 = "1nav1c1q65f3zsrwyq2j5nikhxp4mz45yg0zfymw24n4qi2b9xc2";
- name = "knotes-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/knotes-23.04.0.tar.xz";
+ sha256 = "148wsjp2m76sh90swrijy4zn5dm0r7ss5jynjwrxdvij6bf700v8";
+ name = "knotes-23.04.0.tar.xz";
+ };
+ };
+ koko = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/koko-23.04.0.tar.xz";
+ sha256 = "1rk7m9n8icqn5yamfnna491vllmkb15k32vvi4ggp70apxqnv6lk";
+ name = "koko-23.04.0.tar.xz";
};
};
kolf = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kolf-22.12.3.tar.xz";
- sha256 = "01czns2gqvjnydc2bz8y2gq4m4lz50l9z71i0nf3nidihvgs96vl";
- name = "kolf-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kolf-23.04.0.tar.xz";
+ sha256 = "19gai1l7wp78gz07ix0d576n0ysr56xavsr11ag9hbs8fzca0zlg";
+ name = "kolf-23.04.0.tar.xz";
};
};
kollision = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kollision-22.12.3.tar.xz";
- sha256 = "1dfr4ghg9yly0fv8fyjcs4ahf2xp9c08sssli1kph6qspvpmd8qq";
- name = "kollision-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kollision-23.04.0.tar.xz";
+ sha256 = "0lnk289967gxgpxk2jzm55vf96znpdpqqd50wshhxybmgg0kcfdc";
+ name = "kollision-23.04.0.tar.xz";
};
};
kolourpaint = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kolourpaint-22.12.3.tar.xz";
- sha256 = "1gwpf5rb1hx49a18d5hd4l4p72bpgamy4yqiyixa75hmxhj09kwq";
- name = "kolourpaint-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kolourpaint-23.04.0.tar.xz";
+ sha256 = "0s12glgh9sh3k82kk0yh7vkm3gkwyc8dnpllx9kv6qmc8r3l60wf";
+ name = "kolourpaint-23.04.0.tar.xz";
};
};
kompare = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kompare-22.12.3.tar.xz";
- sha256 = "0bg76vgz6b6dx0zrnh92r4ny1dh0bdakkyb17jl4fd28crixy4ds";
- name = "kompare-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kompare-23.04.0.tar.xz";
+ sha256 = "0qamyq45k25ny2rzw2fg7573509r85mxwyrjrrqmlp291p043bx4";
+ name = "kompare-23.04.0.tar.xz";
+ };
+ };
+ kongress = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kongress-23.04.0.tar.xz";
+ sha256 = "11lsf9pz0289h650y09b7ivg18kbvsv0cqb4jb437pjz3jmr5yb9";
+ name = "kongress-23.04.0.tar.xz";
};
};
konqueror = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/konqueror-22.12.3.tar.xz";
- sha256 = "1m4szi3jskcjzqdgqqhniydrv8qcbq0p0s8cb6q3b1iap9b509xh";
- name = "konqueror-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/konqueror-23.04.0.tar.xz";
+ sha256 = "11nv9vn2xzbmvi37v56pbfqmmvwkfsm6jcpvwp5p6wf8sjckfn77";
+ name = "konqueror-23.04.0.tar.xz";
};
};
konquest = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/konquest-22.12.3.tar.xz";
- sha256 = "0p2h1vj90p7xg30b5d002kfk724apj0zifi1nk4nlrmnb2iwmani";
- name = "konquest-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/konquest-23.04.0.tar.xz";
+ sha256 = "001zdm2y7358n17h791b5ap4my3nn0694s51vln3ljcdss043pig";
+ name = "konquest-23.04.0.tar.xz";
};
};
konsole = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/konsole-22.12.3.tar.xz";
- sha256 = "0vzqmdn2pl3nxdsvx7db8ah9wklkap729cq41jifpjkf8javraar";
- name = "konsole-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/konsole-23.04.0.tar.xz";
+ sha256 = "1755ny73v8n7vv96c9bxdq81q03ibym352kvq8rimpcsphy6zki1";
+ name = "konsole-23.04.0.tar.xz";
};
};
kontact = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kontact-22.12.3.tar.xz";
- sha256 = "1j10hnp4lk9wsa2m5w00h198wafzvbhz3z28rg2xgwf426q7hp91";
- name = "kontact-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kontact-23.04.0.tar.xz";
+ sha256 = "0vh0z43yr4j941bjlmc0cmvd6ffwzrsqa1fr551m45mfxf62dnqm";
+ name = "kontact-23.04.0.tar.xz";
};
};
kontactinterface = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kontactinterface-22.12.3.tar.xz";
- sha256 = "1nx06c08xi3as8kms9fdbkc35d2m8f0vdskg31khl9wi2c8skxya";
- name = "kontactinterface-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kontactinterface-23.04.0.tar.xz";
+ sha256 = "1fww09n3zmry1pvia05ars28s4gmjsnc8y5aynm9x05lpnd5yiyp";
+ name = "kontactinterface-23.04.0.tar.xz";
};
};
kontrast = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kontrast-22.12.3.tar.xz";
- sha256 = "1hhmjjdpb8ppsv7djxi8dlzmz2chivw9wjpx83vghlyx8463gicc";
- name = "kontrast-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kontrast-23.04.0.tar.xz";
+ sha256 = "0m0j2cmgdiypb292wavln4pw8ddzfbx3lg4cpl0km5i4qh3rs0di";
+ name = "kontrast-23.04.0.tar.xz";
};
};
konversation = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/konversation-22.12.3.tar.xz";
- sha256 = "0p404wpdhsiz9w04kgwx8smmsbnh2szikdkf3c74krcl7w1ksckl";
- name = "konversation-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/konversation-23.04.0.tar.xz";
+ sha256 = "0ra7mb461lnxh4liiq9lpqyxsylyp2wf6n9xislml6cwc164qr4v";
+ name = "konversation-23.04.0.tar.xz";
};
};
kopeninghours = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kopeninghours-22.12.3.tar.xz";
- sha256 = "1p55w3h300gjpyd970l5ka2lfa5srbiprzc50rsanl1z8l9k9zic";
- name = "kopeninghours-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kopeninghours-23.04.0.tar.xz";
+ sha256 = "0vzsrbkxpz4bqgi6vlvz10q61klrpd9iijkvjwziwjkr51wjc55v";
+ name = "kopeninghours-23.04.0.tar.xz";
};
};
kopete = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kopete-22.12.3.tar.xz";
- sha256 = "1r87rck04jws5khim95mq70c7g2yr4kzf5hf8icv5nc4c820im0m";
- name = "kopete-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kopete-23.04.0.tar.xz";
+ sha256 = "0w63si67zm7y9qlakjyywdbwsi5r0s52n79f934239zld3r14piz";
+ name = "kopete-23.04.0.tar.xz";
};
};
korganizer = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/korganizer-22.12.3.tar.xz";
- sha256 = "0hmdmg7njvm12xz64xcasz9bvx72s0f2s1430d6h75b6f2x8fhmc";
- name = "korganizer-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/korganizer-23.04.0.tar.xz";
+ sha256 = "0fibb2y1j6crj7qj4qjk46chi09irki1m16asqd2a6qyspghidj6";
+ name = "korganizer-23.04.0.tar.xz";
};
};
kosmindoormap = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kosmindoormap-22.12.3.tar.xz";
- sha256 = "1m2cyp4irr1r4fssx6pw78f273i6hlzjdqcrrcsh1r01z0klpbzp";
- name = "kosmindoormap-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kosmindoormap-23.04.0.tar.xz";
+ sha256 = "1d5i4m1sjr6nx6q8i9hzrp01593nakjlyfas0hmkqgvfl17ky1bf";
+ name = "kosmindoormap-23.04.0.tar.xz";
};
};
kpat = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kpat-22.12.3.tar.xz";
- sha256 = "0m8kwcf69wxl7x7z6bjkwyf34dwd7qw55pwbsh77wv0l9mk2v8gf";
- name = "kpat-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kpat-23.04.0.tar.xz";
+ sha256 = "0fajsdm523wad5m8mc5y73ijpvxnaakcwkpia53p2i2bca38pblz";
+ name = "kpat-23.04.0.tar.xz";
};
};
kpimtextedit = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kpimtextedit-22.12.3.tar.xz";
- sha256 = "0z4j02g73lrc88rf3b1vjyav6nsqkfwsfw8nxcyf8x51skczchy7";
- name = "kpimtextedit-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kpimtextedit-23.04.0.tar.xz";
+ sha256 = "1wcw644zh7mxg0g4bw69p79z2jfgg6dngw5qnglslwsy9l01js6c";
+ name = "kpimtextedit-23.04.0.tar.xz";
};
};
kpkpass = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kpkpass-22.12.3.tar.xz";
- sha256 = "1pg6p3b41vpg07bf6xfxqw98x8s681h18x0bm5b031ais0p10dv8";
- name = "kpkpass-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kpkpass-23.04.0.tar.xz";
+ sha256 = "0f2bgp977i3p4bcvdc1zvj8971dhqw48glnqh8r99kvjbvri0l7n";
+ name = "kpkpass-23.04.0.tar.xz";
};
};
kpmcore = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kpmcore-22.12.3.tar.xz";
- sha256 = "07mzxb7qjbqkz5khafmyj16yj7221c6pwp0p72ayilwykwwrylsi";
- name = "kpmcore-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kpmcore-23.04.0.tar.xz";
+ sha256 = "0vkiqj203n2s2nlkiiwblnw4zflrfkhbbijd1m72l446ddgn3j0d";
+ name = "kpmcore-23.04.0.tar.xz";
};
};
kpublictransport = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kpublictransport-22.12.3.tar.xz";
- sha256 = "1ljxz5dl4rpkdbm1jqlhnzls1cjmcyya1q5q7pzdwr99czs7jpwc";
- name = "kpublictransport-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kpublictransport-23.04.0.tar.xz";
+ sha256 = "00q6cmjdcjff4xiz4ca0hq45z36ni0nw2v22km75f2jjsnxk040z";
+ name = "kpublictransport-23.04.0.tar.xz";
};
};
kqtquickcharts = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kqtquickcharts-22.12.3.tar.xz";
- sha256 = "1rv4fava7zjhvdxgj1l6lh823fz93dpawmgdkjw95y1h2fc85jd1";
- name = "kqtquickcharts-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kqtquickcharts-23.04.0.tar.xz";
+ sha256 = "0bcshq397av63k32ql55c2zrlgwdmjpmds30a0wgx4r3qd97ay91";
+ name = "kqtquickcharts-23.04.0.tar.xz";
};
};
krdc = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/krdc-22.12.3.tar.xz";
- sha256 = "1pyxx48vkjidzrivccpz55ys1b3bipdd8pkfz1sn3b70vw4h3rs2";
- name = "krdc-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/krdc-23.04.0.tar.xz";
+ sha256 = "1njzm3lszdv3jfs4m8sh4pjv7c9a3a518cz9w1063df63cpp4fbi";
+ name = "krdc-23.04.0.tar.xz";
+ };
+ };
+ krecorder = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/krecorder-23.04.0.tar.xz";
+ sha256 = "05npzjm3qpaj6dkffyijmc4kxwpf7hfb7pyc9dxmq1szgd05cz39";
+ name = "krecorder-23.04.0.tar.xz";
};
};
kreversi = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kreversi-22.12.3.tar.xz";
- sha256 = "1cwl9yhl54nd7wqasfic09a6lwjz65w72kmracknrvihpz4b3ilk";
- name = "kreversi-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kreversi-23.04.0.tar.xz";
+ sha256 = "05sdgjdllqfihirycrd1j90r40cmj2l4fvfphckpjwmlp4x9llcd";
+ name = "kreversi-23.04.0.tar.xz";
};
};
krfb = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/krfb-22.12.3.tar.xz";
- sha256 = "1r4n66abm01n5vkxzpw93f4rgxh963azq8jpkhhhsdlz22wjd3fw";
- name = "krfb-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/krfb-23.04.0.tar.xz";
+ sha256 = "1dmh4yp4mvx5wk6r6vd5dcvs3and328rriy2ng30xg7lg6bs27rj";
+ name = "krfb-23.04.0.tar.xz";
};
};
kross-interpreters = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kross-interpreters-22.12.3.tar.xz";
- sha256 = "1ypi1r62nmw023xr6zsgs9iigmkxpbzmr2j9ibxdpidm2nnjw2w8";
- name = "kross-interpreters-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kross-interpreters-23.04.0.tar.xz";
+ sha256 = "0dyyaj6wdaf0ij1xkf6asxc50nh1wjqlsq3gc4j8s7h1mwbd7asy";
+ name = "kross-interpreters-23.04.0.tar.xz";
};
};
kruler = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kruler-22.12.3.tar.xz";
- sha256 = "0v8qmrgvc8k4cc8rxjvypsfb8j13whpz036kn144hr8jfzb6mb3g";
- name = "kruler-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kruler-23.04.0.tar.xz";
+ sha256 = "0j8b5y7x117phkc4jhq7k8s8jkfl90hfxrdw7ii9imh3h1h0xn37";
+ name = "kruler-23.04.0.tar.xz";
};
};
ksanecore = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksanecore-22.12.3.tar.xz";
- sha256 = "0m3dbx1vww11qg7ydixb75xpazdgxss9fbxhpjpi4m1vv6siq6zg";
- name = "ksanecore-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksanecore-23.04.0.tar.xz";
+ sha256 = "1n42yhvq57873mc5f6ka7f6gqbz5w6n6h1f9l69q5wvwwq7lcd14";
+ name = "ksanecore-23.04.0.tar.xz";
};
};
kshisen = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kshisen-22.12.3.tar.xz";
- sha256 = "0n7vq7qvh0sdnxwv9fvbna4cimbb9002pnx6a56f6i6v0f6i5gyb";
- name = "kshisen-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kshisen-23.04.0.tar.xz";
+ sha256 = "1wmq2b78iqpcg8z1pady3xczqjib6qf71d0d7931lfv4lg145iis";
+ name = "kshisen-23.04.0.tar.xz";
};
};
ksirk = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksirk-22.12.3.tar.xz";
- sha256 = "0vyrlqxp026i8i6f111fsh290jkhdvzhm19s488bdrfm0xhh8y71";
- name = "ksirk-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksirk-23.04.0.tar.xz";
+ sha256 = "04qds90n481j8kkgawyplazhfvpz9vqi5hif2jd68svy1f5jyx52";
+ name = "ksirk-23.04.0.tar.xz";
};
};
ksmtp = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksmtp-22.12.3.tar.xz";
- sha256 = "1yzhf02fn6h7xx7kl9hghbd8ppzx1favgkr0jd7nf6i479n03cw8";
- name = "ksmtp-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksmtp-23.04.0.tar.xz";
+ sha256 = "0lzvg13g6x7gha56f0qvv8wrnrc1wf9mw0mxrb7v4n61bvy8pym0";
+ name = "ksmtp-23.04.0.tar.xz";
};
};
ksnakeduel = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksnakeduel-22.12.3.tar.xz";
- sha256 = "1s8iiknfpi0k1577ywm6d6y4fm92sp7zpwjylf8mys0a6yqbwbfc";
- name = "ksnakeduel-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksnakeduel-23.04.0.tar.xz";
+ sha256 = "06670nks1brkvfvph39qnn48pga1gcwijphpgqxv5rpvcgiapvkd";
+ name = "ksnakeduel-23.04.0.tar.xz";
};
};
kspaceduel = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kspaceduel-22.12.3.tar.xz";
- sha256 = "1lkz6w2is3pjzn1is3zv2yy1vy5pga5jv4y955inm194b94v8amp";
- name = "kspaceduel-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kspaceduel-23.04.0.tar.xz";
+ sha256 = "0058ixgb0d4slp6nsfd85z5icbh7im0p7dvvw391ixcdf72xgv1r";
+ name = "kspaceduel-23.04.0.tar.xz";
};
};
ksquares = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksquares-22.12.3.tar.xz";
- sha256 = "1dqc16bibpykya03104inr8pvn86m174ilrs94y4wc26w21a4i3i";
- name = "ksquares-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksquares-23.04.0.tar.xz";
+ sha256 = "0fv9lv6xkmaa9rbwvjlznmahc6yc0v25aca32da0qy9ck68hqd57";
+ name = "ksquares-23.04.0.tar.xz";
};
};
ksudoku = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksudoku-22.12.3.tar.xz";
- sha256 = "1sk7cs521jgdlr51wpm9vdxv8m83nwgd02y4qkx705f0hvqmwwb9";
- name = "ksudoku-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksudoku-23.04.0.tar.xz";
+ sha256 = "0s0g5x8qp45k3havp48s7bp98afy10dmnlh7n2g54mwn807my55h";
+ name = "ksudoku-23.04.0.tar.xz";
};
};
ksystemlog = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ksystemlog-22.12.3.tar.xz";
- sha256 = "0plf5p34l8727xdy5mlvv7wlkfb15xip7jdraifnvkiy9x82gk05";
- name = "ksystemlog-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ksystemlog-23.04.0.tar.xz";
+ sha256 = "0hkzirpc3mfxm264fm6r51d3qjcs3gn4jqiz7b48g821jr99rxqc";
+ name = "ksystemlog-23.04.0.tar.xz";
};
};
kteatime = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kteatime-22.12.3.tar.xz";
- sha256 = "1wjr2nndrflly27dvp9gbgvk25cvm2nd32h0whb399dwl3niva1f";
- name = "kteatime-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kteatime-23.04.0.tar.xz";
+ sha256 = "1abwks7hwlcvrzl8j9q4v279kvi99m8vlf2fw371mzv9pxifbwfq";
+ name = "kteatime-23.04.0.tar.xz";
};
};
ktimer = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktimer-22.12.3.tar.xz";
- sha256 = "1kxpnlz8k5hxbp4irbnhnz52jxfwh1yz9d63l8dxhw3likcbp52j";
- name = "ktimer-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktimer-23.04.0.tar.xz";
+ sha256 = "1fd8bwj0k5qdppjbx6hhk6cxp1hh9g97cdllbqgy9i8g5n9inzx4";
+ name = "ktimer-23.04.0.tar.xz";
};
};
ktnef = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktnef-22.12.3.tar.xz";
- sha256 = "08j7a0lzkqxb2s2fzm5h26i560lk4l1f3r4wjb24znf1rk9zjslj";
- name = "ktnef-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktnef-23.04.0.tar.xz";
+ sha256 = "1a3b8j6yhld0jhmblxajjy1f2iqcfnp21cc8cknffyylb0yjbp2a";
+ name = "ktnef-23.04.0.tar.xz";
};
};
ktorrent = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktorrent-22.12.3.tar.xz";
- sha256 = "07ppw041zwywkkjd87n6bwr37a2a6va78nr5yxshlxckz8x17bl5";
- name = "ktorrent-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktorrent-23.04.0.tar.xz";
+ sha256 = "0gmmgy6ypw9y9hw8c3wyifvrd0zbxf9p8ixy7da8mnx0lgp26sm0";
+ name = "ktorrent-23.04.0.tar.xz";
};
};
ktouch = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktouch-22.12.3.tar.xz";
- sha256 = "0hzz0lnx4w0bl7kd52n01z8h165icycfx9kw8rgaidq1r5csp2fm";
- name = "ktouch-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktouch-23.04.0.tar.xz";
+ sha256 = "01fq2lb0kyhh1a7rkxg6mc26ans5vvmqp2icf8bxifvq2ggd17b2";
+ name = "ktouch-23.04.0.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-accounts-kcm-22.12.3.tar.xz";
- sha256 = "04g68x1xl9s46sinnwknb43pgvz6w71f8pn1j9bpgmg3qmmqx84g";
- name = "ktp-accounts-kcm-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-accounts-kcm-23.04.0.tar.xz";
+ sha256 = "1d61fmcs3bsjdnxfpcnsyxfw3lbcsqrx0yjh6a551g2gm1gwf2wn";
+ name = "ktp-accounts-kcm-23.04.0.tar.xz";
};
};
ktp-approver = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-approver-22.12.3.tar.xz";
- sha256 = "06a856xx2xnw7ryazcyhwwwwhc23w22wrrjvbxs8ram54pzvphyh";
- name = "ktp-approver-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-approver-23.04.0.tar.xz";
+ sha256 = "087psblyqxg4scvwilqb6mva484n5iyzmhyb64hjbhb633vcszhq";
+ name = "ktp-approver-23.04.0.tar.xz";
};
};
ktp-auth-handler = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-auth-handler-22.12.3.tar.xz";
- sha256 = "0mrj12c7igs8z6904ishx5zv5qvsasv3c4i7zyrr9i5f6ncdgrh6";
- name = "ktp-auth-handler-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-auth-handler-23.04.0.tar.xz";
+ sha256 = "09fzc8xgj3p4mfha0s2y6hcik28bi3zgf4wd4kz7fdcp06mgim6q";
+ name = "ktp-auth-handler-23.04.0.tar.xz";
};
};
ktp-call-ui = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-call-ui-22.12.3.tar.xz";
- sha256 = "1a2gys0p42kmar7mxxwzwmcjfvdcwa6b23cb913c1ficwx4rbma2";
- name = "ktp-call-ui-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-call-ui-23.04.0.tar.xz";
+ sha256 = "08pqj2r6dlsa2x92ay1h3956gdxjhajf3rd508dpgkabsiq1d107";
+ name = "ktp-call-ui-23.04.0.tar.xz";
};
};
ktp-common-internals = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-common-internals-22.12.3.tar.xz";
- sha256 = "0rapw141bvrgaaa9wb7vbs1m0z01pky8c0pdsm294i72kiadrcw3";
- name = "ktp-common-internals-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-common-internals-23.04.0.tar.xz";
+ sha256 = "139wfb7mz7d9ikwq5n1y8dcyaa1ysmzvx1fpp180fdzmr277sv15";
+ name = "ktp-common-internals-23.04.0.tar.xz";
};
};
ktp-contact-list = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-list-22.12.3.tar.xz";
- sha256 = "171d48s1dh2i8zk43sd7xl3nrialij0nvn0ib82f45fag2wa4f8v";
- name = "ktp-contact-list-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-contact-list-23.04.0.tar.xz";
+ sha256 = "0hpnlpailgx4wkbb78fp4738qj63a308405grpckf39jwfz2pz4c";
+ name = "ktp-contact-list-23.04.0.tar.xz";
};
};
ktp-contact-runner = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-runner-22.12.3.tar.xz";
- sha256 = "0a4bhaq3jc9290lf1cgnlaysw2jszdfqwk9l6fi0bmdk2mx0xl3d";
- name = "ktp-contact-runner-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-contact-runner-23.04.0.tar.xz";
+ sha256 = "0s00g6dqh6rpz2is7hyjx2piblpd1m60v7hi03zjihnwyq8a3iq4";
+ name = "ktp-contact-runner-23.04.0.tar.xz";
};
};
ktp-desktop-applets = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-desktop-applets-22.12.3.tar.xz";
- sha256 = "18w4dq676yxhmgwmq5bv7nnfcai18xiy1hwyj7pxmb45f42vxzh2";
- name = "ktp-desktop-applets-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-desktop-applets-23.04.0.tar.xz";
+ sha256 = "0d60fcyhaq2cjllc8xsrn3xa4wpd617a6x5zs150pj97vavf9dks";
+ name = "ktp-desktop-applets-23.04.0.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-filetransfer-handler-22.12.3.tar.xz";
- sha256 = "1qlx2bhm22nzrizcyvxn355g3m3fkmcr4ics8gl0m2m80mgr70v0";
- name = "ktp-filetransfer-handler-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-filetransfer-handler-23.04.0.tar.xz";
+ sha256 = "147vq0cf5a0hb8ybl773q9v6wlhz5gwcqhf5hg2cbz86w4gdb4pm";
+ name = "ktp-filetransfer-handler-23.04.0.tar.xz";
};
};
ktp-kded-module = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-kded-module-22.12.3.tar.xz";
- sha256 = "1rhq3ry126ds5kd3jdjsla6q1185xhs1zni24vdkvx045f7l9ppd";
- name = "ktp-kded-module-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-kded-module-23.04.0.tar.xz";
+ sha256 = "1grs5sqznsqq7aawp99mxgc9y5h387fgm11w7kmkab89md1g01rh";
+ name = "ktp-kded-module-23.04.0.tar.xz";
};
};
ktp-send-file = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-send-file-22.12.3.tar.xz";
- sha256 = "0qlw5z1im54sl3n1ysgz58f66chph35q5hf7831dnva8ahnzaa6w";
- name = "ktp-send-file-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-send-file-23.04.0.tar.xz";
+ sha256 = "145c80d4wjzq9s9iqnygxg0l8ddx0q0svlmwg2cyy66bqrxl7052";
+ name = "ktp-send-file-23.04.0.tar.xz";
};
};
ktp-text-ui = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktp-text-ui-22.12.3.tar.xz";
- sha256 = "0ypasdncgljjy5hg4na1lrxql8rjqfwyawhsb4gif8ihfvc8ibw1";
- name = "ktp-text-ui-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktp-text-ui-23.04.0.tar.xz";
+ sha256 = "11r4f23k0ag9gyqlacmkk2r5jnvdd4z998104a44jmxjd4kg2cfb";
+ name = "ktp-text-ui-23.04.0.tar.xz";
+ };
+ };
+ ktrip = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/ktrip-23.04.0.tar.xz";
+ sha256 = "1xi3lk142cgx3l04w1p891k77zgn8mz91qmbr1qbzx66nw5d5psf";
+ name = "ktrip-23.04.0.tar.xz";
};
};
ktuberling = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/ktuberling-22.12.3.tar.xz";
- sha256 = "0njl3g7pygk5v8cirmjg7pmlpyrhalpgwywr8na55cv5ib54m3s9";
- name = "ktuberling-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/ktuberling-23.04.0.tar.xz";
+ sha256 = "04fv6izvi9n5xill120934miacf1p707mqw4wv3cr5aj7nz6n9sz";
+ name = "ktuberling-23.04.0.tar.xz";
};
};
kturtle = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kturtle-22.12.3.tar.xz";
- sha256 = "0idbfmxz3fx23xcssdvfhs6xyrv0y56k3jl7g4f22p0yvcp0lkb2";
- name = "kturtle-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kturtle-23.04.0.tar.xz";
+ sha256 = "12r5hm9s78pwpwc9ira3ymh93pl7fg7fb5agyrjml3yx4h1mimcf";
+ name = "kturtle-23.04.0.tar.xz";
};
};
kubrick = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kubrick-22.12.3.tar.xz";
- sha256 = "0b3v5daa6h0rr4gwp605rvn1ygnx29z49h2lv8mcdpd8k4wm5jac";
- name = "kubrick-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kubrick-23.04.0.tar.xz";
+ sha256 = "153g46alm996pndnl3vw7bibikgb5cs2kv1ipwwjclk0sp584hha";
+ name = "kubrick-23.04.0.tar.xz";
};
};
kwalletmanager = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kwalletmanager-22.12.3.tar.xz";
- sha256 = "1vilih22nfhavqkcbjphkwz978w2alqw2nic3nfvxwdnpa17j6hb";
- name = "kwalletmanager-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kwalletmanager-23.04.0.tar.xz";
+ sha256 = "1262mjg6vyf2bb2xw34dpy3f7pd0i0rn46jdy07dqbrslpm45n7y";
+ name = "kwalletmanager-23.04.0.tar.xz";
};
};
kwave = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kwave-22.12.3.tar.xz";
- sha256 = "0dyyd5pddk4gp3gpzsfjgwhj6s8i04cgx916hyaxac75wpffbbv1";
- name = "kwave-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kwave-23.04.0.tar.xz";
+ sha256 = "0c6kiah32v3pjrkjl8wy2wfkd7a4ap3gdqzir1xaqlk1rq7jscw8";
+ name = "kwave-23.04.0.tar.xz";
+ };
+ };
+ kweather = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/kweather-23.04.0.tar.xz";
+ sha256 = "130wiwss0plls5rrla5csjxsmd9c7vv5rcpislpk1vv683ndip9h";
+ name = "kweather-23.04.0.tar.xz";
};
};
kwordquiz = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/kwordquiz-22.12.3.tar.xz";
- sha256 = "176hxsfcgjb5x4a6mk0q5azv7466y861xa64vskss2f5ivznx26j";
- name = "kwordquiz-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/kwordquiz-23.04.0.tar.xz";
+ sha256 = "170zkc2lw141wxp7jwjz6i9sx483xyf6yhy16gghsp3bxrjcdlqh";
+ name = "kwordquiz-23.04.0.tar.xz";
};
};
libgravatar = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libgravatar-22.12.3.tar.xz";
- sha256 = "0a7954m4i78nqf50yp81a3nlzx4pa5i9i44xn7lcxpglkl9qgd9r";
- name = "libgravatar-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libgravatar-23.04.0.tar.xz";
+ sha256 = "096gwscc4mddhyb9b1ir8s9d2bml4309d8iqz5v6dnpfxghbr4b8";
+ name = "libgravatar-23.04.0.tar.xz";
};
};
libkcddb = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkcddb-22.12.3.tar.xz";
- sha256 = "06ks0lggbaimj8c42cm273z4j3aif7xqx6vqzv40jm6mgcvmw2jk";
- name = "libkcddb-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkcddb-23.04.0.tar.xz";
+ sha256 = "052rwidi1i2k49qqs4jyin403f5fcyq88jjcmq2z7ixd2gh781cq";
+ name = "libkcddb-23.04.0.tar.xz";
};
};
libkcompactdisc = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkcompactdisc-22.12.3.tar.xz";
- sha256 = "0wh89q2lf0fvly9bpg4b7aflb7bmaz0bd4v8gvslkff5nzi01y5h";
- name = "libkcompactdisc-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkcompactdisc-23.04.0.tar.xz";
+ sha256 = "05d24a2za2692v7qgvbhz9vc9xf7hql8504pcb6x12z7w1y8q80v";
+ name = "libkcompactdisc-23.04.0.tar.xz";
};
};
libkdcraw = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkdcraw-22.12.3.tar.xz";
- sha256 = "1287jjnw0x869bxhd34vmb83igskhx98nmyp6gs136rdms8war0f";
- name = "libkdcraw-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkdcraw-23.04.0.tar.xz";
+ sha256 = "1a0vj0m5hw3l9mhn85dfx8is4sxdyxlsjxd8dhim520wf98mvbzp";
+ name = "libkdcraw-23.04.0.tar.xz";
};
};
libkdegames = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkdegames-22.12.3.tar.xz";
- sha256 = "072zabp7ss6x8241fl3gnvxx0ihw68h8znzk6wf277idj296x3ww";
- name = "libkdegames-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkdegames-23.04.0.tar.xz";
+ sha256 = "1wjmpy05l6d5krdiwa4hnb7gxmybgsxdlfdqxd0zw7jbsbzszhr6";
+ name = "libkdegames-23.04.0.tar.xz";
};
};
libkdepim = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkdepim-22.12.3.tar.xz";
- sha256 = "13p6j3vk0rg2hhxvv7b21lvz52ciwwwsb1rfd0nvyw6qc6b9a97v";
- name = "libkdepim-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkdepim-23.04.0.tar.xz";
+ sha256 = "1jzb83a86a3mvmwxxrsmwnwswk1m34qnx89yzwb60rfwq8jifnv0";
+ name = "libkdepim-23.04.0.tar.xz";
};
};
libkeduvocdocument = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkeduvocdocument-22.12.3.tar.xz";
- sha256 = "04igxxmp5y2pwj914wf14shfaa38q0aif1is634j9yibja874x2g";
- name = "libkeduvocdocument-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkeduvocdocument-23.04.0.tar.xz";
+ sha256 = "1y2bsmc34vlags1l99xxll1rj4y9vgyndwcpyv8mn4vf0j7bf3vp";
+ name = "libkeduvocdocument-23.04.0.tar.xz";
};
};
libkexiv2 = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkexiv2-22.12.3.tar.xz";
- sha256 = "151a6dkww9k150xh52jn2s335nkaidw0y2xvpcycfvbfpcl6x7bg";
- name = "libkexiv2-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkexiv2-23.04.0.tar.xz";
+ sha256 = "14fkh1dmbnrvrnl1jvl5s1va3aq5wf3riv9lhhfy7lgrdp8fxlqq";
+ name = "libkexiv2-23.04.0.tar.xz";
};
};
libkgapi = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkgapi-22.12.3.tar.xz";
- sha256 = "0f2phhcmmbx60rfh5qjl990mjxrz871jgk6wisfv9ndylkxk3k4p";
- name = "libkgapi-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkgapi-23.04.0.tar.xz";
+ sha256 = "0lb5kmqb2vc9qcha9r4n87lh0hp90qz7p98yzn4fxjn7nxnibsxc";
+ name = "libkgapi-23.04.0.tar.xz";
};
};
libkipi = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkipi-22.12.3.tar.xz";
- sha256 = "0p96cgivrsilam8laagc2imlh0966fiqn4mhpy1l0il2iwka8rsl";
- name = "libkipi-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkipi-23.04.0.tar.xz";
+ sha256 = "19ncx8np5ji6krhbw4sxfcpa75f83s61n7xwd851776bspp5jy50";
+ name = "libkipi-23.04.0.tar.xz";
};
};
libkleo = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkleo-22.12.3.tar.xz";
- sha256 = "0na8155w79kgzqby1xl1v35sc2ragmx0cjbp7jhx9dfrprz4q544";
- name = "libkleo-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkleo-23.04.0.tar.xz";
+ sha256 = "0sbfvank4j9jlf8wja19fa8vw2g28qkvkiwcfyz48l1r94w0w8df";
+ name = "libkleo-23.04.0.tar.xz";
};
};
libkmahjongg = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkmahjongg-22.12.3.tar.xz";
- sha256 = "04sc6362nsdbihy9w00ppp0x9dkllf0gj45cxi9mxg8q1nbn86m0";
- name = "libkmahjongg-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkmahjongg-23.04.0.tar.xz";
+ sha256 = "1yn3krnm21vch9ggnxamwsanrfqgkxyjbh4d5w4xx4sjl674snwr";
+ name = "libkmahjongg-23.04.0.tar.xz";
};
};
libkomparediff2 = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libkomparediff2-22.12.3.tar.xz";
- sha256 = "1m7n25b7hlrkspq59n54gxfid4jjj28fa2dya5mc21r5z6jxn3jr";
- name = "libkomparediff2-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libkomparediff2-23.04.0.tar.xz";
+ sha256 = "0591h5l64mn44sfs6y4jk92kndf57hx91h53qndm8gr0cgv58nih";
+ name = "libkomparediff2-23.04.0.tar.xz";
};
};
libksane = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libksane-22.12.3.tar.xz";
- sha256 = "1kfvh4ggdrwj5gbzc9x20b7qahjklvq0qshraf3nyjp1fh237l6d";
- name = "libksane-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libksane-23.04.0.tar.xz";
+ sha256 = "0pn7mqfrr6v2hdxw0czmxkbmaf9pi9iqkhj407j9zc1lzjd6w3cy";
+ name = "libksane-23.04.0.tar.xz";
};
};
libksieve = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libksieve-22.12.3.tar.xz";
- sha256 = "04ch9ffscmbfwmq0s173bz8pxnssqr87zwiqrz4sl2jy446r3a04";
- name = "libksieve-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libksieve-23.04.0.tar.xz";
+ sha256 = "06szca9s6vflas5q71hiy121mfdfhp9lm8v6frpinw8csfmfjsql";
+ name = "libksieve-23.04.0.tar.xz";
};
};
libktorrent = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/libktorrent-22.12.3.tar.xz";
- sha256 = "0rf9q4gy3l3mqs88kckwcicabrzz5hm1nsff259i9bzvbzhbzhlw";
- name = "libktorrent-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/libktorrent-23.04.0.tar.xz";
+ sha256 = "16ks5wwmxpyl7is7s2ralfa3yaqbzl58aid34akjympx4jf8lhlj";
+ name = "libktorrent-23.04.0.tar.xz";
};
};
lokalize = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/lokalize-22.12.3.tar.xz";
- sha256 = "0cqpikx65mpz2as8idlcq5hy149vpqlhx7jq58pkjaj0dnig8hf1";
- name = "lokalize-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/lokalize-23.04.0.tar.xz";
+ sha256 = "01q7r4m4yl08jhnx4vblcfrv6fpbfm7ppq9zkkx2s4zjb3102rgv";
+ name = "lokalize-23.04.0.tar.xz";
};
};
lskat = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/lskat-22.12.3.tar.xz";
- sha256 = "0rld0xljg4pxja2qzp7qw9dylcv4d455qihd1hapy1gf8mpdc2dn";
- name = "lskat-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/lskat-23.04.0.tar.xz";
+ sha256 = "13krjmlnpyrln6h4ky9inlhdcfs688d0lyaiszz57v5ql9lsnwh9";
+ name = "lskat-23.04.0.tar.xz";
};
};
mailcommon = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/mailcommon-22.12.3.tar.xz";
- sha256 = "03ffsh5b1w70bywyifbirsmiv0kxxbx1x0szg7xw9aw4nfvnmzaf";
- name = "mailcommon-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/mailcommon-23.04.0.tar.xz";
+ sha256 = "0larqz7m39458s1n3rnn5flw4h3fip502kipdswmrhzmrb64vspl";
+ name = "mailcommon-23.04.0.tar.xz";
};
};
mailimporter = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/mailimporter-22.12.3.tar.xz";
- sha256 = "0i740gn18z4lmc5c4vgqq6gjvz9v7vpk88xf954rd100b21wlvj8";
- name = "mailimporter-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/mailimporter-23.04.0.tar.xz";
+ sha256 = "1k020h86lwzjs0fpryls6q5qfkf00xrxq9jah9av3ydil4kqkbaj";
+ name = "mailimporter-23.04.0.tar.xz";
};
};
marble = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/marble-22.12.3.tar.xz";
- sha256 = "0wcdjqvmiiy8fwl3yxnmq0wi585zck5g1fxaqy4w7jvvn4qislc8";
- name = "marble-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/marble-23.04.0.tar.xz";
+ sha256 = "0m5ffy187syah4qxphkz417h95yd8nzp6h6zs7i99x0n3j97spqr";
+ name = "marble-23.04.0.tar.xz";
};
};
markdownpart = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/markdownpart-22.12.3.tar.xz";
- sha256 = "1jzzgm666pmgxgas73mm611k19lg2593j5ffq53l1wwiva3278j9";
- name = "markdownpart-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/markdownpart-23.04.0.tar.xz";
+ sha256 = "1h2vknqmc8fngwpki97crq3spg5dlpbswwhcasizqsdanbkg8h6v";
+ name = "markdownpart-23.04.0.tar.xz";
};
};
mbox-importer = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/mbox-importer-22.12.3.tar.xz";
- sha256 = "09aglnys5j5imjn8yhk5jay3sqlhkiza7p9x877s3lyy3xlfch5x";
- name = "mbox-importer-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/mbox-importer-23.04.0.tar.xz";
+ sha256 = "1xa3i9g7rfimxlw5aa9sg51li89m2k9fq59xz18da08135fpkmak";
+ name = "mbox-importer-23.04.0.tar.xz";
};
};
messagelib = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/messagelib-22.12.3.tar.xz";
- sha256 = "19l27l5qbp0cfjpqcbw5dvi2granzrj1293dahf9z77v0m9bxmjm";
- name = "messagelib-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/messagelib-23.04.0.tar.xz";
+ sha256 = "1pmgy501iircnrznpx1001rap1vm8xpxls3fryi3vyg86bq66qlz";
+ name = "messagelib-23.04.0.tar.xz";
};
};
minuet = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/minuet-22.12.3.tar.xz";
- sha256 = "0m3w3vcg3i532i0rza8igx5sp344k9jlm4wmhzkmw1mln1nqynnl";
- name = "minuet-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/minuet-23.04.0.tar.xz";
+ sha256 = "01wbfsrqrxnnka536k12rzfhm9py752zy5yg8r6k3w4drhr0bwd1";
+ name = "minuet-23.04.0.tar.xz";
+ };
+ };
+ neochat = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/neochat-23.04.0.tar.xz";
+ sha256 = "1a6pmqim9xdxy73h7xdk1d37c5my4yam55zxdk858x727zi9lh5s";
+ name = "neochat-23.04.0.tar.xz";
};
};
okular = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/okular-22.12.3.tar.xz";
- sha256 = "00ns8qmf6vpp1fxqg71rzhzq2za9h1fs5a12rmd0vklkb5sjivq1";
- name = "okular-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/okular-23.04.0.tar.xz";
+ sha256 = "036lpjply4557jmh3a6cl9skfqy2vb8k2zbfv24dz1mzk8lzy3bc";
+ name = "okular-23.04.0.tar.xz";
};
};
palapeli = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/palapeli-22.12.3.tar.xz";
- sha256 = "0wlr086374fg4kj827xcnqn6zk00sxpb36jdzc62q3w0sjzw1irj";
- name = "palapeli-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/palapeli-23.04.0.tar.xz";
+ sha256 = "0vn9128fsvb3vmcap7v2l6az6ljq8nl79g06md5z4sp60v80wwyi";
+ name = "palapeli-23.04.0.tar.xz";
};
};
parley = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/parley-22.12.3.tar.xz";
- sha256 = "0jrddgfwc77lpdmfmydwmgpcqa0figv6rmmjw0xlw2f8dd4i2ghd";
- name = "parley-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/parley-23.04.0.tar.xz";
+ sha256 = "159x0a4fjiql72ifcmyhqzxp5hnfjyld4pl55wkm37jxwn7zwjy2";
+ name = "parley-23.04.0.tar.xz";
};
};
partitionmanager = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/partitionmanager-22.12.3.tar.xz";
- sha256 = "0bdxf19yb4wnrb50vapabqjqwxccfvp3gaspagh4wgcyz7p5icjp";
- name = "partitionmanager-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/partitionmanager-23.04.0.tar.xz";
+ sha256 = "0xqha9bai2hrl12w3xi7xjs8lyn0krzzc7s3l8hwmwvg3ds909ds";
+ name = "partitionmanager-23.04.0.tar.xz";
};
};
picmi = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/picmi-22.12.3.tar.xz";
- sha256 = "0ygryzl5x94icgr0p1qvwp4fmk51wiqzk2frj9768m4pzk0b6y50";
- name = "picmi-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/picmi-23.04.0.tar.xz";
+ sha256 = "12fwv2blpavf8mcc1w3cj6wk7wqzksm2hapmmbfad2p7nrcssc4p";
+ name = "picmi-23.04.0.tar.xz";
};
};
pim-data-exporter = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/pim-data-exporter-22.12.3.tar.xz";
- sha256 = "113yfrz68wab4bmzncwqmzh5bz18lidp0naax4kbaa30p95qd40b";
- name = "pim-data-exporter-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/pim-data-exporter-23.04.0.tar.xz";
+ sha256 = "17xf5ghsxbqv0mr1pjx07lzrbqlrdanykqk39l5hk40izwmxn8a1";
+ name = "pim-data-exporter-23.04.0.tar.xz";
};
};
pim-sieve-editor = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/pim-sieve-editor-22.12.3.tar.xz";
- sha256 = "19wgpgzmmpfakm249val3fjxjx4wzb3ip4yk9m00aa0d2lb99ysn";
- name = "pim-sieve-editor-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/pim-sieve-editor-23.04.0.tar.xz";
+ sha256 = "179cy1a7saqq1ryxxvq7c0qqkv9z5dcgwm5fvglm8wndf01ym21d";
+ name = "pim-sieve-editor-23.04.0.tar.xz";
};
};
pimcommon = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/pimcommon-22.12.3.tar.xz";
- sha256 = "1yp0h8rp9nqgwc70f4knp05jnqhygb78z8sbdxq5dn5k09ciqr8v";
- name = "pimcommon-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/pimcommon-23.04.0.tar.xz";
+ sha256 = "1b41csnqw1ws7nqcda9hr8df5a3dprl778pyis249r2g2m5k8iil";
+ name = "pimcommon-23.04.0.tar.xz";
+ };
+ };
+ plasmatube = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/plasmatube-23.04.0.tar.xz";
+ sha256 = "0zjvlgv7jf476lk31ahb0hrj840kcgbz7vcqinn05dd5m135hglq";
+ name = "plasmatube-23.04.0.tar.xz";
};
};
poxml = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/poxml-22.12.3.tar.xz";
- sha256 = "03ymrkqp8ysmnc10brqp83zq58mjcrksafjwlpd3sqcc2crpjy90";
- name = "poxml-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/poxml-23.04.0.tar.xz";
+ sha256 = "1y8kn6cjqlc2hxw2bi5fc9j8dgwrkg08rc3zjarzwclvrxcljj3a";
+ name = "poxml-23.04.0.tar.xz";
};
};
print-manager = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/print-manager-22.12.3.tar.xz";
- sha256 = "0rblnlv95zxdflnd7wb63wp8j45k2ysmykyh5l3vkyni1k2127mm";
- name = "print-manager-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/print-manager-23.04.0.tar.xz";
+ sha256 = "1gf5ia39nq5vnmh6casgjvdd73sd17z2ikiqhjw0ma2kyvn2dqxb";
+ name = "print-manager-23.04.0.tar.xz";
+ };
+ };
+ qmlkonsole = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/qmlkonsole-23.04.0.tar.xz";
+ sha256 = "0ninw5bvdrgq72vc5m0q342jv25gf3w2f6n8jxw1rl1ixfhbs910";
+ name = "qmlkonsole-23.04.0.tar.xz";
};
};
rocs = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/rocs-22.12.3.tar.xz";
- sha256 = "0pgsvvdq5qnsfhh9a48ww6sbk5194c1h52dvmvz0gqgsp8k1kd47";
- name = "rocs-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/rocs-23.04.0.tar.xz";
+ sha256 = "1mlzxqm47ia391xb4imih91xb40r9gwsdgbw0f3cl6rxzjzmv83h";
+ name = "rocs-23.04.0.tar.xz";
};
};
signon-kwallet-extension = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/signon-kwallet-extension-22.12.3.tar.xz";
- sha256 = "0afzrn88nl3hn33a5zqhz8zf0dsg1n4i53ml0xw4ri57p9yfz6wm";
- name = "signon-kwallet-extension-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/signon-kwallet-extension-23.04.0.tar.xz";
+ sha256 = "1yz85pdps997bm2074n9gq3xbg5dla716q8np3hx930d8zjdpj87";
+ name = "signon-kwallet-extension-23.04.0.tar.xz";
};
};
skanlite = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/skanlite-22.12.3.tar.xz";
- sha256 = "1kf776842hdq1jiln3dvk2qa0xh1ak96cag5lpc0yg344lvarvrz";
- name = "skanlite-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/skanlite-23.04.0.tar.xz";
+ sha256 = "136xswpr98xd9cd19rg82iv1243lzyy2rgwplmgf6xdjbv99i0cz";
+ name = "skanlite-23.04.0.tar.xz";
};
};
skanpage = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/skanpage-22.12.3.tar.xz";
- sha256 = "0hazx7i09gs3gmglv33pnch99s17lji7vbww875lq8jsyad12rzz";
- name = "skanpage-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/skanpage-23.04.0.tar.xz";
+ sha256 = "1r149qkjvxs3ywdqjhb52d66j9dllbn3fd3s9dkaqr89hib9yfcr";
+ name = "skanpage-23.04.0.tar.xz";
};
};
spectacle = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/spectacle-22.12.3.tar.xz";
- sha256 = "01yd2x3k019bzjk4m4hc0k1w6c9brnrnv9hkc92j0fyayiqlnzj9";
- name = "spectacle-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/spectacle-23.04.0.tar.xz";
+ sha256 = "05sbs4qq2s99zr0fp12h1dh2sgf889xh6f0h0fq4fa2kidk4m3fv";
+ name = "spectacle-23.04.0.tar.xz";
};
};
step = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/step-22.12.3.tar.xz";
- sha256 = "08gk72l57c9x7malksg76aclxh6bmmikpnn7bg8adm92jl0jlmpy";
- name = "step-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/step-23.04.0.tar.xz";
+ sha256 = "0jnv8y5lb0bfszx4yrl2bm480js6njjb9db7qzhgdbyh2r0lqgpx";
+ name = "step-23.04.0.tar.xz";
};
};
svgpart = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/svgpart-22.12.3.tar.xz";
- sha256 = "0x0ynzjq550f0k79rm9zrqikhv6bp4a49m5ngg556kzfhzvswlxk";
- name = "svgpart-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/svgpart-23.04.0.tar.xz";
+ sha256 = "1jwqna54852pa3zjmcayvkwf64cgh4r4238kipf4x2yin47g5j2i";
+ name = "svgpart-23.04.0.tar.xz";
};
};
sweeper = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/sweeper-22.12.3.tar.xz";
- sha256 = "0cr92xzdirwwb8v30r5qkr7n54gn47sjspbig2czrzh8jrmr9dc0";
- name = "sweeper-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/sweeper-23.04.0.tar.xz";
+ sha256 = "0zzc78g4ka4jvnmjkf3yqcni58gy6cjm795nhf6s5yjjgfg436vj";
+ name = "sweeper-23.04.0.tar.xz";
+ };
+ };
+ telly-skout = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/telly-skout-23.04.0.tar.xz";
+ sha256 = "148smsx6sz5zlsa27g3qqzq8qzw0a1pd2a9kagdiarfcv9ifhhc2";
+ name = "telly-skout-23.04.0.tar.xz";
+ };
+ };
+ tokodon = {
+ version = "23.04.0";
+ src = fetchurl {
+ url = "${mirror}/stable/release-service/23.04.0/src/tokodon-23.04.0.tar.xz";
+ sha256 = "1ajqf0irjlvmqzlw2v4ybl79g3j4qc9fclh6dillxakwdcn76j40";
+ name = "tokodon-23.04.0.tar.xz";
};
};
umbrello = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/umbrello-22.12.3.tar.xz";
- sha256 = "0i7h9nfljc860hyfy7xxrk4w3y5f6pqviylz7qs6gzmq4yi0q45b";
- name = "umbrello-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/umbrello-23.04.0.tar.xz";
+ sha256 = "0id4cjs7pc0b5j901gnnj8cai9x0c6ly7nplw4b3164yazc9w878";
+ name = "umbrello-23.04.0.tar.xz";
};
};
yakuake = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/yakuake-22.12.3.tar.xz";
- sha256 = "1nqdixfdha1gxq0zhzq347v5s6ym90aj25gq8jb5df0qp0w432mx";
- name = "yakuake-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/yakuake-23.04.0.tar.xz";
+ sha256 = "0qf02amikwwdviaw5yr5bgww2s1s83q1bd42sh1gai3g4axrnxhg";
+ name = "yakuake-23.04.0.tar.xz";
};
};
zanshin = {
- version = "22.12.3";
+ version = "23.04.0";
src = fetchurl {
- url = "${mirror}/stable/release-service/22.12.3/src/zanshin-22.12.3.tar.xz";
- sha256 = "0mx4wazlqp6aw2lgg5fmyr2x4yvfigds6j5ibvplzhz05d64clzj";
- name = "zanshin-22.12.3.tar.xz";
+ url = "${mirror}/stable/release-service/23.04.0/src/zanshin-23.04.0.tar.xz";
+ sha256 = "1g8bngw3xllw8wgvc2f8qnkgg2kxnfhmfzk6f54h798ynva13vvn";
+ name = "zanshin-23.04.0.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix b/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix
new file mode 100644
index 0000000000..4c84768a69
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix
@@ -0,0 +1,24 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcoreaddons
+, kconfig
+, ki18n
+, kirigami2
+}:
+
+mkDerivation {
+ pname = "telly-skout";
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ buildInputs = [ qtquickcontrols2 kcoreaddons kconfig ki18n kirigami2 ];
+
+ meta = {
+ description = "A convergent Kirigami TV guide";
+ homepage = "https://apps.kde.org/telly-skout/";
+ license = lib.licenses.gpl2Plus;
+ maintainers = [];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix b/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix
similarity index 56%
rename from third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix
rename to third_party/nixpkgs/pkgs/applications/kde/tokodon.nix
index f93336d40f..bf40a5a001 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/tokodon.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix
@@ -11,7 +11,6 @@
, kirigami2
, kirigami-addons
, knotifications
-, libwebsockets
, qqc2-desktop-style
, qtbase
, qtkeychain
@@ -21,29 +20,11 @@
, qtwebsockets
, kitemmodels
, pimcommon
-
-# Workarounds for the point release being missing.
-, libsForQt5
-, fetchFromGitLab
}:
-# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package
-# set for the point release, as the point release was not uploaded to
-# the Plasma Mobile gear repo, and the injected `mkDerivation` only can
-# use the src (and version) from the `srcs` set.
-libsForQt5.mkDerivation rec {
+mkDerivation {
pname = "tokodon";
- version = "23.01.0";
- # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo.
- src = fetchFromGitLab {
- domain = "invent.kde.org";
- owner = "network";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU=";
- };
-
nativeBuildInputs = [
cmake
extra-cmake-modules
diff --git a/third_party/nixpkgs/pkgs/applications/maui/default.nix b/third_party/nixpkgs/pkgs/applications/maui/default.nix
index b91f13d125..3f5d1d499a 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/default.nix
@@ -60,7 +60,7 @@ let
# libraries
mauikit = callPackage ./mauikit.nix { };
mauikit-accounts = callPackage ./mauikit-accounts.nix { };
- mauikit-calendar = callPackage ./mauikit-calendar.nix { };
+ mauikit-calendar = callPackage ./mauikit-calendar { };
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
diff --git a/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch b/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
new file mode 100644
index 0000000000..0feb15b615
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES
+ find_package(MauiKit)
+
+ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
++find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+ find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
\ No newline at end of file
diff --git a/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar.nix b/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/default.nix
similarity index 87%
rename from third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar.nix
rename to third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/default.nix
index 508319f161..e9ea61592c 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/mauikit-calendar/default.nix
@@ -6,6 +6,7 @@
, qtquickcontrols2
, akonadi
, akonadi-contacts
+, akonadi-calendar
, calendarsupport
, eventviews
}:
@@ -13,6 +14,8 @@
mkDerivation {
pname = "mauikit-calendar";
+ patches = [ ./add-akonadi-calendar.patch ];
+
nativeBuildInputs = [
cmake
extra-cmake-modules
@@ -21,6 +24,7 @@ mkDerivation {
buildInputs = [
akonadi
akonadi-contacts
+ akonadi-calendar
calendarsupport
eventviews
mauikit
diff --git a/third_party/nixpkgs/pkgs/applications/maui/mauikit-imagetools.nix b/third_party/nixpkgs/pkgs/applications/maui/mauikit-imagetools.nix
index 3788c50cd4..141d195352 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/mauikit-imagetools.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/mauikit-imagetools.nix
@@ -4,10 +4,13 @@
, extra-cmake-modules
, kconfig
, kio
+, leptonica
, mauikit
+, opencv
, qtlocation
, exiv2
, kquickimageedit
+, tesseract
}:
mkDerivation {
@@ -21,10 +24,13 @@ mkDerivation {
buildInputs = [
kconfig
kio
+ leptonica
mauikit
+ opencv
qtlocation
exiv2
kquickimageedit
+ tesseract
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/maui/mauiman.nix b/third_party/nixpkgs/pkgs/applications/maui/mauiman.nix
index 9b54d8d479..626d045b11 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/mauiman.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/mauiman.nix
@@ -2,13 +2,7 @@
, mkDerivation
, cmake
, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, ki18n
-, knotifications
-, qtbase
-, qtquickcontrols2
-, qtx11extras
+, qtsystems
}:
mkDerivation {
@@ -19,6 +13,10 @@ mkDerivation {
extra-cmake-modules
];
+ buildInputs = [
+ qtsystems
+ ];
+
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauiman";
description = "Maui Manager Library. Server and public library API";
diff --git a/third_party/nixpkgs/pkgs/applications/maui/srcs.nix b/third_party/nixpkgs/pkgs/applications/maui/srcs.nix
index 63dda7c138..75f9d6cd0c 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/srcs.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/srcs.nix
@@ -3,6 +3,22 @@
{ fetchurl, mirror }:
{
+ agenda = {
+ version = "0.1.1";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/agenda/0.1.1/agenda-0.1.1.tar.xz";
+ sha256 = "0czpsybvvvnfg0n1ri94a2agwhdnmy124ggxqb5kjnsw35ivz35a";
+ name = "agenda-0.1.1.tar.xz";
+ };
+ };
+ arca = {
+ version = "0.1.1";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/arca/0.1.1/arca-0.1.1.tar.xz";
+ sha256 = "0d4mdv1israljn9mhpb3nx8442g7kiqg87gmsb74z08v02yywmc0";
+ name = "arca-0.1.1.tar.xz";
+ };
+ };
bonsai = {
version = "2.2.0";
src = fetchurl {
@@ -12,43 +28,59 @@
};
};
booth = {
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "${mirror}/stable/maui/booth/1.0.1/booth-1.0.1.tar.xz";
- sha256 = "02p3xxfk1fsqd8z55gmkhj68j8sjbgjyrj2anpq8qsmblznsvmdn";
- name = "booth-1.0.1.tar.xz";
+ url = "${mirror}/stable/maui/booth/1.0.2/booth-1.0.2.tar.xz";
+ sha256 = "1b9akwwi1cmvk87zna0yrw1a6mwjd8qg0k3lnivwqfm5zi1xlpb6";
+ name = "booth-1.0.2.tar.xz";
};
};
buho = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/buho/2.2.1/buho-2.2.1.tar.xz";
- sha256 = "1iv30avnfdh78zq7kxigxlkzdp2jfzx0sl88vssjcisniabyd1ri";
- name = "buho-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/buho/2.2.2/buho-2.2.2.tar.xz";
+ sha256 = "0kvg34dmk46aawa8vnl70m8gi6qjr709czgmzb8a7pa77clyyyg8";
+ name = "buho-2.2.2.tar.xz";
};
};
clip = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/clip/2.2.1/clip-2.2.1.tar.xz";
- sha256 = "00w9kgqw4dxb9b9rq11jzdb9pj48qdkdj23wdjwdk52nyfkw7sbh";
- name = "clip-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/clip/2.2.2/clip-2.2.2.tar.xz";
+ sha256 = "1dk9x5lrp197g2qgi10p536dshaaxacgrkwr3pqywqcqqyrvjiyf";
+ name = "clip-2.2.2.tar.xz";
};
};
communicator = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/communicator/2.2.1/communicator-2.2.1.tar.xz";
- sha256 = "1h689dr9iy07r7ypyfgrb3n0ljigz847m6vq1jaia6phgix07hn6";
- name = "communicator-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/communicator/2.2.2/communicator-2.2.2.tar.xz";
+ sha256 = "02c7w6km6a5plf56g4wwdw8k8kif3pmwd1agvhvfpq84yq73naz4";
+ name = "communicator-2.2.2.tar.xz";
+ };
+ };
+ era = {
+ version = "0.1.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/era/0.1.0/era-0.1.0.tar.xz";
+ sha256 = "0qllnpibkhrr52gsngrkzrxcaj68hngsaavdwkds3rbaq4a5by9g";
+ name = "era-0.1.0.tar.xz";
+ };
+ };
+ fiery = {
+ version = "1.0.2";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/fiery/1.0.2/fiery-1.0.2.tar.xz";
+ sha256 = "0xw3p0dna3p05k8mv8sw8aw3clgb3kx72405826k0ldva8mh5q55";
+ name = "fiery-1.0.2.tar.xz";
};
};
index-fm = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/index/2.2.1/index-fm-2.2.1.tar.xz";
- sha256 = "1gin3may65f8nafbgyv90k31z69xwx1awnnxmciqn5zz7cdh9slm";
- name = "index-fm-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/index/2.2.2/index-fm-2.2.2.tar.xz";
+ sha256 = "156fb5kx9hkdg4q4c2r0822s49w86kixvn3m7m1gfxbc6hr5h291";
+ name = "index-fm-2.2.2.tar.xz";
};
};
mauikit = {
@@ -60,91 +92,99 @@
};
};
mauikit-accounts = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-accounts/2.2.1/mauikit-accounts-2.2.1.tar.xz";
- sha256 = "13k9y7z9mw17rdn1z9ixgi1bf6q2hf0afp53nb8d9gz5mqkaf6qh";
- name = "mauikit-accounts-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-accounts/2.2.2/mauikit-accounts-2.2.2.tar.xz";
+ sha256 = "10rvzy5m5bmf98q5akvq87q00nz9mxmnp9ywnswl65gnmihiwis8";
+ name = "mauikit-accounts-2.2.2.tar.xz";
};
};
mauikit-calendar = {
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-calendar/1.0.0/mauikit-calendar-1.0.0.tar.xz";
- sha256 = "1zqaf0nddb220w14ar9gg6p695p0my8whn8p8wgxm7mwjfb6hlil";
- name = "mauikit-calendar-1.0.0.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-calendar/1.0.1/mauikit-calendar-1.0.1.tar.xz";
+ sha256 = "0l3195zy2qzcc1in9m0k8lpzbqbhdjvlr40n23plr6ldwc61q34b";
+ name = "mauikit-calendar-1.0.1.tar.xz";
};
};
mauikit-documents = {
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-documents/1.0.0/mauikit-documents-1.0.0.tar.xz";
- sha256 = "1dniab7f113vbxng9b1nwmh6wviv1m1gb842k98vxgnhmsljq24a";
- name = "mauikit-documents-1.0.0.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-documents/1.0.1/mauikit-documents-1.0.1.tar.xz";
+ sha256 = "0rfznsdlfhf0bjk4fkybbvv56c55w0krjaa8by26fzkqannd7smd";
+ name = "mauikit-documents-1.0.1.tar.xz";
};
};
mauikit-filebrowsing = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.1/mauikit-filebrowsing-2.2.1.tar.xz";
- sha256 = "1szghmp1p9pvsfqx8sk345j7riqxv2kib41l277rm14pwbs6zx1c";
- name = "mauikit-filebrowsing-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.2/mauikit-filebrowsing-2.2.2.tar.xz";
+ sha256 = "0dj06qak410gf4xykhigxrswbchfkicgihzksgv63z9ggfg64jbr";
+ name = "mauikit-filebrowsing-2.2.2.tar.xz";
};
};
mauikit-imagetools = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-imagetools/2.2.1/mauikit-imagetools-2.2.1.tar.xz";
- sha256 = "1wfhzkw4bs3518gylfxyp1arg2w204f73wg1l2s4pygbdh5ylav2";
- name = "mauikit-imagetools-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-imagetools/2.2.2/mauikit-imagetools-2.2.2.tar.xz";
+ sha256 = "1jf60725v887dfl3l9sbknkwns15bz7a7b9v0p6llhw00hiq83b4";
+ name = "mauikit-imagetools-2.2.2.tar.xz";
+ };
+ };
+ mauikit-terminal = {
+ version = "1.0.0";
+ src = fetchurl {
+ url = "${mirror}/stable/maui/mauikit-terminal/1.0.0/mauikit-terminal-1.0.0.tar.xz";
+ sha256 = "1r6dcna2fyglj4q33i5qnzv763y3y65fcqb4ralyydlb8x2nb248";
+ name = "mauikit-terminal-1.0.0.tar.xz";
};
};
mauikit-texteditor = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/mauikit-texteditor/2.2.1/mauikit-texteditor-2.2.1.tar.xz";
- sha256 = "0dzzlmdpl0y843lywfjc4za152r87kncafkmmbp8bdwc9j5fdzzv";
- name = "mauikit-texteditor-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/mauikit-texteditor/2.2.2/mauikit-texteditor-2.2.2.tar.xz";
+ sha256 = "0g8n0xzn9iiq122hb23rhn3c9vkq6hm7kgv5mv8dx2kv17gdyzcg";
+ name = "mauikit-texteditor-2.2.2.tar.xz";
};
};
mauiman = {
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "${mirror}/stable/maui/mauiman/1.0.1/mauiman-1.0.1.tar.xz";
- sha256 = "0awqb8kygacirlhha58bzgrd47zsxmfm3h5k68g8liymqn00fh30";
- name = "mauiman-1.0.1.tar.xz";
+ url = "${mirror}/stable/maui/mauiman/1.0.2/mauiman-1.0.2.tar.xz";
+ sha256 = "0v3jhy3j04aq5935pr6mzgdjwj6mgj1rwscmmg3b9vsi9f6s17n4";
+ name = "mauiman-1.0.2.tar.xz";
};
};
nota = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/nota/2.2.1/nota-2.2.1.tar.xz";
- sha256 = "1fl4w0l3l6rdgxw5w479nzbcff7rmdcxil7y6jdr8z2q50lkazj8";
- name = "nota-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/nota/2.2.2/nota-2.2.2.tar.xz";
+ sha256 = "1c72s4ra5gl9gpq8amwhaw9wkgrgd0fiaknxhn528gzpmq52i8rn";
+ name = "nota-2.2.2.tar.xz";
};
};
pix = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/pix/2.2.1/pix-2.2.1.tar.xz";
- sha256 = "0j2kpcxgdz21phdl0mx84ynalzf6bf3qalq524j7p297pdkrq3d6";
- name = "pix-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/pix/2.2.2/pix-2.2.2.tar.xz";
+ sha256 = "0j315n1aka0pikqyq2hy15k3indr7g8vkcyxsikdd3kj968386pv";
+ name = "pix-2.2.2.tar.xz";
};
};
shelf = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/shelf/2.2.1/shelf-2.2.1.tar.xz";
- sha256 = "1h24mrzq5p63b11caml51az99gjipdlyrbx3na2jsxy4rvzryddm";
- name = "shelf-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/shelf/2.2.2/shelf-2.2.2.tar.xz";
+ sha256 = "1aw6k7z7w0qslya20h0gv3k8h526jrz8a6vb10ack3i5gw6csp1k";
+ name = "shelf-2.2.2.tar.xz";
};
};
station = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/station/2.2.1/station-2.2.1.tar.xz";
- sha256 = "1ch5c4728hahh90nlpqwnlaljpingvwrjwxajan1j2kgwb5lynwz";
- name = "station-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/station/2.2.2/station-2.2.2.tar.xz";
+ sha256 = "1svs6kjbk09l3sprq64bdm01y73vcb10y4ifh5y2a1fwa99c59sb";
+ name = "station-2.2.2.tar.xz";
};
};
strike = {
@@ -156,11 +196,11 @@
};
};
vvave = {
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "${mirror}/stable/maui/vvave/2.2.1/vvave-2.2.1.tar.xz";
- sha256 = "0mg4p44da16xkcra1akvh6f2fixd682clmd6wqgc34j7n1a9y773";
- name = "vvave-2.2.1.tar.xz";
+ url = "${mirror}/stable/maui/vvave/2.2.2/vvave-2.2.2.tar.xz";
+ sha256 = "0m8jg79gz3dljbkrgjqlfmbmpgwawzaz37avx5nj1rlpm36b195f";
+ name = "vvave-2.2.2.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/maui/station.nix b/third_party/nixpkgs/pkgs/applications/maui/station.nix
index 49e8cae3f6..531bb2d483 100644
--- a/third_party/nixpkgs/pkgs/applications/maui/station.nix
+++ b/third_party/nixpkgs/pkgs/applications/maui/station.nix
@@ -2,6 +2,7 @@
, mkDerivation
, cmake
, extra-cmake-modules
+, kconfig
, kcoreaddons
, ki18n
, kirigami2
@@ -19,6 +20,7 @@ mkDerivation {
];
buildInputs = [
+ kconfig
kcoreaddons
ki18n
kirigami2
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
index ef9c234bb7..e70f129b60 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -9,43 +9,43 @@
let
pname = "1password";
- version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA";
+ version = if channel == "stable" then "8.10.4" else "8.10.5-10.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
- sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE=";
+ sha256 = "sha256-zFB8bUl0FNmMvNN5AoDeYdUjasJblVxRAi50V2BF5OU=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
- sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es=";
+ sha256 = "sha256-gALQ43mAJy3eX/0qmdBp0yfMLgAdqAqD93CbDydvJR8=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
- sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs=";
+ sha256 = "sha256-4kpf3U4G3Jx8g24kU4nXZbDA3o29hEpwACOE2zAadhA=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
- sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo=";
+ sha256 = "sha256-eTRI7reSZ24S8uwNFPk8BkwMexdoXD5tlL6Bd3zzIGI=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
- sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk=";
+ sha256 = "sha256-GM93nW7kGeC2Mmq1ZtOK72RQc0QHvlWedDLEAmqtPt4=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
- sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA=";
+ sha256 = "sha256-f0K35utZ/WPv08wRe/ZQPWC/IYiXsf/tBqhKjgeNBHc=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
- sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI=";
+ sha256 = "sha256-zWS1nmRNm2SjMKWRbCJp4DRCzvVsdATdf/EMlpvRz1k=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
- sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE=";
+ sha256 = "sha256-fQ98NJI5h0IBvrcsV8GBt9RBWDiyYq0NPtS5B5ikz8k=";
};
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh
index aab589fd37..fc6d350f23 100755
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/update.sh
@@ -27,6 +27,18 @@ print_hash() {
echo "$CHANNEL ${ARCH}-${OS}: $CURRENT_HASH"
}
+if [[ -z "$STABLE_VER" && -n "$1" ]]; then
+ STABLE_VER="$1"
+fi
+
+if [[ -z "$BETA_VER" && -n "$2" ]]; then
+ BETA_VER="$2"
+fi
+
+if [[ "${BETA_VER: -4}" != "BETA" ]]; then
+ BETA_VER="$BETA_VER.BETA"
+fi
+
if [[ -z "$STABLE_VER" ]]; then
echo "No 'STABLE_VER' environment variable provided, skipping"
else
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
index f7a7281496..f71d1ff0fc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix
@@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
- version = "2.16.1";
+ version = "2.17.0";
sources = rec {
- aarch64-linux = fetch "linux_arm64" "sha256-8zKxd2yY8syGhgyPv06b+ag2bEfFfG19ZmQPrfi+Qh4=" "zip";
- i686-linux = fetch "linux_386" "sha256-3OO0JMJMRqbmq/rD/VRKIMBdjYu66ebEFGNLKX9K6A8=" "zip";
- x86_64-linux = fetch "linux_amd64" "sha256-ZCXfreBiFDc5YFd9YsMddEvzl22KwnnfSQsV6BmHqeA=" "zip";
- aarch64-darwin = fetch "apple_universal" "sha256-vlsqvz+AgEhL7M8cJhxmjjZ6ocIVUdq7MC1EVZOExU8=" "pkg";
+ aarch64-linux = fetch "linux_arm64" "sha256-pnLAFCKhQKOIqp0qDv3DfAqF4fDXjFdw7Jl9WgDf7C0=" "zip";
+ i686-linux = fetch "linux_386" "sha256-o+pSWUOSzDKA5m+Riu3QOi9gQMyEmbIGcE/yUjKu9p8=" "zip";
+ x86_64-linux = fetch "linux_amd64" "sha256-aukQSeC+5p6ioTE6QlzEAM+9VOI34GfzzjaGt/N0klY=" "zip";
+ aarch64-darwin = fetch "apple_universal" "sha256-HSXbbeDWYrFTh9SsKwvNovprWRwaDr3rA6X6E1QJJos=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
index da5bda5569..1f6960c6a4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -13,13 +13,13 @@
buildDotnetModule rec {
pname = "archisteamfarm";
# nixpkgs-update: no auto update
- version = "5.4.3.2";
+ version = "5.4.4.5";
src = fetchFromGitHub {
owner = "justarchinet";
repo = pname;
rev = version;
- sha256 = "sha256-SRWqe8KTjFdgVW7/EYRVUONtDWwxpcZ1GXWFPjKZzpI=";
+ sha256 = "sha256-xSHoBKhqEmWf9BXWhlsMqKGhgeeQi0zSG1nxNzivr7g=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
index e9f36ba984..89995685b4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
@@ -57,7 +57,7 @@
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
- (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.4"; sha256 = "1bzc2vqpsq4mx6rw2rnk4hr14gqd5w8rf2h026gh7rqkwqd3r2dj"; })
+ (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
@@ -80,19 +80,19 @@
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; })
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
- (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
+ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
- (fetchNuGet { pname = "NLog"; version = "5.1.2"; sha256 = "1hgb5lqx9c10kw6rjldrkldd70lmkzij4ssgg6msybgz7vpsyhkk"; })
- (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.2"; sha256 = "09y37z05c8w77hnj2mvzyhgprssam645llliyr0c3jycgy0ls707"; })
- (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.2"; sha256 = "1ig6ffc1z0kadk2v6qsnrxyj945nwsral7jvddhvjhm12bd1zb6d"; })
+ (fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; })
+ (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.3"; sha256 = "0p3zj9l45iv4khmrp5wx0ry9pc8yg3n3ml73mrckhjjw0p5f2lw2"; })
+ (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.3"; sha256 = "059h8r09jk84mbpljfqfbpp19w1wn3bs2nr9wdfg1p8z6mqawm01"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
- (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; })
- (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; })
- (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; })
+ (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; })
+ (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; })
+ (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; })
(fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; })
@@ -101,6 +101,7 @@
(fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
+ (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
(fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; })
(fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; })
(fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; })
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index ca12a2c596..77214dcbda 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -11,8 +11,8 @@ let
repo = "ASF-ui";
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
- rev = "b30b3f5bcea53019bab1d7a433a75936a63eef27";
- sha256 = "0ba4jjf1lxhffj77lcamg390hf8z9avg9skc0iap37zw5n5myb6c";
+ rev = "bc84d62e4f60f24cca6e9f8e820c30c750bcb0de";
+ sha256 = "10z3jv551f41f2k9p6y0yhrqk6jr8pmpkrd479s1zfj40ywh48bc";
};
in
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix
index 2f29f37d72..12949e6195 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix
index 6ef71a0741..ca3b71150e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix
@@ -13,49 +13,49 @@ let
sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==";
};
};
- "@babel/code-frame-7.18.6" = {
+ "@babel/code-frame-7.21.4" = {
name = "_at_babel_slash_code-frame";
packageName = "@babel/code-frame";
- version = "7.18.6";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz";
- sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==";
+ url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz";
+ sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==";
};
};
- "@babel/compat-data-7.20.5" = {
+ "@babel/compat-data-7.21.4" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.20.5";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz";
- sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz";
+ sha512 = "/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==";
};
};
- "@babel/core-7.21.0" = {
+ "@babel/core-7.21.4" = {
name = "_at_babel_slash_core";
packageName = "@babel/core";
- version = "7.21.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz";
- sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==";
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.21.4.tgz";
+ sha512 = "qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==";
};
};
- "@babel/eslint-parser-7.19.1" = {
+ "@babel/eslint-parser-7.21.3" = {
name = "_at_babel_slash_eslint-parser";
packageName = "@babel/eslint-parser";
- version = "7.19.1";
+ version = "7.21.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz";
- sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==";
+ url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz";
+ sha512 = "kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==";
};
};
- "@babel/generator-7.21.0" = {
+ "@babel/generator-7.21.4" = {
name = "_at_babel_slash_generator";
packageName = "@babel/generator";
- version = "7.21.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.0.tgz";
- sha512 = "z/zN3SePOtxN1/vPFdqrkuJGCD2Vx469+dSbNRD+4TF2+6e4Of5exHqAtcfL/2Nwu0RN0QsFwjyDBFwdUMzNSA==";
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz";
+ sha512 = "NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==";
};
};
"@babel/helper-annotate-as-pure-7.18.6" = {
@@ -76,31 +76,31 @@ let
sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw==";
};
};
- "@babel/helper-compilation-targets-7.20.7" = {
+ "@babel/helper-compilation-targets-7.21.4" = {
name = "_at_babel_slash_helper-compilation-targets";
packageName = "@babel/helper-compilation-targets";
- version = "7.20.7";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz";
- sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==";
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz";
+ sha512 = "Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==";
};
};
- "@babel/helper-create-class-features-plugin-7.18.6" = {
+ "@babel/helper-create-class-features-plugin-7.21.4" = {
name = "_at_babel_slash_helper-create-class-features-plugin";
packageName = "@babel/helper-create-class-features-plugin";
- version = "7.18.6";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz";
- sha512 = "YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==";
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz";
+ sha512 = "46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==";
};
};
- "@babel/helper-create-regexp-features-plugin-7.19.0" = {
+ "@babel/helper-create-regexp-features-plugin-7.21.4" = {
name = "_at_babel_slash_helper-create-regexp-features-plugin";
packageName = "@babel/helper-create-regexp-features-plugin";
- version = "7.19.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz";
- sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==";
+ url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz";
+ sha512 = "M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==";
};
};
"@babel/helper-define-polyfill-provider-0.3.3" = {
@@ -148,13 +148,13 @@ let
sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==";
};
};
- "@babel/helper-member-expression-to-functions-7.18.9" = {
+ "@babel/helper-member-expression-to-functions-7.21.0" = {
name = "_at_babel_slash_helper-member-expression-to-functions";
packageName = "@babel/helper-member-expression-to-functions";
- version = "7.18.9";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz";
- sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==";
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz";
+ sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==";
};
};
"@babel/helper-module-imports-7.18.6" = {
@@ -166,13 +166,13 @@ let
sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==";
};
};
- "@babel/helper-module-transforms-7.21.0" = {
+ "@babel/helper-module-transforms-7.21.2" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.21.0";
+ version = "7.21.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz";
- sha512 = "eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz";
+ sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==";
};
};
"@babel/helper-optimise-call-expression-7.18.6" = {
@@ -202,13 +202,13 @@ let
sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==";
};
};
- "@babel/helper-replace-supers-7.19.1" = {
+ "@babel/helper-replace-supers-7.20.7" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.19.1";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz";
- sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz";
+ sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==";
};
};
"@babel/helper-simple-access-7.20.2" = {
@@ -220,13 +220,13 @@ let
sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==";
};
};
- "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = {
+ "@babel/helper-skip-transparent-expression-wrappers-7.20.0" = {
name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
packageName = "@babel/helper-skip-transparent-expression-wrappers";
- version = "7.18.9";
+ version = "7.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz";
- sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==";
+ url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz";
+ sha512 = "5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==";
};
};
"@babel/helper-split-export-declaration-7.18.6" = {
@@ -256,13 +256,13 @@ let
sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==";
};
};
- "@babel/helper-validator-option-7.18.6" = {
+ "@babel/helper-validator-option-7.21.0" = {
name = "_at_babel_slash_helper-validator-option";
packageName = "@babel/helper-validator-option";
- version = "7.18.6";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz";
- sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==";
+ url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz";
+ sha512 = "rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==";
};
};
"@babel/helper-wrap-function-7.18.10" = {
@@ -292,13 +292,13 @@ let
sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==";
};
};
- "@babel/parser-7.21.0" = {
+ "@babel/parser-7.21.4" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.21.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.0.tgz";
- sha512 = "ONjtg4renj14A9pj3iA5T5+r5Eijxbr2eNIkMBTC74occDSsRZUpe8vowmowAjFR1imWlkD8eEmjYXiREZpGZg==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz";
+ sha512 = "alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==";
};
};
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = {
@@ -310,22 +310,22 @@ let
sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==";
};
};
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = {
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" = {
name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining";
packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining";
- version = "7.18.9";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz";
- sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==";
+ url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz";
+ sha512 = "sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==";
};
};
- "@babel/plugin-proposal-async-generator-functions-7.20.1" = {
+ "@babel/plugin-proposal-async-generator-functions-7.20.7" = {
name = "_at_babel_slash_plugin-proposal-async-generator-functions";
packageName = "@babel/plugin-proposal-async-generator-functions";
- version = "7.20.1";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz";
- sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz";
+ sha512 = "xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==";
};
};
"@babel/plugin-proposal-class-properties-7.18.6" = {
@@ -337,13 +337,13 @@ let
sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==";
};
};
- "@babel/plugin-proposal-class-static-block-7.18.6" = {
+ "@babel/plugin-proposal-class-static-block-7.21.0" = {
name = "_at_babel_slash_plugin-proposal-class-static-block";
packageName = "@babel/plugin-proposal-class-static-block";
- version = "7.18.6";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz";
- sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz";
+ sha512 = "XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==";
};
};
"@babel/plugin-proposal-dynamic-import-7.18.6" = {
@@ -373,13 +373,13 @@ let
sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==";
};
};
- "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = {
+ "@babel/plugin-proposal-logical-assignment-operators-7.20.7" = {
name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
packageName = "@babel/plugin-proposal-logical-assignment-operators";
- version = "7.18.9";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz";
- sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz";
+ sha512 = "y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==";
};
};
"@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = {
@@ -400,13 +400,13 @@ let
sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==";
};
};
- "@babel/plugin-proposal-object-rest-spread-7.20.2" = {
+ "@babel/plugin-proposal-object-rest-spread-7.20.7" = {
name = "_at_babel_slash_plugin-proposal-object-rest-spread";
packageName = "@babel/plugin-proposal-object-rest-spread";
- version = "7.20.2";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz";
- sha512 = "Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz";
+ sha512 = "d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==";
};
};
"@babel/plugin-proposal-optional-catch-binding-7.18.6" = {
@@ -418,13 +418,13 @@ let
sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.18.9" = {
+ "@babel/plugin-proposal-optional-chaining-7.21.0" = {
name = "_at_babel_slash_plugin-proposal-optional-chaining";
packageName = "@babel/plugin-proposal-optional-chaining";
- version = "7.18.9";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz";
- sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz";
+ sha512 = "p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==";
};
};
"@babel/plugin-proposal-private-methods-7.18.6" = {
@@ -436,13 +436,13 @@ let
sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==";
};
};
- "@babel/plugin-proposal-private-property-in-object-7.18.6" = {
+ "@babel/plugin-proposal-private-property-in-object-7.21.0" = {
name = "_at_babel_slash_plugin-proposal-private-property-in-object";
packageName = "@babel/plugin-proposal-private-property-in-object";
- version = "7.18.6";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz";
- sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz";
+ sha512 = "ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==";
};
};
"@babel/plugin-proposal-unicode-property-regex-7.18.6" = {
@@ -589,22 +589,22 @@ let
sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==";
};
};
- "@babel/plugin-transform-arrow-functions-7.18.6" = {
+ "@babel/plugin-transform-arrow-functions-7.20.7" = {
name = "_at_babel_slash_plugin-transform-arrow-functions";
packageName = "@babel/plugin-transform-arrow-functions";
- version = "7.18.6";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz";
- sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz";
+ sha512 = "3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==";
};
};
- "@babel/plugin-transform-async-to-generator-7.18.6" = {
+ "@babel/plugin-transform-async-to-generator-7.20.7" = {
name = "_at_babel_slash_plugin-transform-async-to-generator";
packageName = "@babel/plugin-transform-async-to-generator";
- version = "7.18.6";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz";
- sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz";
+ sha512 = "Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==";
};
};
"@babel/plugin-transform-block-scoped-functions-7.18.6" = {
@@ -616,40 +616,40 @@ let
sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==";
};
};
- "@babel/plugin-transform-block-scoping-7.20.2" = {
+ "@babel/plugin-transform-block-scoping-7.21.0" = {
name = "_at_babel_slash_plugin-transform-block-scoping";
packageName = "@babel/plugin-transform-block-scoping";
- version = "7.20.2";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz";
- sha512 = "y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz";
+ sha512 = "Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==";
};
};
- "@babel/plugin-transform-classes-7.20.2" = {
+ "@babel/plugin-transform-classes-7.21.0" = {
name = "_at_babel_slash_plugin-transform-classes";
packageName = "@babel/plugin-transform-classes";
- version = "7.20.2";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz";
- sha512 = "9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz";
+ sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==";
};
};
- "@babel/plugin-transform-computed-properties-7.18.9" = {
+ "@babel/plugin-transform-computed-properties-7.20.7" = {
name = "_at_babel_slash_plugin-transform-computed-properties";
packageName = "@babel/plugin-transform-computed-properties";
- version = "7.18.9";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz";
- sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz";
+ sha512 = "Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==";
};
};
- "@babel/plugin-transform-destructuring-7.20.2" = {
+ "@babel/plugin-transform-destructuring-7.21.3" = {
name = "_at_babel_slash_plugin-transform-destructuring";
packageName = "@babel/plugin-transform-destructuring";
- version = "7.20.2";
+ version = "7.21.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz";
- sha512 = "mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz";
+ sha512 = "bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==";
};
};
"@babel/plugin-transform-dotall-regex-7.18.6" = {
@@ -679,13 +679,13 @@ let
sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==";
};
};
- "@babel/plugin-transform-for-of-7.18.8" = {
+ "@babel/plugin-transform-for-of-7.21.0" = {
name = "_at_babel_slash_plugin-transform-for-of";
packageName = "@babel/plugin-transform-for-of";
- version = "7.18.8";
+ version = "7.21.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz";
- sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz";
+ sha512 = "LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==";
};
};
"@babel/plugin-transform-function-name-7.18.9" = {
@@ -715,31 +715,31 @@ let
sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==";
};
};
- "@babel/plugin-transform-modules-amd-7.19.6" = {
+ "@babel/plugin-transform-modules-amd-7.20.11" = {
name = "_at_babel_slash_plugin-transform-modules-amd";
packageName = "@babel/plugin-transform-modules-amd";
- version = "7.19.6";
+ version = "7.20.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz";
- sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz";
+ sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==";
};
};
- "@babel/plugin-transform-modules-commonjs-7.19.6" = {
+ "@babel/plugin-transform-modules-commonjs-7.21.2" = {
name = "_at_babel_slash_plugin-transform-modules-commonjs";
packageName = "@babel/plugin-transform-modules-commonjs";
- version = "7.19.6";
+ version = "7.21.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz";
- sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz";
+ sha512 = "Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==";
};
};
- "@babel/plugin-transform-modules-systemjs-7.19.6" = {
+ "@babel/plugin-transform-modules-systemjs-7.20.11" = {
name = "_at_babel_slash_plugin-transform-modules-systemjs";
packageName = "@babel/plugin-transform-modules-systemjs";
- version = "7.19.6";
+ version = "7.20.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz";
- sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz";
+ sha512 = "vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==";
};
};
"@babel/plugin-transform-modules-umd-7.18.6" = {
@@ -751,13 +751,13 @@ let
sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==";
};
};
- "@babel/plugin-transform-named-capturing-groups-regex-7.19.1" = {
+ "@babel/plugin-transform-named-capturing-groups-regex-7.20.5" = {
name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
packageName = "@babel/plugin-transform-named-capturing-groups-regex";
- version = "7.19.1";
+ version = "7.20.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz";
- sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz";
+ sha512 = "mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==";
};
};
"@babel/plugin-transform-new-target-7.18.6" = {
@@ -778,13 +778,13 @@ let
sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==";
};
};
- "@babel/plugin-transform-parameters-7.20.1" = {
+ "@babel/plugin-transform-parameters-7.21.3" = {
name = "_at_babel_slash_plugin-transform-parameters";
packageName = "@babel/plugin-transform-parameters";
- version = "7.20.1";
+ version = "7.21.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.1.tgz";
- sha512 = "nDvKLrAvl+kf6BOy1UJ3MGwzzfTMgppxwiD2Jb4LO3xjYyZq30oQzDNJbCQpMdG9+j2IXHoiMrw5Cm/L6ZoxXQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz";
+ sha512 = "Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==";
};
};
"@babel/plugin-transform-property-literals-7.18.6" = {
@@ -796,13 +796,13 @@ let
sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==";
};
};
- "@babel/plugin-transform-regenerator-7.18.6" = {
+ "@babel/plugin-transform-regenerator-7.20.5" = {
name = "_at_babel_slash_plugin-transform-regenerator";
packageName = "@babel/plugin-transform-regenerator";
- version = "7.18.6";
+ version = "7.20.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz";
- sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz";
+ sha512 = "kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==";
};
};
"@babel/plugin-transform-reserved-words-7.18.6" = {
@@ -823,13 +823,13 @@ let
sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==";
};
};
- "@babel/plugin-transform-spread-7.19.0" = {
+ "@babel/plugin-transform-spread-7.20.7" = {
name = "_at_babel_slash_plugin-transform-spread";
packageName = "@babel/plugin-transform-spread";
- version = "7.19.0";
+ version = "7.20.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz";
- sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz";
+ sha512 = "ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==";
};
};
"@babel/plugin-transform-sticky-regex-7.18.6" = {
@@ -877,13 +877,13 @@ let
sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==";
};
};
- "@babel/preset-env-7.20.2" = {
+ "@babel/preset-env-7.21.4" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.20.2";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz";
- sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==";
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.4.tgz";
+ sha512 = "2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==";
};
};
"@babel/preset-modules-0.1.5" = {
@@ -895,6 +895,15 @@ let
sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==";
};
};
+ "@babel/regjsgen-0.8.0" = {
+ name = "_at_babel_slash_regjsgen";
+ packageName = "@babel/regjsgen";
+ version = "0.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz";
+ sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==";
+ };
+ };
"@babel/runtime-7.14.6" = {
name = "_at_babel_slash_runtime";
packageName = "@babel/runtime";
@@ -913,22 +922,22 @@ let
sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==";
};
};
- "@babel/traverse-7.21.0" = {
+ "@babel/traverse-7.21.4" = {
name = "_at_babel_slash_traverse";
packageName = "@babel/traverse";
- version = "7.21.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.0.tgz";
- sha512 = "Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==";
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz";
+ sha512 = "eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==";
};
};
- "@babel/types-7.21.0" = {
+ "@babel/types-7.21.4" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.21.0";
+ version = "7.21.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.21.0.tgz";
- sha512 = "uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz";
+ sha512 = "rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==";
};
};
"@discoveryjs/json-ext-0.5.7" = {
@@ -940,49 +949,76 @@ let
sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==";
};
};
- "@eslint/eslintrc-1.4.1" = {
+ "@eslint-community/eslint-utils-4.3.0" = {
+ name = "_at_eslint-community_slash_eslint-utils";
+ packageName = "@eslint-community/eslint-utils";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.3.0.tgz";
+ sha512 = "v3oplH6FYCULtFuCeqyuTd9D2WKO937Dxdq+GmHOLL72TTRriLxz2VLlNfkZRsvj6PKnOPAtuT6dwrs/pA5DvA==";
+ };
+ };
+ "@eslint-community/regexpp-4.4.0" = {
+ name = "_at_eslint-community_slash_regexpp";
+ packageName = "@eslint-community/regexpp";
+ version = "4.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz";
+ sha512 = "A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==";
+ };
+ };
+ "@eslint/eslintrc-2.0.2" = {
name = "_at_eslint_slash_eslintrc";
packageName = "@eslint/eslintrc";
- version = "1.4.1";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz";
- sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==";
+ url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz";
+ sha512 = "3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==";
};
};
- "@fortawesome/fontawesome-common-types-6.3.0" = {
+ "@eslint/js-8.37.0" = {
+ name = "_at_eslint_slash_js";
+ packageName = "@eslint/js";
+ version = "8.37.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz";
+ sha512 = "x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==";
+ };
+ };
+ "@fortawesome/fontawesome-common-types-6.4.0" = {
name = "_at_fortawesome_slash_fontawesome-common-types";
packageName = "@fortawesome/fontawesome-common-types";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz";
- sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==";
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz";
+ sha512 = "HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==";
};
};
- "@fortawesome/fontawesome-svg-core-6.3.0" = {
+ "@fortawesome/fontawesome-svg-core-6.4.0" = {
name = "_at_fortawesome_slash_fontawesome-svg-core";
packageName = "@fortawesome/fontawesome-svg-core";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz";
- sha512 = "uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==";
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz";
+ sha512 = "Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==";
};
};
- "@fortawesome/free-brands-svg-icons-6.3.0" = {
+ "@fortawesome/free-brands-svg-icons-6.4.0" = {
name = "_at_fortawesome_slash_free-brands-svg-icons";
packageName = "@fortawesome/free-brands-svg-icons";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.3.0.tgz";
- sha512 = "xI0c+a8xnKItAXCN8rZgCNCJQiVAd2Y7p9e2ND6zN3J3ekneu96qrePieJ7yA7073C1JxxoM3vH1RU7rYsaj8w==";
+ url = "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.0.tgz";
+ sha512 = "qvxTCo0FQ5k2N+VCXb/PZQ+QMhqRVM4OORiO6MXdG6bKolIojGU/srQ1ptvKk0JTbRgaJOfL2qMqGvBEZG7Z6g==";
};
};
- "@fortawesome/free-solid-svg-icons-6.3.0" = {
+ "@fortawesome/free-solid-svg-icons-6.4.0" = {
name = "_at_fortawesome_slash_free-solid-svg-icons";
packageName = "@fortawesome/free-solid-svg-icons";
- version = "6.3.0";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz";
- sha512 = "x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==";
+ url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz";
+ sha512 = "kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==";
};
};
"@fortawesome/vue-fontawesome-2.0.10" = {
@@ -2749,13 +2785,13 @@ let
sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==";
};
};
- "eslint-8.34.0" = {
+ "eslint-8.37.0" = {
name = "eslint";
packageName = "eslint";
- version = "8.34.0";
+ version = "8.37.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz";
- sha512 = "1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==";
+ url = "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz";
+ sha512 = "NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==";
};
};
"eslint-config-airbnb-base-15.0.0" = {
@@ -2794,13 +2830,13 @@ let
sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==";
};
};
- "eslint-plugin-vue-9.9.0" = {
+ "eslint-plugin-vue-9.10.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
- version = "9.9.0";
+ version = "9.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz";
- sha512 = "YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==";
+ url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.10.0.tgz";
+ sha512 = "2MgP31OBf8YilUvtakdVMc8xVbcMp7z7/iQj8LHVpXrSXHPXSJRUIGSPFI6b6pyCx/buKaFJ45ycqfHvQRiW2g==";
};
};
"eslint-scope-5.1.1" = {
@@ -2821,15 +2857,6 @@ let
sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==";
};
};
- "eslint-utils-3.0.0" = {
- name = "eslint-utils";
- packageName = "eslint-utils";
- version = "3.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz";
- sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==";
- };
- };
"eslint-visitor-keys-2.1.0" = {
name = "eslint-visitor-keys";
packageName = "eslint-visitor-keys";
@@ -2839,31 +2866,31 @@ let
sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==";
};
};
- "eslint-visitor-keys-3.3.0" = {
+ "eslint-visitor-keys-3.4.0" = {
name = "eslint-visitor-keys";
packageName = "eslint-visitor-keys";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz";
- sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==";
+ url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz";
+ sha512 = "HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==";
};
};
- "espree-9.4.0" = {
+ "espree-9.5.1" = {
name = "espree";
packageName = "espree";
- version = "9.4.0";
+ version = "9.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz";
- sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==";
+ url = "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz";
+ sha512 = "5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==";
};
};
- "esquery-1.4.0" = {
+ "esquery-1.4.2" = {
name = "esquery";
packageName = "esquery";
- version = "1.4.0";
+ version = "1.4.2";
src = fetchurl {
- url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz";
- sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==";
+ url = "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz";
+ sha512 = "JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==";
};
};
"esrecurse-4.3.0" = {
@@ -4117,13 +4144,22 @@ let
sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
};
};
- "klona-2.0.5" = {
+ "klona-2.0.6" = {
name = "klona";
packageName = "klona";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz";
- sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==";
+ url = "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz";
+ sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==";
+ };
+ };
+ "launch-editor-2.6.0" = {
+ name = "launch-editor";
+ packageName = "launch-editor";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz";
+ sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==";
};
};
"levn-0.4.1" = {
@@ -4135,22 +4171,22 @@ let
sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
};
};
- "linkify-html-4.1.0" = {
+ "linkify-html-4.1.1" = {
name = "linkify-html";
packageName = "linkify-html";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.1.0.tgz";
- sha512 = "cQSNN4i5V1xRjdSUEnXgn855xsl+usD7zBSsNyMSFBf4NlaZFocn7cExJA217azxODeqea79b6fDPXLa7jdkcA==";
+ url = "https://registry.npmjs.org/linkify-html/-/linkify-html-4.1.1.tgz";
+ sha512 = "7RcF7gIhEOGBBvs7orCJ2tevaz7iF0ZLZSRPWNNBOnW/uGjOOQYB+ztSeHF6dchMC2dM9H8zZlt6Z959bjteaw==";
};
};
- "linkifyjs-4.1.0" = {
+ "linkifyjs-4.1.1" = {
name = "linkifyjs";
packageName = "linkifyjs";
- version = "4.1.0";
+ version = "4.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.0.tgz";
- sha512 = "Ffv8VoY3+ixI1b3aZ3O+jM6x17cOsgwfB1Wq7pkytbo1WlyRp6ZO0YDMqiWT/gQPY/CmtiGuKfzDIVqxh1aCTA==";
+ url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-4.1.1.tgz";
+ sha512 = "zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==";
};
};
"loader-runner-4.2.0" = {
@@ -5170,13 +5206,13 @@ let
sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
};
};
- "regenerate-unicode-properties-10.0.1" = {
+ "regenerate-unicode-properties-10.1.0" = {
name = "regenerate-unicode-properties";
packageName = "regenerate-unicode-properties";
- version = "10.0.1";
+ version = "10.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz";
- sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==";
+ url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz";
+ sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==";
};
};
"regenerator-runtime-0.13.7" = {
@@ -5188,13 +5224,13 @@ let
sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
};
};
- "regenerator-transform-0.15.0" = {
+ "regenerator-transform-0.15.1" = {
name = "regenerator-transform";
packageName = "regenerator-transform";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchurl {
- url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz";
- sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==";
+ url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz";
+ sha512 = "knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==";
};
};
"regexp.prototype.flags-1.4.3" = {
@@ -5206,40 +5242,22 @@ let
sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==";
};
};
- "regexpp-3.2.0" = {
- name = "regexpp";
- packageName = "regexpp";
- version = "3.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz";
- sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==";
- };
- };
- "regexpu-core-5.1.0" = {
+ "regexpu-core-5.3.2" = {
name = "regexpu-core";
packageName = "regexpu-core";
- version = "5.1.0";
+ version = "5.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz";
- sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==";
+ url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz";
+ sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==";
};
};
- "regjsgen-0.6.0" = {
- name = "regjsgen";
- packageName = "regjsgen";
- version = "0.6.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz";
- sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==";
- };
- };
- "regjsparser-0.8.4" = {
+ "regjsparser-0.9.1" = {
name = "regjsparser";
packageName = "regjsparser";
- version = "0.8.4";
+ version = "0.9.1";
src = fetchurl {
- url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz";
- sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==";
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz";
+ sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==";
};
};
"relateurl-0.2.7" = {
@@ -5395,22 +5413,22 @@ let
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
- "sass-1.58.3" = {
+ "sass-1.60.0" = {
name = "sass";
packageName = "sass";
- version = "1.58.3";
+ version = "1.60.0";
src = fetchurl {
- url = "https://registry.npmjs.org/sass/-/sass-1.58.3.tgz";
- sha512 = "Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==";
+ url = "https://registry.npmjs.org/sass/-/sass-1.60.0.tgz";
+ sha512 = "updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==";
};
};
- "sass-loader-13.2.0" = {
+ "sass-loader-13.2.2" = {
name = "sass-loader";
packageName = "sass-loader";
- version = "13.2.0";
+ version = "13.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz";
- sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==";
+ url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.2.tgz";
+ sha512 = "nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==";
};
};
"schema-utils-3.0.0" = {
@@ -5557,6 +5575,15 @@ let
sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
};
};
+ "shell-quote-1.8.0" = {
+ name = "shell-quote";
+ packageName = "shell-quote";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz";
+ sha512 = "QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==";
+ };
+ };
"side-channel-1.0.4" = {
name = "side-channel";
packageName = "side-channel";
@@ -5953,22 +5980,22 @@ let
sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==";
};
};
- "unicode-match-property-value-ecmascript-2.0.0" = {
+ "unicode-match-property-value-ecmascript-2.1.0" = {
name = "unicode-match-property-value-ecmascript";
packageName = "unicode-match-property-value-ecmascript";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz";
- sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==";
+ url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz";
+ sha512 = "qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==";
};
};
- "unicode-property-aliases-ecmascript-2.0.0" = {
+ "unicode-property-aliases-ecmascript-2.1.0" = {
name = "unicode-property-aliases-ecmascript";
packageName = "unicode-property-aliases-ecmascript";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz";
- sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==";
+ url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz";
+ sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==";
};
};
"unpipe-1.0.0" = {
@@ -6205,13 +6232,13 @@ let
sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
};
};
- "webpack-5.75.0" = {
+ "webpack-5.77.0" = {
name = "webpack";
packageName = "webpack";
- version = "5.75.0";
+ version = "5.77.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz";
- sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz";
+ sha512 = "sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==";
};
};
"webpack-bundle-analyzer-4.8.0" = {
@@ -6241,13 +6268,13 @@ let
sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==";
};
};
- "webpack-dev-server-4.11.1" = {
+ "webpack-dev-server-4.13.2" = {
name = "webpack-dev-server";
packageName = "webpack-dev-server";
- version = "4.11.1";
+ version = "4.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz";
- sha512 = "lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==";
+ url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.2.tgz";
+ sha512 = "5i6TrGBRxG4vnfDpB6qSQGfnB6skGBXNL5/542w2uRGLimX6qeE5BQMLrzIC3JYV/xlGOv+s+hTleI9AZKUQNw==";
};
};
"webpack-merge-5.8.0" = {
@@ -6358,13 +6385,13 @@ let
sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==";
};
};
- "ws-8.4.2" = {
+ "ws-8.13.0" = {
name = "ws";
packageName = "ws";
- version = "8.4.2";
+ version = "8.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz";
- sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==";
+ url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz";
+ sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==";
};
};
"xml-name-validator-4.0.0" = {
@@ -6424,9 +6451,9 @@ let
sources."@jridgewell/gen-mapping-0.1.1"
];
})
- sources."@babel/code-frame-7.18.6"
- sources."@babel/compat-data-7.20.5"
- (sources."@babel/core-7.21.0" // {
+ sources."@babel/code-frame-7.21.4"
+ sources."@babel/compat-data-7.21.4"
+ (sources."@babel/core-7.21.4" // {
dependencies = [
sources."debug-4.3.4"
sources."json5-2.2.3"
@@ -6434,24 +6461,24 @@ let
sources."semver-6.3.0"
];
})
- (sources."@babel/eslint-parser-7.19.1" // {
+ (sources."@babel/eslint-parser-7.21.3" // {
dependencies = [
sources."eslint-visitor-keys-2.1.0"
sources."semver-6.3.0"
];
})
- sources."@babel/generator-7.21.0"
+ sources."@babel/generator-7.21.4"
sources."@babel/helper-annotate-as-pure-7.18.6"
sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6"
- (sources."@babel/helper-compilation-targets-7.20.7" // {
+ (sources."@babel/helper-compilation-targets-7.21.4" // {
dependencies = [
sources."lru-cache-5.1.1"
sources."semver-6.3.0"
sources."yallist-3.1.1"
];
})
- sources."@babel/helper-create-class-features-plugin-7.18.6"
- sources."@babel/helper-create-regexp-features-plugin-7.19.0"
+ sources."@babel/helper-create-class-features-plugin-7.21.4"
+ sources."@babel/helper-create-regexp-features-plugin-7.21.4"
(sources."@babel/helper-define-polyfill-provider-0.3.3" // {
dependencies = [
sources."debug-4.3.4"
@@ -6463,39 +6490,39 @@ let
sources."@babel/helper-explode-assignable-expression-7.18.6"
sources."@babel/helper-function-name-7.21.0"
sources."@babel/helper-hoist-variables-7.18.6"
- sources."@babel/helper-member-expression-to-functions-7.18.9"
+ sources."@babel/helper-member-expression-to-functions-7.21.0"
sources."@babel/helper-module-imports-7.18.6"
- sources."@babel/helper-module-transforms-7.21.0"
+ sources."@babel/helper-module-transforms-7.21.2"
sources."@babel/helper-optimise-call-expression-7.18.6"
sources."@babel/helper-plugin-utils-7.20.2"
sources."@babel/helper-remap-async-to-generator-7.18.9"
- sources."@babel/helper-replace-supers-7.19.1"
+ sources."@babel/helper-replace-supers-7.20.7"
sources."@babel/helper-simple-access-7.20.2"
- sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9"
+ sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0"
sources."@babel/helper-split-export-declaration-7.18.6"
sources."@babel/helper-string-parser-7.19.4"
sources."@babel/helper-validator-identifier-7.19.1"
- sources."@babel/helper-validator-option-7.18.6"
+ sources."@babel/helper-validator-option-7.21.0"
sources."@babel/helper-wrap-function-7.18.10"
sources."@babel/helpers-7.21.0"
sources."@babel/highlight-7.18.6"
- sources."@babel/parser-7.21.0"
+ sources."@babel/parser-7.21.4"
sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6"
- sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9"
- sources."@babel/plugin-proposal-async-generator-functions-7.20.1"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7"
+ sources."@babel/plugin-proposal-async-generator-functions-7.20.7"
sources."@babel/plugin-proposal-class-properties-7.18.6"
- sources."@babel/plugin-proposal-class-static-block-7.18.6"
+ sources."@babel/plugin-proposal-class-static-block-7.21.0"
sources."@babel/plugin-proposal-dynamic-import-7.18.6"
sources."@babel/plugin-proposal-export-namespace-from-7.18.9"
sources."@babel/plugin-proposal-json-strings-7.18.6"
- sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.20.7"
sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6"
sources."@babel/plugin-proposal-numeric-separator-7.18.6"
- sources."@babel/plugin-proposal-object-rest-spread-7.20.2"
+ sources."@babel/plugin-proposal-object-rest-spread-7.20.7"
sources."@babel/plugin-proposal-optional-catch-binding-7.18.6"
- sources."@babel/plugin-proposal-optional-chaining-7.18.9"
+ sources."@babel/plugin-proposal-optional-chaining-7.21.0"
sources."@babel/plugin-proposal-private-methods-7.18.6"
- sources."@babel/plugin-proposal-private-property-in-object-7.18.6"
+ sources."@babel/plugin-proposal-private-property-in-object-7.21.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.18.6"
sources."@babel/plugin-syntax-async-generators-7.8.4"
sources."@babel/plugin-syntax-class-properties-7.12.13"
@@ -6512,65 +6539,69 @@ let
sources."@babel/plugin-syntax-optional-chaining-7.8.3"
sources."@babel/plugin-syntax-private-property-in-object-7.14.5"
sources."@babel/plugin-syntax-top-level-await-7.14.5"
- sources."@babel/plugin-transform-arrow-functions-7.18.6"
- sources."@babel/plugin-transform-async-to-generator-7.18.6"
+ sources."@babel/plugin-transform-arrow-functions-7.20.7"
+ sources."@babel/plugin-transform-async-to-generator-7.20.7"
sources."@babel/plugin-transform-block-scoped-functions-7.18.6"
- sources."@babel/plugin-transform-block-scoping-7.20.2"
- sources."@babel/plugin-transform-classes-7.20.2"
- sources."@babel/plugin-transform-computed-properties-7.18.9"
- sources."@babel/plugin-transform-destructuring-7.20.2"
+ sources."@babel/plugin-transform-block-scoping-7.21.0"
+ sources."@babel/plugin-transform-classes-7.21.0"
+ sources."@babel/plugin-transform-computed-properties-7.20.7"
+ sources."@babel/plugin-transform-destructuring-7.21.3"
sources."@babel/plugin-transform-dotall-regex-7.18.6"
sources."@babel/plugin-transform-duplicate-keys-7.18.9"
sources."@babel/plugin-transform-exponentiation-operator-7.18.6"
- sources."@babel/plugin-transform-for-of-7.18.8"
+ sources."@babel/plugin-transform-for-of-7.21.0"
sources."@babel/plugin-transform-function-name-7.18.9"
sources."@babel/plugin-transform-literals-7.18.9"
sources."@babel/plugin-transform-member-expression-literals-7.18.6"
- sources."@babel/plugin-transform-modules-amd-7.19.6"
- sources."@babel/plugin-transform-modules-commonjs-7.19.6"
- sources."@babel/plugin-transform-modules-systemjs-7.19.6"
+ sources."@babel/plugin-transform-modules-amd-7.20.11"
+ sources."@babel/plugin-transform-modules-commonjs-7.21.2"
+ sources."@babel/plugin-transform-modules-systemjs-7.20.11"
sources."@babel/plugin-transform-modules-umd-7.18.6"
- sources."@babel/plugin-transform-named-capturing-groups-regex-7.19.1"
+ sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5"
sources."@babel/plugin-transform-new-target-7.18.6"
sources."@babel/plugin-transform-object-super-7.18.6"
- sources."@babel/plugin-transform-parameters-7.20.1"
+ sources."@babel/plugin-transform-parameters-7.21.3"
sources."@babel/plugin-transform-property-literals-7.18.6"
- sources."@babel/plugin-transform-regenerator-7.18.6"
+ sources."@babel/plugin-transform-regenerator-7.20.5"
sources."@babel/plugin-transform-reserved-words-7.18.6"
sources."@babel/plugin-transform-shorthand-properties-7.18.6"
- sources."@babel/plugin-transform-spread-7.19.0"
+ sources."@babel/plugin-transform-spread-7.20.7"
sources."@babel/plugin-transform-sticky-regex-7.18.6"
sources."@babel/plugin-transform-template-literals-7.18.9"
sources."@babel/plugin-transform-typeof-symbol-7.18.9"
sources."@babel/plugin-transform-unicode-escapes-7.18.10"
sources."@babel/plugin-transform-unicode-regex-7.18.6"
- (sources."@babel/preset-env-7.20.2" // {
+ (sources."@babel/preset-env-7.21.4" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."@babel/preset-modules-0.1.5"
+ sources."@babel/regjsgen-0.8.0"
sources."@babel/runtime-7.14.6"
sources."@babel/template-7.20.7"
- (sources."@babel/traverse-7.21.0" // {
+ (sources."@babel/traverse-7.21.4" // {
dependencies = [
sources."debug-4.3.3"
sources."ms-2.1.2"
];
})
- sources."@babel/types-7.21.0"
+ sources."@babel/types-7.21.4"
sources."@discoveryjs/json-ext-0.5.7"
- (sources."@eslint/eslintrc-1.4.1" // {
+ sources."@eslint-community/eslint-utils-4.3.0"
+ sources."@eslint-community/regexpp-4.4.0"
+ (sources."@eslint/eslintrc-2.0.2" // {
dependencies = [
sources."debug-4.3.3"
sources."globals-13.19.0"
sources."ms-2.1.2"
];
})
- sources."@fortawesome/fontawesome-common-types-6.3.0"
- sources."@fortawesome/fontawesome-svg-core-6.3.0"
- sources."@fortawesome/free-brands-svg-icons-6.3.0"
- sources."@fortawesome/free-solid-svg-icons-6.3.0"
+ sources."@eslint/js-8.37.0"
+ sources."@fortawesome/fontawesome-common-types-6.4.0"
+ sources."@fortawesome/fontawesome-svg-core-6.4.0"
+ sources."@fortawesome/free-brands-svg-icons-6.4.0"
+ sources."@fortawesome/free-solid-svg-icons-6.4.0"
sources."@fortawesome/vue-fontawesome-2.0.10"
(sources."@humanwhocodes/config-array-0.11.8" // {
dependencies = [
@@ -6803,7 +6834,7 @@ let
sources."escalade-3.1.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
- (sources."eslint-8.34.0" // {
+ (sources."eslint-8.37.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-4.1.2"
@@ -6846,7 +6877,7 @@ let
sources."semver-6.3.0"
];
})
- (sources."eslint-plugin-vue-9.9.0" // {
+ (sources."eslint-plugin-vue-9.10.0" // {
dependencies = [
sources."debug-4.3.4"
sources."eslint-scope-7.1.1"
@@ -6856,14 +6887,9 @@ let
];
})
sources."eslint-scope-5.1.1"
- (sources."eslint-utils-3.0.0" // {
- dependencies = [
- sources."eslint-visitor-keys-2.1.0"
- ];
- })
- sources."eslint-visitor-keys-3.3.0"
- sources."espree-9.4.0"
- (sources."esquery-1.4.0" // {
+ sources."eslint-visitor-keys-3.4.0"
+ sources."espree-9.5.1"
+ (sources."esquery-1.4.2" // {
dependencies = [
sources."estraverse-5.2.0"
];
@@ -7055,10 +7081,11 @@ let
sources."json-stable-stringify-without-jsonify-1.0.1"
sources."json5-1.0.1"
sources."kind-of-6.0.3"
- sources."klona-2.0.5"
+ sources."klona-2.0.6"
+ sources."launch-editor-2.6.0"
sources."levn-0.4.1"
- sources."linkify-html-4.1.0"
- sources."linkifyjs-4.1.0"
+ sources."linkify-html-4.1.1"
+ sources."linkifyjs-4.1.1"
sources."loader-runner-4.2.0"
(sources."loader-utils-1.4.0" // {
dependencies = [
@@ -7173,14 +7200,12 @@ let
sources."readdirp-3.6.0"
sources."rechoir-0.7.1"
sources."regenerate-1.4.2"
- sources."regenerate-unicode-properties-10.0.1"
+ sources."regenerate-unicode-properties-10.1.0"
sources."regenerator-runtime-0.13.7"
- sources."regenerator-transform-0.15.0"
+ sources."regenerator-transform-0.15.1"
sources."regexp.prototype.flags-1.4.3"
- sources."regexpp-3.2.0"
- sources."regexpu-core-5.1.0"
- sources."regjsgen-0.6.0"
- (sources."regjsparser-0.8.4" // {
+ sources."regexpu-core-5.3.2"
+ (sources."regjsparser-0.9.1" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -7199,8 +7224,8 @@ let
sources."safe-buffer-5.1.2"
sources."safe-regex-test-1.0.0"
sources."safer-buffer-2.1.2"
- sources."sass-1.58.3"
- sources."sass-loader-13.2.0"
+ sources."sass-1.60.0"
+ sources."sass-loader-13.2.2"
sources."schema-utils-3.1.1"
sources."select-hose-2.0.0"
sources."selfsigned-2.1.1"
@@ -7228,6 +7253,7 @@ let
sources."shallow-clone-3.0.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
+ sources."shell-quote-1.8.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.3"
sources."sirv-1.0.17"
@@ -7287,8 +7313,8 @@ let
sources."unbox-primitive-1.0.2"
sources."unicode-canonical-property-names-ecmascript-2.0.0"
sources."unicode-match-property-ecmascript-2.0.0"
- sources."unicode-match-property-value-ecmascript-2.0.0"
- sources."unicode-property-aliases-ecmascript-2.0.0"
+ sources."unicode-match-property-value-ecmascript-2.1.0"
+ sources."unicode-property-aliases-ecmascript-2.1.0"
sources."unpipe-1.0.0"
sources."update-browserslist-db-1.0.9"
sources."uri-js-4.2.2"
@@ -7330,7 +7356,7 @@ let
sources."vuex-3.6.2"
sources."watchpack-2.4.0"
sources."wbuf-1.7.3"
- sources."webpack-5.75.0"
+ sources."webpack-5.77.0"
(sources."webpack-bundle-analyzer-4.8.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -7356,9 +7382,9 @@ let
sources."schema-utils-4.0.0"
];
})
- (sources."webpack-dev-server-4.11.1" // {
+ (sources."webpack-dev-server-4.13.2" // {
dependencies = [
- sources."ajv-8.11.0"
+ sources."ajv-8.12.0"
sources."ajv-keywords-5.1.0"
sources."json-schema-traverse-1.0.0"
sources."schema-utils-4.0.0"
@@ -7375,7 +7401,7 @@ let
sources."wildcard-2.0.0"
sources."word-wrap-1.2.3"
sources."wrappy-1.0.2"
- sources."ws-8.4.2"
+ sources."ws-8.13.0"
sources."xml-name-validator-4.0.0"
sources."yallist-2.1.2"
sources."yocto-queue-0.1.0"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix
index 5f6d1c4195..226219ca24 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix
@@ -22,20 +22,20 @@
stdenv.mkDerivation rec {
pname = "authenticator";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Authenticator";
rev = version;
- hash = "sha256-Nv4QE6gyh42Na/stAgTIapV8GQuUHCdL6IEO//J8dV8=";
+ hash = "sha256-WR5gXGry4wti2M4D/IQvwI7OSak1p+O+XAhr01hdv2Q=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-IS9jdr19VvgX6M1OqM6rjE8veujZcwBuOTuDm5mDXso=";
+ hash = "sha256-ZVDKTJojblVCbbdtnqcL+UVW1vkmu99AXCbgyCGNHCM=";
};
nativeBuildInputs = [
@@ -67,19 +67,11 @@ stdenv.mkDerivation rec {
zbar
];
- # https://gitlab.gnome.org/World/Authenticator/-/issues/362
- preBuild = ''
- export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED"
- '';
-
meta = {
description = "Two-factor authentication code generator for GNOME";
homepage = "https://gitlab.gnome.org/World/Authenticator";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ austinbutler ];
platforms = lib.platforms.linux;
- # Fails to build on aarch64 with error
- # "a label can only be part of a statement and a declaration is not a statement"
- broken = stdenv.isLinux && stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
index 319b264a36..df783bdbba 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
libharu
libepoxy
]
- ++ lib.optional (!stdenv.isAarch64) [
+ ++ lib.optionals (!stdenv.isAarch64) [
openimagedenoise
embree
]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
index 4f7052f915..1c7a382cb3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix
@@ -1,6 +1,6 @@
{ lib
, fetchFromGitHub
-, fetchFromGitLab
+, fetchpatch
, gitUpdater
, python3Packages
, blueprint-compiler
@@ -38,7 +38,15 @@ python3Packages.buildPythonApplication rec {
sha256 = "sha256-8VF/CD0Wu2eV6wOpj/M6peKDthFWlcg+1NzzTSIH4S8=";
};
- patches = [ ./vulkan_icd.patch ];
+ patches = [
+ ./vulkan_icd.patch
+
+ # Remove next version
+ (fetchpatch {
+ url = "https://github.com/bottlesdevs/Bottles/commit/7cb284f9bac0b71bf632bfc70d94f7a53bc51267.patch";
+ hash = "sha256-mRF+BtQ0qM7Yvx7SONeH2wc04F87fEyNRlBuyQrzN8Y=";
+ })
+ ];
# https://github.com/bottlesdevs/Bottles/wiki/Packaging
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix
index 34036894d6..c5b6f924c3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix
@@ -1,5 +1,5 @@
{ lib
-, buildFHSUserEnvBubblewrap
+, buildFHSEnv
, symlinkJoin
, bottles-unwrapped
, gst_all_1
@@ -99,8 +99,8 @@ in
symlinkJoin {
name = "bottles";
paths = [
- (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles"; runScript = "bottles"; }))
- (buildFHSUserEnvBubblewrap (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))
+ (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; }))
+ (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))
];
postBuild = ''
mkdir -p $out/share
diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
index 249288c77c..ab047e0809 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix
@@ -8,7 +8,6 @@ let
flask-api
flask-bootstrap
flask-paginate
- flask-reverse-proxy-fix
flask-wtf
arrow
werkzeug
@@ -18,20 +17,20 @@ let
];
in
with python3.pkgs; buildPythonApplication rec {
- version = "4.7";
+ version = "4.8";
pname = "buku";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c=";
+ sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8=";
};
nativeCheckInputs = [
hypothesis
pytest
- pytest-vcr
+ pytest-recording
pyyaml
mypy-extensions
click
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
index 70f5f16f39..8da59ffe28 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
@@ -30,26 +30,26 @@
, unrarSupport ? false
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "calibre";
- version = "6.15.1";
+ version = "6.16.0";
src = fetchurl {
- url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- hash = "sha256-t9fG1hBlQmDh0i5ezBoqk9C9oliNNF0peKDz1YH7RBo=";
+ url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
+ hash = "sha256-2Lhp9PBZ19svq26PoldJ1H8tmt95MwY0l7+g6mPUvFI=";
};
- # https://sources.debian.org/patches/calibre/${version}+dfsg-1
+ # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1
patches = [
# allow for plugin update check, but no calibre version check
(fetchpatch {
name = "0001-only-plugin-update.patch";
- url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0001-only-plugin-update.patch";
+ url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0001-only-plugin-update.patch";
hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ=";
})
(fetchpatch {
- name = "0006-Hardening-Qt-code.patch";
- url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}-1/debian/patches/0006-Hardening-Qt-code.patch";
+ name = "0007-Hardening-Qt-code.patch";
+ url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0007-Hardening-Qt-code.patch";
hash = "sha256-9P1kGrQbWAWDzu5EUiQr7TiCPHRWUA8hxPpEvFpK20k=";
})
]
@@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ podofo.dev ];
- meta = with lib; {
+ meta = {
homepage = "https://calibre-ebook.com";
description = "Comprehensive e-book software";
longDescription = ''
@@ -200,8 +200,12 @@ stdenv.mkDerivation rec {
it takes things a step beyond normal e-book software. It’s also completely
free and open source and great for both casual users and computer experts.
'';
- license = with licenses; if unrarSupport then unfreeRedistributable else gpl3Plus;
- maintainers = with maintainers; [ pSub AndersonTorres ];
- platforms = platforms.linux;
+ changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}";
+ license = if unrarSupport
+ then lib.licenses.unfreeRedistributable
+ else lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ pSub AndersonTorres ];
+ platforms = lib.platforms.unix;
+ broken = stdenv.isDarwin;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix
new file mode 100644
index 0000000000..a96f68c571
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix
@@ -0,0 +1,47 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "chatblade";
+ version = "0.2.3";
+ format = "setuptools";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk=";
+ };
+
+ doCheck = false; # there are no tests
+
+ pythonImportsCheck = [ "chatblade" ];
+ propagatedBuildInputs = with python3Packages; [
+ aiohttp
+ aiosignal
+ async-timeout
+ attrs
+ certifi
+ charset-normalizer
+ frozenlist
+ idna
+ markdown-it-py
+ mdurl
+ multidict
+ openai
+ platformdirs
+ pygments
+ pyyaml
+ regex
+ requests
+ rich
+ tiktoken
+ tqdm
+ urllib3
+ yarl
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/npiv/chatblade/";
+ description = "A CLI Swiss Army Knife for ChatGPT";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ deejayem ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix
index d7919d2a71..79317e7211 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "CopyQ";
- version = "7.0.0";
+ version = "unstable-2023-04-14";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
- rev = "v${version}";
- hash = "sha256-Wk1kTbL6LYgs1edazU39LlNZMAAm6wDbEPjuXvb5EkE=";
+ rev = "c4e481315be5a1fa35503c9717b396319b43aa9b";
+ hash = "sha256-XLuawTKzDi+ixEUcsllyW5tCVTPlzIozu1UzYOjTqDU=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix
index 197e7ec86d..d6e3bb28e1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cpu-x/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "cpu-x";
- version = "4.5.2";
+ version = "4.5.3";
src = fetchFromGitHub {
owner = "X0rg";
repo = "CPU-X";
rev = "v${version}";
- sha256 = "sha256-VPmwnzoOBNLDYZsoEknbcX7QP2Tcm08pL/rw1uCK8xM=";
+ sha256 = "sha256-o48NkOPabfnwsu+nyXJOstW6g0JSUgIrEFx1nNCR7XE=";
};
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix
index 7ec4522678..906cf082e2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "crow-translate";
- version = "2.10.3";
+ version = "2.10.4";
src = fetchzip {
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
- hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ=";
+ hash = "sha256-M2vAH1YAvNOhDsz+BWxvteR8YX89FHtbUcQZr1uVoCs=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
index 4885226854..fdc29f23bb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dasel";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "TomWright";
repo = "dasel";
rev = "v${version}";
- sha256 = "sha256-3zYBgDtptEmuAhLFnPt0eDvgTYltHDdQGX1JCem/UxE=";
+ sha256 = "sha256-DPfahZIb6Cp+E5GxIqNW+IruDZWBvJTRc7gxQOfeJqA=";
};
- vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
+ vendorHash = "sha256-+3RcjOZjmYu4eNpgczwY4Uyz1+poYA/TXc2Mb+VwRKc=";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}"
diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix
index 7623cc5d3a..a75587335c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/diffuse/default.nix
@@ -14,13 +14,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "diffuse";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "MightyCreak";
repo = "diffuse";
rev = "v${version}";
- sha256 = "L+6QwM7w/16IVbiyakBpP7vkbd2/BCGTiRlQG0v1XmU=";
+ sha256 = "aGg5uh9KitVP2bBUizgGIZWvzTxfJGid0WUGVNyHdlk=";
};
format = "other";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
index 9471751844..3b147bdcc3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dockbarx/default.nix
@@ -11,25 +11,23 @@
python3Packages.buildPythonApplication rec {
pname = "dockbarx";
- version = "${ver}-${rev}";
- ver = "1.0-beta";
- rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe";
+ version = "1.0-beta2";
src = fetchFromGitHub {
owner = "xuzhen";
repo = "dockbarx";
- rev = rev;
- sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m";
+ rev = version;
+ sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI=";
};
nativeBuildInputs = [
glib.dev
+ gobject-introspection
python3Packages.polib
wrapGAppsHook
];
buildInputs = [
- gobject-introspection
gtk3
libwnck
keybinder3
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
index 9b0c5e47dc..858252a840 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "dunst";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "dunst-project";
repo = "dunst";
rev = "v${version}";
- sha256 = "sha256-oCeC/rbI/sydcQ7Rv9feEzw2Gcl7mUde4OOv50dyUSg=";
+ sha256 = "sha256-8IH0WTPSaAundhYh4l7gQR66nyT38H4DstRTm+Xh+Z8=";
};
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix
new file mode 100644
index 0000000000..316df2e02d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/elastic/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkg-config
+, vala
+, gtk4
+, libgee
+, libadwaita
+, gtksourceview5
+, blueprint-compiler
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+, template-glib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "elastic";
+ version = "0.1.3";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = "elastic";
+ rev = version;
+ hash = "sha256-CZ+EeGbCzkeNx4GD+2+n3jYwz/cQStjMV2+wm/JNsYU=";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ vala
+ pkg-config
+ wrapGAppsHook4
+ appstream-glib
+ desktop-file-utils
+ blueprint-compiler
+ ];
+
+ buildInputs = [
+ gtk4
+ libadwaita
+ libgee
+ gtksourceview5
+ template-glib
+ ];
+
+ meta = with lib; {
+ description = "Design spring animations";
+ homepage = "https://gitlab.gnome.org/World/elastic/";
+ mainProgram = "app.drey.Elastic";
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ _0xMRTT ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
index 08d887f7e9..760a34ed3d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
@@ -11,7 +11,7 @@
}:
let
- version = "4.3.4";
+ version = "4.4.0";
libsecp256k1_name =
if stdenv.isLinux then "libsecp256k1.so.0"
@@ -28,7 +28,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y=";
+ sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ=";
postFetch = ''
mv $out ./all
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo=";
+ sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI=";
};
postUnpack = ''
@@ -72,6 +72,7 @@ python3.pkgs.buildPythonApplication {
tlslite-ng
# plugins
btchip-python
+ ledger-bitcoin
ckcc-protocol
keepkey
trezor
@@ -83,7 +84,7 @@ python3.pkgs.buildPythonApplication {
postPatch = ''
# make compatible with protobuf4 by easing dependencies ...
substituteInPlace ./contrib/requirements/requirements.txt \
- --replace "protobuf>=3.12,<4" "protobuf>=3.12"
+ --replace "protobuf>=3.20,<4" "protobuf>=3.20"
# ... and regenerating the paymentrequest_pb2.py file
protoc --python_out=. electrum/paymentrequest.proto
diff --git a/third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix
index 237b9708a9..cf0711ca64 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/elfx86exts/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "elfx86exts";
- version = "0.5.0";
+ version = "unstable-2023-04-20";
src = fetchFromGitHub {
owner = "pkgw";
repo = pname;
- rev = "${pname}@${version}";
- sha256 = "sha256-SDBs5/jEvoKEVKCHQLz2z+CZSSmESP7LoIITRN4qJWA=";
+ rev = "26bf98cf1fc773196e594c48bfe808d7151076f6";
+ hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg=";
};
- cargoSha256 = "sha256-fYtFRdH6U8uWshdD1Pb1baE8slo6qajx10tDK3Ukknw=";
+ cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0=";
meta = with lib; {
description = "Decode x86 binaries and print out which instruction set extensions they use.";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix
index 8234a77ba1..5200907ff0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/eos-installer/default.nix
@@ -1,40 +1,44 @@
-{ lib, stdenv, fetchFromGitHub
-, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config
-, gnome-desktop, gnupg, gtk3, udisks
+{ lib, stdenv, fetchFromGitHub, writeText
+, glib, meson, ninja, pkg-config, python3
+, coreutils, gnome-desktop, gnupg, gtk3, systemdMinimal, udisks
}:
stdenv.mkDerivation rec {
pname = "eos-installer";
- version = "4.0.3";
+ version = "5.0.2";
src = fetchFromGitHub {
owner = "endlessm";
repo = "eos-installer";
rev = "Release_${version}";
- sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz";
+ sha256 = "utTTux8o8TN51bvnGldrtMEatiLA1AiHf/9XJZ7k7KM=";
fetchSubmodules = true;
};
strictDeps = true;
nativeBuildInputs = [
- autoconf autoconf-archive automake glib intltool libtool pkg-config
+ glib gnupg meson ninja pkg-config python3
];
- buildInputs = [ gnome-desktop gtk3 udisks ];
+ buildInputs = [ gnome-desktop gtk3 systemdMinimal udisks ];
preConfigure = ''
- ./autogen.sh
+ patchShebangs tests
+ substituteInPlace tests/test-scribe.c \
+ --replace /bin/true ${coreutils}/bin/true \
+ --replace /bin/false ${coreutils}/bin/false
'';
- configureFlags = [
+ mesonFlags = [
"--libexecdir=${placeholder "out"}/bin"
- "--localstatedir=/var"
- "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+ "--cross-file=${writeText "crossfile.ini" ''
+ [binaries]
+ gpg = '${gnupg}/bin/gpg'
+ ''}"
];
- # These are for runtime, so can't be discovered from PATH, which
- # is constructed from nativeBuildInputs.
- GPG_PATH = "${gnupg}/bin/gpg";
- GPGCONF_PATH = "${gnupg}/bin/gpgconf";
+ PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
+
+ doCheck = true;
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix
new file mode 100644
index 0000000000..17d6923f84
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/flowtime/default.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, vala
+, meson
+, ninja
+, wrapGAppsHook4
+, libadwaita
+, libxml2
+, libgee
+, gst_all_1
+, gobject-introspection
+, desktop-file-utils
+, glib
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+ pname = "flowtime";
+ version = "3.1";
+
+ src = fetchFromGitHub {
+ owner = "Diego-Ivan";
+ repo = "Flowtime";
+ rev = "v${version}";
+ hash = "sha256-aXGdHFj9P8+33VuR8YBi+YYN/vBn94drmtKzNDc4SAY=";
+ };
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ glib
+ gobject-introspection
+ meson
+ ninja
+ pkg-config
+ vala
+ wrapGAppsHook4
+ ];
+
+ buildInputs = [
+ libadwaita
+ libxml2
+ libgee
+ ] ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ ]);
+
+ meta = with lib; {
+ description = "Get what motivates you done, without losing concentration";
+ homepage = "https://github.com/Diego-Ivan/Flowtime";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ foo-dogsquared ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix
index 1ec91b7604..200c4338f5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix
@@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "fluidd";
- version = "1.23.4";
+ version = "1.23.5";
src = fetchurl {
name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
- sha256 = "sha256-ofGjIxxk7tBEa4jbNSCNzZJBHvv+mA1u03f9KtdjIbQ=";
+ sha256 = "sha256-od/RoxFjnOuyz7+D+avQJyJzpqpovzs+g4ErfyDJQpY=";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix
index 311e532c12..88ce5d7120 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/fnott/default.nix
@@ -5,13 +5,14 @@
, meson
, ninja
, scdoc
-, wayland-protocols
-, tllist
+, wayland-scanner
, fontconfig
, freetype
, pixman
, libpng
+, tllist
, wayland
+, wayland-protocols
, dbus
, fcft
}:
@@ -28,20 +29,24 @@ stdenv.mkDerivation rec {
sha256 = "sha256-cJ7XmnC4x8lhZ+JRqobeQxTTps4Oz95zYdlFtr3KC1A=";
};
+ depsBuildBuild = [
+ pkg-config
+ ];
nativeBuildInputs = [
pkg-config
meson
ninja
scdoc
- wayland-protocols
- tllist
+ wayland-scanner
];
buildInputs = [
fontconfig
freetype
pixman
libpng
+ tllist
wayland
+ wayland-protocols
dbus
fcft
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
index 7ffe4836a3..d6463a7b4d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "gallery-dl";
- version = "1.25.1";
+ version = "1.25.2";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "gallery_dl";
- sha256 = "sha256-us9lzchdsCD4sY4XQ1f4j3wKuFtEZnEuBrlSa3FpDP4=";
+ sha256 = "sha256-T9PzvjOdcLaO7iTxBZxucQdiAPVpk1+9wDfcpShIBdM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
index 822717ca1d..7108b80685 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/geoipupdate/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "geoipupdate";
- version = "4.11.1";
+ version = "5.0.4";
src = fetchFromGitHub {
owner = "maxmind";
repo = "geoipupdate";
rev = "v${version}";
- sha256 = "sha256-85xPXqvRfc6zip3tPcxFsE+niPmnnPqi9gLF+ioqbV8=";
+ sha256 = "sha256-jes4MWJh0y5ddWjU/Hp6xwZU7/HUi/q0vF5AYQRBKiE=";
};
- vendorHash = "sha256-cPdQ7AIYUacoq885K8XBF+zChUPwbZ7YI4aDCIBOvMY=";
+ vendorHash = "sha256-OnByMNjs6C3R7v5PRDYGYekamsesz9yq2KNsI+NHcQ4=";
ldflags = [ "-X main.version=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
index a6736c7a2d..20ea300d12 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
gettext
check
dbus
+ glib # for glib-compile-resources
];
buildInputs = [
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Ddocs=disabled" # docs do not seem to be installed
+ (lib.mesonEnable "tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix
index bfd5d5b86e..fa11f77162 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix
@@ -2,11 +2,11 @@
let
pname = "golden-cheetah";
- version = "3.6-RC3";
+ version = "3.6-RC4";
src = fetchurl {
url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage";
- hash = "sha256-Bp1IFql96tHc5ssg9nhTrFQqNtaM+5iYJguPGkguvns=";
+ hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag=";
};
appimageContents = appimageTools.extract { inherit pname src version; };
diff --git a/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix
index dd6964318e..59912ef6b1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/googleearth-pro/default.nix
@@ -71,16 +71,17 @@ mkDerivation rec {
unpackPhase = ''
# deb file contains a setuid binary, so 'dpkg -x' doesn't work here
- dpkg --fsys-tarfile ${src} | tar --extract
+ mkdir deb
+ dpkg --fsys-tarfile ${src} | tar --extract -C deb
'';
installPhase =''
runHook preInstall
mkdir $out
- mv usr/* $out/
- rmdir usr
- mv * $out/
+ mv deb/usr/* $out/
+ rmdir deb/usr
+ mv deb/* $out/
rm $out/bin/google-earth-pro $out/opt/google/earth/pro/googleearth
# patch and link googleearth binary
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
index a5eccb239e..f2b70f6654 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix
@@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gpxsee";
- version = "12.2";
+ version = "12.4";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- hash = "sha256-d+hQNI+eCSMRFMzq09wL+GN9TgOIt245Z8GlPe7nY8E=";
+ hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ=";
};
patches = (substituteAll {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix
index 87656d730b..885c68f64d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/haunt/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "haunt";
- version = "0.2.4";
+ version = "0.2.6";
src = fetchurl {
url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ=";
+ hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs=";
};
nativeBuildInputs = [
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
guile-reader
];
- doCheck = true;
+ # Test suite is non-determinisitic in later versions
+ doCheck = false;
postInstall =
let
diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
index f4989b2c3f..38965da9db 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
name = "holochain-launcher";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchurl {
url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb";
- sha256 = "sha256-hvnOB6cTL+VffwtBulrEzujxVZEQMSDoJx2HjivJ9z8=";
+ sha256 = "sha256-qTzm4pwhYbEN96a/Dz/JcJcZ2OobyQJRNC2yH4CbhzQ=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix b/third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix
index b9f78afda4..9c560b7f83 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/houdini/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }:
+{ lib, stdenv, writeScript, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }:
-buildFHSUserEnv rec {
+buildFHSEnv rec {
name = "houdini-${unwrapped.version}";
targetPkgs = pkgs: with pkgs; [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
index e7ad05b508..2963ba732f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/hstr/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "hstr";
- version = "2.6";
+ version = "3.1";
src = fetchFromGitHub {
owner = "dvorka";
repo = "hstr";
rev = version;
- sha256 = "sha256-yfaDISnTDb20DgMOvh6jJYisV6eL/Mp5jafnWEnFG8c=";
+ hash = "sha256-OuLy1aiEwUJDGy3+UXYF1Vx1nNXic46WIZEM1xrIPfA=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix
index e117313861..1cd2da0099 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix
@@ -6,6 +6,8 @@
, ninja
, pkg-config
, cli11
+, eigen
+, fmt
, hidrd
, inih
, microsoft_gsl
@@ -15,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "iptsd";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
- hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q=";
+ hash = "sha256-8RE93pIg5fVAYOOq8zHlWy0uTxep7hrJlowPu48beTs=";
};
nativeBuildInputs = [
@@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [
cli11
+ eigen
+ fmt
hidrd
inih
microsoft_gsl
@@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
substituteInPlace etc/meson.build \
--replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
--replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
- substituteInPlace etc/udev/50-ipts.rules \
+ substituteInPlace etc/udev/50-iptsd.rules.in \
--replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape"
'';
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix
index b7354278c2..453c542b4d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix
@@ -10,11 +10,11 @@
}:
let
pname = "jetbrains-toolbox";
- version = "1.27.3.14493";
+ version = "1.28.0.15158";
src = fetchzip {
url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
- sha256 = "sha256-aK5T95Yg8Us8vkznWlDHnPiPAKiUtlU0Eswl9rD01VY=";
+ sha256 = "sha256-IHs3tQtFXGS9xa5lKwSEWvp8aNffrCjNcoVE4tGX9ak=";
stripRoot = false;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
index 68e03b8902..9d621ee541 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, fetchurl, undmg }:
+{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }:
let
pname = "joplin-desktop";
@@ -51,6 +51,9 @@ let
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mv $out/bin/{${name},${pname}}
+ source "${makeWrapper}/nix-support/setup-hook"
+ wrapProgram $out/bin/${pname} \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps
substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jot/default.nix
index c6552e2d09..abfcc8e8ec 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jot/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "jot";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "araekiel";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CgS9I05Om4JxAbPN0vxh2Y7dftIkVnZkRP7PY4kOfpw=";
+ sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM=";
};
- cargoSha256 = "sha256-8nRO01/hUKT6Jt7/3Sw2+aLU6hITSNl6nn9UEAvfyJY=";
+ cargoHash = "sha256-x61lOwMOOLD3RTdy3Ji+c7zcA1PCn09u75MyrPX/NbE=";
meta = with lib; {
description = "Rapid note management for the terminal";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
index 28451b3c2e..d128c8cc69 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
- version = "0.15.75988";
+ version = "0.15.80533";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
- sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc=";
+ sha256 = "sha256-4Knenhuezc+hKqVVY/l5d7SNfiAHyxspwGEgJj++GQM=";
stripRoot = false;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
index 18952865eb..9999d83ee4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, glibcLocales
, installShellFiles
, python3
@@ -9,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "khal";
- version = "0.10.5";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "pimutils";
repo = pname;
rev = "v${version}";
- hash = "sha256-FneJmoAOb7WjSgluCwlspf27IU3MsQZFKryL9OSSsUw=";
+ hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -55,18 +54,6 @@ python3.pkgs.buildPythonApplication rec {
vdirsyncer
];
- patches = [
- # Tests working with latest pytz version, https://github.com/pimutils/khal/pull/1183
- (fetchpatch {
- name = "support-later-pytz.patch";
- url = "https://github.com/pimutils/khal/commit/53eb8a7426d5c09478c78d809c4df4391438e246.patch";
- sha256 = "sha256-drGtvJlQ3qFUdeukRWCFycPSZGWG/FSRqnbwJzFKITc=";
- excludes = [
- "CHANGELOG.rst"
- ];
- })
- ];
-
postInstall = ''
# shell completions
installShellCompletion --cmd khal \
diff --git a/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix
new file mode 100644
index 0000000000..a17be0e092
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/kickoff/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, fontconfig
+, pkg-config
+, wayland
+, libxkbcommon
+, makeWrapper
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "kickoff";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "j0ru";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo=";
+ };
+
+ cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA=";
+
+ libPath = lib.makeLibraryPath [
+ wayland
+ libxkbcommon
+ ];
+
+ buildInputs = [ fontconfig ];
+ nativeBuildInputs = [ makeWrapper pkg-config ];
+
+ postInstall = ''
+ wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${libPath}"
+ '';
+
+ meta = with lib; {
+ description = "Minimalistic program launcher";
+ homepage = "https://github.com/j0ru/kickoff";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ pyxels ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
index bb7d410578..3a35a36394 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
- version = "0.28.6";
+ version = "0.28.7";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
- hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";
+ hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix
index 02de02c579..488e4da9b7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/klipper-estimator/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ openssl ]
- ++ lib.optional stdenv.isDarwin [ libgit2 Security ];
+ ++ lib.optionals stdenv.isDarwin [ libgit2 Security ];
nativeBuildInputs = [ pkg-config ];
@@ -36,4 +36,3 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ tmarkus ];
};
}
-
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix
index f6071978b8..1e8cb505f4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lavalauncher/default.nix
@@ -5,6 +5,7 @@
, ninja
, pkg-config
, scdoc
+, wayland-scanner
, cairo
, librsvg
, libxkbcommon
@@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM=";
};
- nativeBuildInputs = [ meson ninja pkg-config scdoc ];
+ depsBuildBuild = [ pkg-config ];
+ nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [
cairo
librsvg
diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
index df6490ebb2..fbcf4c97b4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
- version = "0.9.1";
+ version = "0.9.4";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
- hash = "sha256-8jplCIylG1xbpp/VGnU06MwfqWe2E9iVQApZaWbhuVc=";
+ hash = "sha256-K04iIa/WnRtcHwRUHJbKqXO9c4l5xwHPvnwN5WX/Row=";
name = "${pname}-${version}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
index b80c8d0a2a..41e687c23e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "lscolors";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchCrate {
inherit version pname;
- sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I=";
+ sha256 = "sha256-YVKs/1R//oKYBSSGnj6UMFo5zDp5O3QDDdkDKF4ICBk=";
};
- cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q=";
+ cargoHash = "sha256-EJdjSFgvvwH5beW+aD1KT5G9bpW/8mdi+7c27KSkZjo=";
# setid is not allowed in the sandbox
checkFlags = [ "--skip=tests::style_for_setid" ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix
index d6bdf77a8b..59315ec9b7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lswt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSourcehut, nixos, wayland }:
+{ lib, stdenv, fetchFromSourcehut, wayland-scanner, wayland }:
stdenv.mkDerivation rec {
pname = "lswt";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Orwa7sV56AeznEcq/Xj5qj4PALMxq0CI+ZnXuY4JYE0=";
};
+ nativeBuildInputs = [ wayland-scanner ];
buildInputs = [ wayland ];
makeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix
index da1f0a2824..59c8be448d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix
@@ -1,4 +1,4 @@
-{ lib, buildFHSUserEnv, lutris-unwrapped
+{ lib, buildFHSEnv, lutris-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
, steamSupport ? true
@@ -13,7 +13,7 @@ let
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
];
-in buildFHSUserEnv {
+in buildFHSEnv {
name = "lutris";
runScript = "lutris";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix
index 6a1f4389b6..3bd11ce68a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mako/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/+XYf8FiH4lk7f7/pMt43hm13mRK+UqvaNOpf1TI6m4=";
};
+ depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ];
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix
index 533e05264b..1024ba8d9a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mediaelch/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, cmake
, qttools
@@ -33,6 +34,15 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ patches = [
+ # https://github.com/Komet/MediaElch/issues/1557
+ # build: Fix build issue with Qt 6.5 on macOS (also other platforms)
+ (fetchpatch {
+ url = "https://github.com/Komet/MediaElch/commit/872b21decf95d70073400bedbe1ad183a8267791.patch";
+ hash = "sha256-D1Ui5xg5cpvNX4IHfXQ7wN9I7Y3SuPFOWxWidcAlLEA=";
+ })
+ ];
+
nativeBuildInputs = [
cmake
qttools
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
index 8adfb7453e..1f2c6dee6f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "22.12";
+ version = "23.03";
pname = "mediainfo";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w=";
+ sha256 = "sha256-8GGkJXVlZ2ojS2O91tSX4xcMjkojQaQgu6OcTqi6pJg=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix
index 3cf85f94db..3d5c49c94c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "minder";
- version = "1.14.0";
+ version = "1.15.1";
src = fetchFromGitHub {
owner = "phase1geo";
repo = pname;
rev = version;
- sha256 = "sha256-0x+MMVa9/jOVp9n9JFM1MGndh9H9MzmmHepcez4aT+Q=";
+ sha256 = "sha256-JKbz7UUl5iQxquBH705WBN9T4q7OondTypnEUGfqBWY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
index 3081bea863..36855410fa 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "mob";
- version = "4.1.1";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "remotemobprogramming";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-P3OxqJNhzO/aPC4Nj3vvBy5cxaahQv0IsjlIKya0p1w=";
+ sha256 = "sha256-g2l/XeSyFem2Xi/lVgfbWW+nWHxAcQV/v+2AIqB0apM=";
};
- vendorSha256 = null;
+ vendorHash = null;
nativeBuildInputs = [
makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
index b4c169b36d..468818e4f8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
@@ -9,7 +9,7 @@
, gtkmm3
, pcre
, swig
-, antlr4_9
+, antlr4_12
, sudo
, mysql
, libxml2
@@ -46,16 +46,14 @@ let
inherit (python3.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
- version = "8.0.32";
+ version = "8.0.33";
src = fetchurl {
- url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
- sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";
+ url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
+ sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";
};
patches = [
- ./fix-gdal-includes.patch
-
(substituteAll {
src = ./hardcode-paths.patch;
catchsegv = "${glibc.bin}/bin/catchsegv";
@@ -79,11 +77,11 @@ in stdenv.mkDerivation rec {
})
];
- # 1. have it look for 4.9.3 instead of 4.9.1
+ # 1. have it look for 4.12.0 instead of 4.11.1
# 2. for some reason CMakeCache.txt is part of source code
preConfigure = ''
substituteInPlace CMakeLists.txt \
- --replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar"
+ --replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar"
rm -f build/CMakeCache.txt
'';
@@ -100,7 +98,7 @@ in stdenv.mkDerivation rec {
gtk3
gtkmm3
libX11
- antlr4_9.runtime.cpp
+ antlr4_12.runtime.cpp
python3
mysql
libxml2
@@ -157,7 +155,7 @@ in stdenv.mkDerivation rec {
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location.
- "-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}"
+ "-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}"
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
deleted file mode 100644
index 0a5c31fd40..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/backend/wbpublic/grt/spatial_handler.h
-+++ b/backend/wbpublic/grt/spatial_handler.h
-@@ -24,12 +24,12 @@
- #ifndef SPATIAL_HANDLER_H_
- #define SPATIAL_HANDLER_H_
-
--#include
--#include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
- #include
- #include "base/geometry.h"
- #include "wbpublic_public_interface.h"
---- a/backend/wbpublic/grtui/geom_draw_box.h
-+++ b/backend/wbpublic/grtui/geom_draw_box.h
-@@ -25,7 +25,7 @@
- #define _GEOM_DRAW_BOX_H_
-
- #include
--#include
-+#include
- #include "wbpublic_public_interface.h"
-
- class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox {
---- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
-+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
-@@ -21,9 +21,9 @@
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--#include
--#include
--#include
-+#include
-+#include
-+#include
-
- #include
- #include
diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix
index 90350c03f4..4049f95b19 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "navi";
- version = "2.20.1";
+ version = "2.22.1";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
- sha256 = "sha256-uu82KG2RHEP0PstoYB4eWZWFjlousT40A1XAaBfkjFE=";
+ sha256 = "sha256-dlK7R9T1AezNr3+5Or8XYAMRlnnXejIs9jXAjwTuvd8=";
};
- cargoSha256 = "sha256-gpHeyxLcDqwi96BWF6Hwlb27JG2LSUgfsE4FTB1vIoQ=";
+ cargoHash = "sha256-nastb6dsBGM8zIQ/WCfQy3Y50kH3J1dM/vnkOe/q95A=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
index 9e701cdb33..e51e49fd89 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, lib }:
+{ appimageTools, makeWrapper, fetchurl, lib }:
let
pname = "notable";
@@ -16,10 +16,11 @@ let
inherit name src;
};
+ nativeBuildInputs = [ makeWrapper ];
in
appimageTools.wrapType2 rec {
- inherit name src;
+ inherit pname version src;
profile = ''
export LC_ALL=C.UTF-8
@@ -34,6 +35,9 @@ appimageTools.wrapType2 rec {
$out/share/icons/hicolor/1024x1024/apps/notable.png
substituteInPlace $out/share/applications/notable.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
+ source "${makeWrapper}/nix-support/setup-hook"
+ wrapProgram "$out/bin/${pname}" \
+ --add-flags "--disable-seccomp-filter-sandbox"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix
index 0d96b3cdc7..4dec8077d9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nwg-bar";
- version = "0.1.1";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XeRQhDQeobO1xNThdNgBkoGvnO3PMAxrNwTljC1GKPM=";
+ sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4=";
};
patches = [ ./fix-paths.patch ];
@@ -17,7 +17,7 @@ buildGoModule rec {
substituteInPlace tools.go --subst-var out
'';
- vendorHash = "sha256-EewEhkX7Bwnz+J1ptO31HKHU4NHo76r4NqMbcrWdiu4=";
+ vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
index 4c740852f6..e3c6713724 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix
@@ -1,5 +1,6 @@
{ pkgs
, stdenv
+, callPackage
, lib
, fetchFromGitHub
, python3
@@ -242,9 +243,10 @@ let
];
passthru = {
- python = self.python;
+ inherit (self) python;
updateScript = nix-update-script { };
tests = {
+ plugins = (callPackage ./plugins.nix { }) super self;
inherit (nixosTests) octoprint;
};
};
@@ -258,7 +260,7 @@ let
};
}
)
- (import ./plugins.nix { inherit pkgs; })
+ (callPackage ./plugins.nix { })
packageOverrides
]
);
diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
index 822f2c13cb..b80bf1c095 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,11 +1,15 @@
-{ pkgs }:
-
-with pkgs;
+{ lib
+, config
+, fetchFromGitHub
+, fetchFromGitLab
+, fetchpatch
+, marlin-calc
+}:
self: super:
let
buildPlugin = args: self.buildPythonPackage (args // {
- pname = "OctoPrintPlugin-${args.pname}";
+ pname = "octoprint-plugin-${args.pname}";
inherit (args) version;
propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ];
# none of the following have tests
@@ -16,7 +20,7 @@ in
inherit buildPlugin;
m86motorsoff = buildPlugin rec {
- pname = "M84MotorsOff";
+ pname = "m84motorsoff";
version = "0.1.0";
src = fetchFromGitHub {
@@ -35,11 +39,13 @@ in
};
abl-expert = buildPlugin rec {
- pname = "ABL_Expert";
+ pname = "abl-expert";
version = "0.6";
- src = fetchgit {
- url = "https://framagit.org/razer/Octoprint_ABL_Expert/";
+ src = fetchFromGitLab {
+ domain = "framagit.org";
+ owner = "razer";
+ repo = "Octoprint_ABL_Expert";
rev = version;
sha256 = "0ij3rvdwya1sbymwm5swlh2j4jagb6fal945g88zrzh5xf26hzjh";
};
@@ -53,12 +59,12 @@ in
};
bedlevelvisualizer = buildPlugin rec {
- pname = "BedLevelVisualizer";
+ pname = "bedlevelvisualizer";
version = "1.1.0";
src = fetchFromGitHub {
owner = "jneilliii";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-BedLevelVisualizer";
rev = version;
sha256 = "sha256-SKrhtTGyDuvbDmUCXSx83Y+C83ZzVHA78TwMYwE6tcc=";
};
@@ -74,12 +80,12 @@ in
};
costestimation = buildPlugin rec {
- pname = "CostEstimation";
+ pname = "costestimation";
version = "3.4.0";
src = fetchFromGitHub {
owner = "OllisGit";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-CostEstimation";
rev = version;
sha256 = "sha256-04OPa/RpM8WehUmOp195ocsAjAvKdVY7iD5ybzQO7Dg=";
};
@@ -93,12 +99,12 @@ in
};
curaenginelegacy = buildPlugin rec {
- pname = "CuraEngineLegacy";
+ pname = "curaenginelegacy";
version = "1.1.2";
src = fetchFromGitHub {
owner = "OctoPrint";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-CuraEngineLegacy";
rev = version;
sha256 = "sha256-54siSmzgPlnCRpkpZhXU9theNQ3hqL3j+Ip4Ie2w2vA=";
};
@@ -112,12 +118,12 @@ in
};
displayprogress = buildPlugin rec {
- pname = "DisplayProgress";
+ pname = "displayprogress";
version = "0.1.3";
src = fetchFromGitHub {
owner = "OctoPrint";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-DisplayProgress";
rev = version;
sha256 = "080prvfwggl4vkzyi369vxh1n8231hrl8a44f399laqah3dn5qw4";
};
@@ -131,12 +137,12 @@ in
};
displaylayerprogress = buildPlugin rec {
- pname = "OctoPrint-DisplayLayerProgress";
+ pname = "displaylayerprogress";
version = "1.26.0";
src = fetchFromGitHub {
owner = "OllisGit";
- repo = pname;
+ repo = "OctoPrint-DisplayLayerProgress";
rev = version;
sha256 = "sha256-hhHc2SPixZCPJzCP8enMMWNYaYbNZAU0lNSx1B0d++4=";
};
@@ -149,8 +155,8 @@ in
};
};
- ender3v2tempfix = buildPlugin rec {
- pname = "OctoPrintPlugin-ender3v2tempfix";
+ ender3v2tempfix = buildPlugin {
+ pname = "ender3v2tempfix";
version = "unstable-2021-04-27";
src = fetchFromGitHub {
@@ -169,12 +175,12 @@ in
};
gcodeeditor = buildPlugin rec {
- pname = "GcodeEditor";
+ pname = "gcodeeditor";
version = "0.2.12";
src = fetchFromGitHub {
owner = "ieatacid";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-GcodeEditor";
rev = version;
sha256 = "sha256-1Sk2ri3DKW8q8VJ/scFjpRsz65Pwt8OEURP1k70aydE=";
};
@@ -188,12 +194,12 @@ in
};
marlingcodedocumentation = buildPlugin rec {
- pname = "MarlinGcodeDocumentation";
+ pname = "marlingcodedocumentation";
version = "0.13.0";
src = fetchFromGitHub {
owner = "costas-basdekis";
- repo = pname;
+ repo = "MarlinGcodeDocumentation";
rev = "v${version}";
sha256 = "sha256-3ay6iCxZk8QkFM/2Y14VTpPoxr6NXq14BFSHofn3q7I=";
};
@@ -207,7 +213,7 @@ in
};
mqtt = buildPlugin rec {
- pname = "MQTT";
+ pname = "mqtt";
version = "0.8.10";
src = fetchFromGitHub {
@@ -228,12 +234,12 @@ in
};
printtimegenius = buildPlugin rec {
- pname = "PrintTimeGenius";
+ pname = "printtimegenius";
version = "2.2.8";
src = fetchFromGitHub {
owner = "eyal0";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-PrintTimeGenius";
rev = version;
sha256 = "sha256-Bbpm7y4flzEbUb6Sgkp6hIIHs455A0IsbmzvZwlkbh0=";
};
@@ -246,7 +252,7 @@ in
preConfigure = ''
# PrintTimeGenius ships with marlin-calc binaries for multiple architectures
rm */analyzers/marlin-calc*
- sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
+ sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
'';
meta = with lib; {
@@ -258,12 +264,12 @@ in
};
psucontrol = buildPlugin rec {
- pname = "PSUControl";
+ pname = "psucontrol";
version = "1.0.6";
src = fetchFromGitHub {
owner = "kantlivelong";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-PSUControl";
rev = version;
sha256 = "sha256-S+lPm85+ZEO/3BXYsrxE4FU29EGWzWrSw3y1DLdByrM=";
};
@@ -286,12 +292,12 @@ in
};
simpleemergencystop = buildPlugin rec {
- pname = "SimpleEmergencyStop";
+ pname = "simpleemergencystop";
version = "1.0.5";
src = fetchFromGitHub {
owner = "Sebclem";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-SimpleEmergencyStop";
rev = version;
sha256 = "sha256-MbP3cKa9FPElQ/M8ykYh9kVXl8hNvmGiCHDvjgWvm9k=";
};
@@ -305,7 +311,7 @@ in
};
stlviewer = buildPlugin rec {
- pname = "STLViewer";
+ pname = "stlviewer";
version = "0.4.2";
src = fetchFromGitHub {
@@ -324,12 +330,12 @@ in
};
telegram = buildPlugin rec {
- pname = "Telegram";
+ pname = "telegram";
version = "1.6.5";
src = fetchFromGitHub {
owner = "fabianonline";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-Telegram";
rev = version;
sha256 = "sha256-SckJCbPNCflgGYLHFiXy0juCtpvo8YS1BQsFpc1f5rg=";
};
@@ -345,14 +351,14 @@ in
};
themeify = buildPlugin rec {
- pname = "Themeify";
+ pname = "themeify";
version = "1.2.2";
src = fetchFromGitHub {
owner = "Birkbjo";
- repo = "Octoprint-${pname}";
+ repo = "Octoprint-Themeify";
rev = "v${version}";
- sha256 = "0j1qs6kyh947npdy7pqda25fjkqinpas3sy0qyscqlxi558lhvx2";
+ sha256 = "sha256-om9IUSmxU8y0x8DrodW1EU/pilAN3+PbtYck6KfROEg=";
};
meta = with lib; {
@@ -364,7 +370,7 @@ in
};
titlestatus = buildPlugin rec {
- pname = "TitleStatus";
+ pname = "titlestatus";
version = "0.0.5";
src = fetchFromGitHub {
@@ -383,12 +389,12 @@ in
};
touchui = buildPlugin rec {
- pname = "TouchUI";
+ pname = "touchui";
version = "0.3.18";
src = fetchFromGitHub {
owner = "BillyBlaze";
- repo = "OctoPrint-${pname}";
+ repo = "OctoPrint-TouchUI";
rev = version;
sha256 = "sha256-PNDCjY7FhfnwK7Nd86el9ZQ00G4uMANH2Sk080iMYXw=";
};
@@ -402,7 +408,7 @@ in
};
octoklipper = buildPlugin rec {
- pname = "OctoKlipper";
+ pname = "octoklipper";
version = "0.3.8.3";
src = fetchFromGitHub {
@@ -421,36 +427,47 @@ in
};
octolapse = buildPlugin rec {
- pname = "Octolapse";
- version = "0.4.1";
+ pname = "octolapse";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "FormerLurker";
- repo = pname;
+ repo = "Octolapse";
rev = "v${version}";
- sha256 = "13q20g7brabplc198jh67lk65rn140r8217iak9b2jy3in8fggv4";
+ sha256 = "sha256-QP6PkKWKUv4uIaYdqTAsZmK7DVes94Q9K/DrBYrWxzY=";
};
+ patches = [
+ # fix version constraint
+ # https://github.com/FormerLurker/Octolapse/pull/894
+ (fetchpatch {
+ url = "https://github.com/FormerLurker/Octolapse/commit/0bd7db2430aef370f2665c6c7011fc3bb559122e.patch";
+ hash = "sha256-z2aEq5sJGarGtIDbTRCvXdSj+kq8HIVvLRWpKutmJNY=";
+ })
+ ];
+
# Test fails due to code executed on import, see #136513
#pythonImportsCheck = [ "octoprint_octolapse" ];
- propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six psutil file-read-backwards ];
+ propagatedBuildInputs = with super; [ awesome-slugify setuptools pillow sarge six pillow psutil file-read-backwards ];
meta = with lib; {
description = "Stabilized timelapses for Octoprint";
homepage = "https://github.com/FormerLurker/OctoLapse";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ illustris j0hax ];
+ # requires pillow >=6.2.0,<7.0.0
+ broken = true;
};
};
- octoprint-dashboard = buildPlugin rec {
- pname = "OctoPrint-Dashboard";
+ dashboard = buildPlugin rec {
+ pname = "dashboard";
version = "1.18.3";
src = fetchFromGitHub {
owner = "StefanCohen";
- repo = pname;
+ repo = "OctoPrint-Dashboard";
rev = version;
sha256 = "sha256-hLHT3Uze/6PlOCEICVZ2ieFTyXgcqCvgHOlIIEquujg=";
};
@@ -462,4 +479,6 @@ in
maintainers = with maintainers; [ j0hax ];
};
};
+} // lib.optionalAttrs config.allowAliases {
+ octoprint-dashboard = self.dashboard;
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix
index 3225b5807d..46eb61fbab 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
- version = "0.2.5";
+ version = "0.3.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-w0YLSwRv6uhDwi06q0/mhGc5C6O2xq3vc9Se7/xXkhA=";
+ sha256 = "sha256-VIsop0XjadZQecKRbt+2U2qrMVmPaLZGUuMEY8v+aJ8=";
};
- cargoHash = "sha256-Q0+6YgcdWa4RjNA7ffQJN0uIN8UFuCdbYjTFoM8w8uo=";
+ cargoHash = "sha256-wBTbHHCNZvp1xc6iiK6LzBFYsF9RPHA74YM6SDv6x94=";
meta = with lib; {
description = "A simple tui to view & control docker containers";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix
index 8d4f7866b8..17bbd6dfc8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/common.nix
@@ -5,7 +5,8 @@
, version
, desktopName
, longDescription
-, buildFHSUserEnv
+, broken ? false
+, buildFHSEnv
, extraBuildInputs ? [ ]
, jdk
, stdenv
@@ -68,7 +69,7 @@ let
in
# Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing.
-buildFHSUserEnv {
+buildFHSEnv {
name = pname;
targetPkgs = pkgs: [
cups
@@ -94,6 +95,7 @@ buildFHSUserEnv {
];
license = licenses.unfree;
platforms = platforms.linux;
+ inherit broken;
mainProgram = pname;
maintainers = [ maintainers.pwoelfel ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix
index b5d49aa902..cc7f0cb906 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pdfstudio/default.nix
@@ -40,6 +40,8 @@ in
sha256 = "sha256-cc8YjrMsYZqgmwp5+AA+HsqzjxzFcTT/ga31NQz/OWc=";
};
jdk = jdk11;
+
+ broken = true; # Bad hash, probably unstable
};
pdfstudio2021 = callPackage ./common.nix rec {
@@ -66,5 +68,7 @@ in
(lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
];
jdk = jdk17;
+
+ broken = true; # URL 404s, probably unstable
};
}.${pname}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
index ca9387e34e..367c0aee40 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "pgmodeler";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
- sha256 = "sha256-yvVgBfJLjEynsqxQisDfOM99C8/QM0F44RIHAmxh4uU=";
+ sha256 = "sha256-ZlIz+7YyER0/wQEkEe8XHYHcLK4vu09v1zkDrIgR/Dc=";
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
index f7f94d9940..f5e13987af 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix
@@ -11,7 +11,8 @@ let
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.3.24";
- src = oldAttrs.src.override {
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
inherit version;
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
index c5791c1a1c..683f0eb5a8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix
@@ -18,14 +18,14 @@
mkDerivation rec {
pname = "qcad";
- version = "3.27.9.3";
+ version = "3.28.1.0";
src = fetchFromGitHub {
name = "qcad-${version}-src";
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "sha256-JEUV8TtVYSlO+Gmg/ktMTmTlOmH+2zc6/fLkVHD7eBc=";
+ sha256 = "sha256-NizAUyj6YbfjxXDQkVaqzkp11WMJlt4FMr72i3Cn564=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix
index 038fe11763..3b97a69de2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/qelectrotech/default.nix
@@ -73,5 +73,6 @@ mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ yvesf ];
platforms = qtbase.meta.platforms;
+ broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix b/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix
index 4aa2a3c59a..902f6e8161 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }:
+{ lib, stdenv, fetchFromSourcehut, fetchpatch
+, wayland, pixman, pkg-config, wayland-scanner
+}:
stdenv.mkDerivation rec {
pname = "river-tag-overlay";
@@ -11,8 +13,16 @@ stdenv.mkDerivation rec {
hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E=";
};
+ patches = [
+ # Backport cross fix.
+ (fetchpatch {
+ url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch";
+ sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE=";
+ })
+ ];
+
buildInputs = [ pixman wayland ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config wayland-scanner ];
makeFlags = [
"DESTDIR=${placeholder "out"}"
@@ -25,6 +35,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only;
maintainers = with maintainers; [ edrex ];
platforms = platforms.linux;
- broken = stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix
index 293f214b60..6d66827138 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "rofi-emoji";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "Mange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-YMQG0XO6zVei6GfBdgI7jtB7px12e+xvOMxZ1QHf5kQ=";
+ sha256 = "sha256-P7AHLwqicKYj5I0Rl9B5mdD/v9iW9aihkNo7enonRF4=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
index d6e820e06f..02bae93229 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-rbw/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core }:
+{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core, rbw }:
buildPythonApplication rec {
pname = "rofi-rbw";
@@ -21,6 +21,10 @@ buildPythonApplication rec {
pythonImportsCheck = [ "rofi_rbw" ];
+ preFixup = ''
+ makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ rbw ]})
+ '';
+
meta = with lib; {
description = "Rofi frontend for Bitwarden";
homepage = "https://github.com/fdw/rofi-rbw";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
index d6e6946af5..dfb096d654 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wayland.nix
@@ -2,6 +2,7 @@
, lib
, fetchFromGitHub
, rofi-unwrapped
+, wayland-scanner
, wayland-protocols
, wayland
}:
@@ -18,8 +19,8 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec {
sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ=";
};
- nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
- buildInputs = oldAttrs.buildInputs ++ [ wayland ];
+ nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];
+ buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ];
meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement for Wayland";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix
new file mode 100644
index 0000000000..41ec97f8b1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/schemes/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, appstream-glib
+, desktop-file-utils
+, glib
+, gtk4
+, gtksourceview5
+, libadwaita
+, libgee
+, libpanel
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook4
+}:
+
+stdenv.mkDerivation rec {
+ pname = "schemes";
+ version = "0.2.0";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "chergert";
+ repo = "schemes";
+ rev = version;
+ hash = "sha256-XUC24KzZSU4+F2JZMsydukvAwEGdMxCnkPG6QHnCw6w=";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook4
+ appstream-glib
+ desktop-file-utils
+ ];
+
+ buildInputs = [
+ glib
+ gtk4
+ libadwaita
+ gtksourceview5
+ libpanel
+ ];
+
+ meta = with lib; {
+ description = "Edit GtkSourceView style-schemes for an application or platform";
+ homepage = "https://gitlab.gnome.org/chergert/schemes";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ _0xMRTT ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/shavee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shavee/default.nix
new file mode 100644
index 0000000000..12ba3fbf6c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/shavee/default.nix
@@ -0,0 +1,39 @@
+{ lib, pkgs, rustPlatform, fetchFromGitHub, pkg-config, openssl, zlib,stdenv, pam }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "shavee";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "ashuio";
+ repo = "shavee";
+ rev = "v${version}";
+ sha256 = "sha256-41wJ3QBZdmCl7v/6JetXhzH2zF7tsKYMKZY1cKhByX8=";
+ };
+
+ cargoSha256 = "sha256-iNGn5KknSNgazFSu6Nur7AkKVb6qKMxuFwTdCz5djWU=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ openssl
+ zlib
+ pam
+ ];
+
+ # these tests require network access
+ checkFlags = [
+ "--skip=filehash::tests::remote_file_hash"
+ "--skip=filehash::tests::get_filehash_unit_test"
+ ];
+
+ meta = with lib; {
+ description = "A Program to automatically decrypt and mount ZFS datasets using Yubikey HMAC as 2FA or any File on USB/SFTP/HTTPS.";
+ homepage = "https://github.com/ashuio/shavee";
+ license = licenses.mit;
+ maintainers = with maintainers; [jasonodoom];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
index 23684142a0..b1c99ab385 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
+{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
version = "0.10.24";
@@ -38,7 +38,7 @@
"$out/lib/SideQuest/sidequest"
'';
};
- in buildFHSUserEnv {
+ in buildFHSEnv {
name = "SideQuest";
passthru = {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix
index 2ec034e882..c1a77d634d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, gobject-introspection
, gtk3
-, gtksourceview3
+, gtksourceview4
, webkitgtk
, wrapGAppsHook
, python3Packages
@@ -10,19 +10,19 @@
python3Packages.buildPythonApplication rec {
pname = "skytemple";
- version = "1.3.10";
+ version = "1.4.7";
src = fetchFromGitHub {
owner = "SkyTemple";
repo = pname;
- rev = version;
- hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM=";
};
buildInputs = [
gobject-introspection
gtk3
- gtksourceview3
+ gtksourceview4
# webkitgkt is used for rendering interactive statistics graph which
# can be seen by opening a ROM, entering Pokemon section, selecting
# any Pokemon, and clicking Stats and Moves tab.
@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
skytemple-icons
skytemple-ssb-debugger
tilequant
- ];
+ ] ++ skytemple-files.optional-dependencies.spritecollab;
doCheck = false; # there are no tests
diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix
index 266eb51193..615cf28103 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "snapmaker-luban";
- version = "4.7.0";
+ version = "4.7.3";
src = fetchurl {
url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz";
- sha256 = "sha256-iIAK4XqxtdV+3FZHhzerMLcpfniKhNMGnfGA+W2inZc=";
+ sha256 = "sha256-CPeTTnwykaa58tpA7Aznrvrs0DqxOKjspZjHrT+e9tw=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
index 9f36b376a5..9866ef6c6d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix
@@ -7,6 +7,7 @@
, wayland
, pango
, wayland-protocols
+, wayland-scanner
, conf ? null
}:
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-PBxCy1dZrOL1nmhVDQozvF0XL79uKMhhERGNpPPzaRU=";
};
- nativeBuildInputs = [ meson ninja pkg-config ];
+ nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [ pango wayland wayland-protocols ];
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
index 4e2cc8078a..53faf60f92 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
- version = "2.17.1";
+ version = "2.17.2";
src = fetchFromGitHub {
owner = "spicetify";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hgLJVD3JEehQjPO5T54xk5JxbcVyiBu4PXV+EdOczag=";
+ sha256 = "sha256-WVatvMdCp4BeCe5+hz933OAJIKaR4ChR22nVrl8tmIc=";
};
vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw=";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
index 2822d13745..4ccea88032 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix
@@ -1,5 +1,6 @@
{ mkDerivation
, lib
+, stdenv
, fetchFromGitHub
, substituteAll
, qtbase
@@ -14,11 +15,12 @@
, kio
, plasma-framework
, qttools
+, iconv
, webviewSupport ? true
, jsSupport ? true
-, kioPluginSupport ? true
-, plasmoidSupport ? true
-, systemdSupport ? true
+, kioPluginSupport ? stdenv.isLinux
+, plasmoidSupport ? stdenv.isLinux
+, systemdSupport ? stdenv.isLinux
/* It is possible to set via this option an absolute exec path that will be
written to the `~/.config/autostart/syncthingtray.desktop` file generated
during runtime. Alternatively, one can edit the desktop file themselves after
@@ -44,7 +46,7 @@ mkDerivation rec {
qtutilities
boost
qtforkawesome
- ]
+ ] ++ lib.optionals stdenv.isDarwin [ iconv ]
++ lib.optionals webviewSupport [ qtwebengine ]
++ lib.optionals jsSupport [ qtdeclarative ]
++ lib.optionals kioPluginSupport [ kio ]
@@ -59,7 +61,8 @@ mkDerivation rec {
;
# No tests are available by upstream, but we test --help anyway
- doInstallCheck = true;
+ # Don't test on Darwin because output is .app
+ doInstallCheck = !stdenv.isDarwin;
installCheckPhase = ''
$out/bin/syncthingtray --help | grep ${version}
'';
@@ -79,6 +82,6 @@ mkDerivation rec {
description = "Tray application and Dolphin/Plasma integration for Syncthing";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ doronbehar ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix
index 47dcde5aca..2050d062d6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/frontend.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }:
+{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs_16 }:
let
common = callPackage ./common.nix { };
in
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [
fixup_yarn_lock
# Use Node JS 16 because of @achrinza/node-ipc@9.2.2
- nodejs-16_x
- nodejs-16_x.pkgs.yarn
+ nodejs_16
+ nodejs_16.pkgs.yarn
];
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile
deleted file mode 100644
index 77cbaeeed7..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'http://rubygems.org'
-gem 'taskjuggler'
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
deleted file mode 100644
index 8831993117..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-GEM
- remote: http://rubygems.org/
- specs:
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- mime-types (2.6.1)
- taskjuggler (3.5.0)
- mail (>= 2.4.3)
- term-ansicolor (>= 1.0.7)
- term-ansicolor (1.3.2)
- tins (~> 1.0)
- tins (1.6.0)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- taskjuggler
-
-BUNDLED WITH
- 2.1.4
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix
deleted file mode 100644
index d3a8e26a4d..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, bundlerEnv, ruby }:
-
-bundlerEnv {
- name = "taskjuggler-3.5.0";
-
- inherit ruby;
- gemdir = ./.;
-
- meta = {
- description = "A modern and powerful project management tool";
- homepage = "https://taskjuggler.org/";
- license = lib.licenses.gpl2;
- platforms = lib.platforms.unix;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
deleted file mode 100644
index deeeac1069..0000000000
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- mail = {
- version = "2.6.3";
- source = {
- type = "gem";
- sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
- };
- dependencies = [
- "mime-types"
- ];
- };
- mime-types = {
- version = "2.6.1";
- source = {
- type = "gem";
- sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
- };
- };
- taskjuggler = {
- version = "3.5.0";
- source = {
- type = "gem";
- sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
- };
- dependencies = [
- "mail"
- "term-ansicolor"
- ];
- };
- term-ansicolor = {
- version = "1.3.2";
- source = {
- type = "gem";
- sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
- };
- dependencies = [
- "tins"
- ];
- };
- tins = {
- version = "1.6.0";
- source = {
- type = "gem";
- sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
- };
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock
index 0f05c49617..a2312677be 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/Gemfile.lock
@@ -1,15 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- mail (2.7.1)
+ date (3.3.3)
+ mail (2.8.1)
mini_mime (>= 0.1.1)
- mini_mime (1.0.1)
- taskjuggler (3.6.0)
- mail (>= 2.4.3)
- term-ansicolor (>= 1.0.7)
+ net-imap
+ net-pop
+ net-smtp
+ mini_mime (1.1.2)
+ net-imap (0.3.4)
+ date
+ net-protocol
+ net-pop (0.1.2)
+ net-protocol
+ net-protocol (0.2.1)
+ timeout
+ net-smtp (0.3.3)
+ net-protocol
+ sync (0.5.0)
+ taskjuggler (3.7.2)
+ mail (~> 2.7, >= 2.7.1)
+ term-ansicolor (~> 1.7, >= 1.7.1)
term-ansicolor (1.7.1)
tins (~> 1.0)
- tins (1.20.2)
+ timeout (0.3.2)
+ tins (1.32.1)
+ sync
PLATFORMS
ruby
@@ -18,4 +34,4 @@ DEPENDENCIES
taskjuggler
BUNDLED WITH
- 2.1.4
+ 2.4.12
diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix
index c22d49c7dc..a31d735ac9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/taskjuggler/gemset.nix
@@ -1,24 +1,88 @@
{
- mail = {
- dependencies = ["mini_mime"];
+ date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
+ sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
type = "gem";
};
- version = "2.7.1";
+ version = "3.3.3";
+ };
+ mail = {
+ dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
+ type = "gem";
+ };
+ version = "2.8.1";
};
mini_mime = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
+ sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
type = "gem";
};
- version = "1.0.1";
+ version = "1.1.2";
+ };
+ net-imap = {
+ dependencies = ["date" "net-protocol"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
+ type = "gem";
+ };
+ version = "0.3.4";
+ };
+ net-pop = {
+ dependencies = ["net-protocol"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4";
+ type = "gem";
+ };
+ version = "0.1.2";
+ };
+ net-protocol = {
+ dependencies = ["timeout"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
+ type = "gem";
+ };
+ version = "0.2.1";
+ };
+ net-smtp = {
+ dependencies = ["net-protocol"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
+ type = "gem";
+ };
+ version = "0.3.3";
+ };
+ sync = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6";
+ type = "gem";
+ };
+ version = "0.5.0";
};
taskjuggler = {
dependencies = ["mail" "term-ansicolor"];
@@ -26,10 +90,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp";
+ sha256 = "07fagka8nl29xwwzfhxx89gp34m5hih5vnq4sha1z814004md53j";
type = "gem";
};
- version = "3.6.0";
+ version = "3.7.2";
};
term-ansicolor = {
dependencies = ["tins"];
@@ -42,14 +106,25 @@
};
version = "1.7.1";
};
- tins = {
+ timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pqj45n216zrz7yckdbdknlmhh187iqzx8fp76y2h0jrgqjfkxmj";
+ sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
type = "gem";
};
- version = "1.20.2";
+ version = "0.3.2";
+ };
+ tins = {
+ dependencies = ["sync"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0373zn7zkllcn2q4ylbjgjx9mvm8m73ll3jwjav48dx8myplsp5p";
+ type = "gem";
+ };
+ version = "1.32.1";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix
index 8e4a671c4a..bfb20c5ccb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/thedesk/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "thedesk";
- version = "24.0.10";
+ version = "24.1.2";
src = fetchurl {
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
- sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0=";
+ sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix
index f28797b88e..0c69c4b114 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/todoist/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "todoist";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "sachaos";
repo = "todoist";
rev = "v${version}";
- sha256 = "sha256-46wNacsK2kGHaq2MgcW4ELI2TIY+4leraGQwU4V7sVo=";
+ sha256 = "sha256-i8q9L8x9LNodL3ilFK5kiq744yclRfsexxS7E0i9JSo=";
};
- vendorSha256 = "sha256-ly+OcRo8tGeNX4FnqNVaqjPx/A1FALOnScxs04lIOiU=";
+ vendorHash = "sha256-fWFFWFVnLtZivlqMRIi6TjvticiKlyXF2Bx9Munos8M=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix
index 9438201d45..76c5b2047e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix
@@ -6,6 +6,7 @@
, meson
, scdoc
, wayland-protocols
+, wayland-scanner
, freetype
, harfbuzz
, cairo
@@ -16,16 +17,19 @@
stdenv.mkDerivation rec {
pname = "tofi";
- version = "0.8.1";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "philj56";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU=";
+ sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90=";
};
- nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];
+ depsBuildBuild = [ pkg-config ];
+ nativeBuildInputs = [
+ meson ninja pkg-config scdoc wayland-protocols wayland-scanner
+ ];
buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ];
meta = with lib; {
@@ -34,6 +38,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ fbergroth ];
platforms = platforms.linux;
- broken = stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
index 6edae3b2ee..14d3cd8f0c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
- version = "0.34.1";
+ version = "0.36.0";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "refs/tags/${version}";
- sha256 = "sha256-5LTd3FPodYxMm4zZJsAfO0O1Y0AXUxaz+ZtEh6b5Etw=";
+ sha256 = "sha256-gEQA9PASSKAMqulOaK8ynBXX7BdptY1uwdS1tOf3/Jc=";
};
nativeCheckInputs = with python3Packages; [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix
index 519efbcf58..03ecf260d2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttdl";
- version = "3.7.1";
+ version = "3.8.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
- sha256 = "sha256-Bhi1d01VqeLmxsiyIG8HXD6AgabgsKgZoKYgnGNpk/8=";
+ sha256 = "sha256-6QfUy1Y7qFOdBFmDFQyRr+GJZSdH+pbU3dEcAjsV1JM=";
};
- cargoHash = "sha256-A/5DS7b7Dgj+GlCPu6fx0t14BfMm4XjkpcDjSpeDSnE=";
+ cargoHash = "sha256-N+mVfgbL22fmynmz4/xFNxQh7l455cH2jyuczc4XsM4=";
meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix
index 2c9ce250ee..b695286085 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix
@@ -10,18 +10,18 @@
buildGoModule rec {
pname = "usql";
- version = "0.14.0";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
- hash = "sha256-AYo1sRzsOuyv0p3X8/TmsWdCBq3Gcqo0J6+B2aI7UIo=";
+ hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0=";
};
buildInputs = [ unixODBC icu ];
- vendorHash = "sha256-ro/m9t8vHxyAS+a42/OkaqhrUs0FPGu0Ns9tn5HyKXg=";
+ vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A=";
proxyVendor = true;
# Exclude broken impala & hive driver
diff --git a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
index 2c594636c0..54fe655892 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/vhs/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "vhs";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
- hash = "sha256-62FS/FBhQNpj3dAfKfIUKY+IJeeaONzqRu7mG49li+o";
+ hash = "sha256-qtewd4sm3urFwoDkqdUHfr2SvJRR1nVLLE5d28BocYg=";
};
- vendorHash = "sha256-+BLZ+Ni2dqboqlOEjFNF6oB/vNDlNRCb6AiDH1uSsLw";
+ vendorHash = "sha256-s1ISU7VEH9o7SBF3Vy+2kVZNxOFUYLmh/le5vU8rOqg=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix
index 00cd8dcf05..e2dafd1ed9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/wike/default.nix
@@ -1,23 +1,31 @@
-{ lib, stdenv, fetchFromGitHub
-, meson, pkg-config, ninja
+{ lib
+, fetchFromGitHub
, python3
-, glib, appstream-glib , desktop-file-utils
-, gobject-introspection, gtk3
-, wrapGAppsHook
-, libhandy, webkitgtk, glib-networking
-, gnome, dconf
+, meson
+, ninja
+, pkg-config
+, appstream-glib
+, desktop-file-utils
+, gobject-introspection
+, wrapGAppsHook4
+, glib
+, gtk4
+, librsvg
+, libadwaita
+, glib-networking
+, webkitgtk_6_0
}:
python3.pkgs.buildPythonApplication rec {
pname = "wike";
- version = "1.7.1";
+ version = "2.0.1";
format = "other";
src = fetchFromGitHub {
owner = "hugolabe";
repo = "Wike";
rev = version;
- sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI=";
+ hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA=";
};
nativeBuildInputs = [
@@ -27,17 +35,16 @@ python3.pkgs.buildPythonApplication rec {
appstream-glib
desktop-file-utils
gobject-introspection
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
glib
- gtk3
- libhandy
- webkitgtk
+ gtk4
+ librsvg
+ libadwaita
glib-networking
- gnome.adwaita-icon-theme
- dconf
+ webkitgtk_6_0
];
propagatedBuildInputs = with python3.pkgs; [
@@ -47,13 +54,21 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
+ substituteInPlace build-aux/meson/postinstall.py \
+ --replace gtk-update-icon-cache gtk4-update-icon-cache
+ '';
+
+ # prevent double wrapping
+ dontWrapGApps = true;
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
description = "Wikipedia Reader for the GNOME Desktop";
homepage = "https://github.com/hugolabe/Wike";
license = licenses.gpl3Plus;
- platforms = webkitgtk.meta.platforms;
+ platforms = platforms.linux;
maintainers = with maintainers; [ samalws ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix
index 64b728f4ac..cbd7c32bdd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/wlclock/default.nix
@@ -5,6 +5,7 @@
, ninja
, cmake
, pkg-config
+, wayland-scanner
, wayland-protocols
, wayland
, cairo
@@ -22,18 +23,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aHA4kXHYH+KvAJSep5X3DqsiK6WFpXr3rGQl/KNiUcY=";
};
+ depsBuildBuild = [
+ pkg-config
+ ];
+
nativeBuildInputs = [
meson
ninja
cmake
pkg-config
+ scdoc
+ wayland-scanner
];
buildInputs = [
wayland-protocols
wayland
cairo
- scdoc
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix
new file mode 100644
index 0000000000..16f73b3026
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/wthrr/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wthrr";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "tobealive";
+ repo = "wthrr-the-weathercrab";
+ rev = "v${version}";
+ hash = "sha256-u8d3bX0jRe8N7LIhENMVI9MyR5HF2a8kyuMYw8s+PSc=";
+ };
+
+ cargoHash = "sha256-mrPydD45L51OSrVPYpXLli1rPlmUpKMcPWql1XrZu1Y=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ openssl
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.CoreFoundation
+ darwin.apple_sdk.frameworks.Security
+ ];
+
+ checkFlags = [
+ # requires internet access
+ "--skip=modules::localization::tests::translate_string"
+ "--skip=modules::location::tests::geolocation_response"
+ ];
+
+ meta = with lib; {
+ description = "Weather companion for the terminal";
+ homepage = "https://github.com/tobealive/wthrr-the-weathercrab";
+ changelog = "https://github.com/tobealive/wthrr-the-weathercrab/releases/tag/${src.rev}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix
index 56eca76065..b3ba4938ab 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix
@@ -2,13 +2,13 @@
xmrig.overrideAttrs (oldAttrs: rec {
pname = "xmrig-mo";
- version = "6.19.1-mo1";
+ version = "6.19.2-mo1";
src = fetchFromGitHub {
owner = "MoneroOcean";
repo = "xmrig";
rev = "v${version}";
- sha256 = "sha256-wrjn1QhHI/OeSpPkwuwqQAsTOW8O/lNqIgKjkjxSbbA=";
+ sha256 = "sha256-L2upscNOTEQTbJ9ZnbXIpqPNmQDv56/7UYzlKndEulc=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix
index 461af3ca66..0be5dd4cae 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix
@@ -13,13 +13,13 @@ let
in
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
- version = "6.19.0";
+ version = "6.19.2";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
- hash = "sha256-0vmRwe7PQVifm6HxgpPno9mIFcBZFtxqNdDK4V637ds=";
+ hash = "sha256-3nEfg2hmOMjevo5VhjelIeV2xRwkIOVhLNxBmPzdWog=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix
index dde9f3b698..4012b40ff6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -2,19 +2,13 @@
, flutter
, python3
, fetchFromGitHub
-, stdenv
, pcre2
, gnome
, makeWrapper
, removeReferencesTo
}:
-let
- vendorHashes = {
- x86_64-linux = "sha256-Upe0cEDG02RJD50Ht9VNMwkelsJHX8zOuJZssAhMuMY=";
- aarch64-linux = "sha256-lKER4+gcyFqnCvgBl/qdVBCbUpocWUnXGLXsX82MSy4=";
- };
-in
-flutter.mkFlutterApp rec {
+
+flutter.buildFlutterApplication rec {
pname = "yubioath-flutter";
version = "6.1.0";
@@ -27,7 +21,8 @@ flutter.mkFlutterApp rec {
passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
- vendorHash = vendorHashes.${stdenv.system};
+ depsListFile = ./deps.json;
+ vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8=";
postPatch = ''
substituteInPlace linux/CMakeLists.txt \
@@ -89,6 +84,6 @@ flutter.mkFlutterApp rec {
homepage = "https://github.com/Yubico/yubioath-flutter";
license = licenses.asl20;
maintainers = with maintainers; [ lukegb ];
- platforms = builtins.attrNames vendorHashes;
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json
new file mode 100644
index 0000000000..1ce525f799
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json
@@ -0,0 +1,1319 @@
+[
+ {
+ "name": "yubico_authenticator",
+ "version": "6.1.0+60100",
+ "kind": "root",
+ "source": "root",
+ "dependencies": [
+ "flutter",
+ "flutter_localizations",
+ "intl",
+ "async",
+ "logging",
+ "collection",
+ "shared_preferences",
+ "flutter_riverpod",
+ "json_annotation",
+ "freezed_annotation",
+ "window_manager",
+ "qrscanner_zxing",
+ "desktop_drop",
+ "url_launcher",
+ "integration_test",
+ "flutter_test",
+ "flutter_lints",
+ "build_runner",
+ "freezed",
+ "json_serializable"
+ ]
+ },
+ {
+ "name": "json_serializable",
+ "version": "6.5.4",
+ "kind": "dev",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "async",
+ "build",
+ "build_config",
+ "collection",
+ "json_annotation",
+ "meta",
+ "path",
+ "pub_semver",
+ "pubspec_parse",
+ "source_gen",
+ "source_helper"
+ ]
+ },
+ {
+ "name": "source_helper",
+ "version": "1.3.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "collection",
+ "source_gen"
+ ]
+ },
+ {
+ "name": "source_gen",
+ "version": "1.2.6",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "async",
+ "build",
+ "dart_style",
+ "glob",
+ "meta",
+ "path",
+ "source_span",
+ "yaml"
+ ]
+ },
+ {
+ "name": "yaml",
+ "version": "3.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "source_span",
+ "string_scanner"
+ ]
+ },
+ {
+ "name": "string_scanner",
+ "version": "1.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "source_span"
+ ]
+ },
+ {
+ "name": "source_span",
+ "version": "1.9.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "path",
+ "term_glyph"
+ ]
+ },
+ {
+ "name": "term_glyph",
+ "version": "1.2.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "path",
+ "version": "1.8.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "collection",
+ "version": "1.17.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "meta",
+ "version": "1.8.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "glob",
+ "version": "2.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "collection",
+ "file",
+ "path",
+ "string_scanner"
+ ]
+ },
+ {
+ "name": "file",
+ "version": "6.1.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta",
+ "path"
+ ]
+ },
+ {
+ "name": "async",
+ "version": "2.10.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "meta"
+ ]
+ },
+ {
+ "name": "dart_style",
+ "version": "2.2.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "args",
+ "path",
+ "pub_semver",
+ "source_span"
+ ]
+ },
+ {
+ "name": "pub_semver",
+ "version": "2.1.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "meta"
+ ]
+ },
+ {
+ "name": "args",
+ "version": "2.3.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "analyzer",
+ "version": "5.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "_fe_analyzer_shared",
+ "collection",
+ "convert",
+ "crypto",
+ "glob",
+ "meta",
+ "package_config",
+ "path",
+ "pub_semver",
+ "source_span",
+ "watcher",
+ "yaml"
+ ]
+ },
+ {
+ "name": "watcher",
+ "version": "1.0.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "path"
+ ]
+ },
+ {
+ "name": "package_config",
+ "version": "2.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "path"
+ ]
+ },
+ {
+ "name": "crypto",
+ "version": "3.0.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "typed_data"
+ ]
+ },
+ {
+ "name": "typed_data",
+ "version": "1.3.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection"
+ ]
+ },
+ {
+ "name": "convert",
+ "version": "3.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "typed_data"
+ ]
+ },
+ {
+ "name": "_fe_analyzer_shared",
+ "version": "50.0.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta"
+ ]
+ },
+ {
+ "name": "build",
+ "version": "2.3.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "async",
+ "convert",
+ "crypto",
+ "glob",
+ "logging",
+ "meta",
+ "path"
+ ]
+ },
+ {
+ "name": "logging",
+ "version": "1.1.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "pubspec_parse",
+ "version": "1.2.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "checked_yaml",
+ "collection",
+ "json_annotation",
+ "pub_semver",
+ "yaml"
+ ]
+ },
+ {
+ "name": "json_annotation",
+ "version": "4.7.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "meta"
+ ]
+ },
+ {
+ "name": "checked_yaml",
+ "version": "2.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "json_annotation",
+ "source_span",
+ "yaml"
+ ]
+ },
+ {
+ "name": "build_config",
+ "version": "1.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "checked_yaml",
+ "json_annotation",
+ "path",
+ "pubspec_parse",
+ "yaml"
+ ]
+ },
+ {
+ "name": "freezed",
+ "version": "2.3.2",
+ "kind": "dev",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "build",
+ "build_config",
+ "collection",
+ "meta",
+ "source_gen",
+ "freezed_annotation",
+ "json_annotation"
+ ]
+ },
+ {
+ "name": "freezed_annotation",
+ "version": "2.2.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "json_annotation",
+ "meta"
+ ]
+ },
+ {
+ "name": "build_runner",
+ "version": "2.3.3",
+ "kind": "dev",
+ "source": "hosted",
+ "dependencies": [
+ "args",
+ "async",
+ "analyzer",
+ "build",
+ "build_config",
+ "build_daemon",
+ "build_resolvers",
+ "build_runner_core",
+ "code_builder",
+ "collection",
+ "crypto",
+ "dart_style",
+ "frontend_server_client",
+ "glob",
+ "graphs",
+ "http_multi_server",
+ "io",
+ "js",
+ "logging",
+ "meta",
+ "mime",
+ "package_config",
+ "path",
+ "pool",
+ "pub_semver",
+ "pubspec_parse",
+ "shelf",
+ "shelf_web_socket",
+ "stack_trace",
+ "stream_transform",
+ "timing",
+ "watcher",
+ "web_socket_channel",
+ "yaml"
+ ]
+ },
+ {
+ "name": "web_socket_channel",
+ "version": "2.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "crypto",
+ "stream_channel"
+ ]
+ },
+ {
+ "name": "stream_channel",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async"
+ ]
+ },
+ {
+ "name": "timing",
+ "version": "1.0.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "json_annotation"
+ ]
+ },
+ {
+ "name": "stream_transform",
+ "version": "2.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "stack_trace",
+ "version": "1.11.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "path"
+ ]
+ },
+ {
+ "name": "shelf_web_socket",
+ "version": "1.0.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "shelf",
+ "stream_channel",
+ "web_socket_channel"
+ ]
+ },
+ {
+ "name": "shelf",
+ "version": "1.4.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "collection",
+ "http_parser",
+ "path",
+ "stack_trace",
+ "stream_channel"
+ ]
+ },
+ {
+ "name": "http_parser",
+ "version": "4.0.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "source_span",
+ "string_scanner",
+ "typed_data"
+ ]
+ },
+ {
+ "name": "pool",
+ "version": "1.5.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "stack_trace"
+ ]
+ },
+ {
+ "name": "mime",
+ "version": "1.0.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "js",
+ "version": "0.6.5",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta"
+ ]
+ },
+ {
+ "name": "io",
+ "version": "1.0.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta",
+ "path",
+ "string_scanner"
+ ]
+ },
+ {
+ "name": "http_multi_server",
+ "version": "3.2.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async"
+ ]
+ },
+ {
+ "name": "graphs",
+ "version": "2.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection"
+ ]
+ },
+ {
+ "name": "frontend_server_client",
+ "version": "3.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "path"
+ ]
+ },
+ {
+ "name": "code_builder",
+ "version": "4.3.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "built_collection",
+ "built_value",
+ "collection",
+ "matcher",
+ "meta"
+ ]
+ },
+ {
+ "name": "matcher",
+ "version": "0.12.13",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta",
+ "stack_trace"
+ ]
+ },
+ {
+ "name": "built_value",
+ "version": "8.4.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "built_collection",
+ "collection",
+ "fixnum",
+ "meta"
+ ]
+ },
+ {
+ "name": "fixnum",
+ "version": "1.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "built_collection",
+ "version": "5.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "build_runner_core",
+ "version": "7.2.7",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "build",
+ "build_config",
+ "build_resolvers",
+ "collection",
+ "convert",
+ "crypto",
+ "glob",
+ "graphs",
+ "json_annotation",
+ "logging",
+ "meta",
+ "path",
+ "package_config",
+ "pool",
+ "timing",
+ "watcher",
+ "yaml"
+ ]
+ },
+ {
+ "name": "build_resolvers",
+ "version": "2.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "analyzer",
+ "async",
+ "build",
+ "crypto",
+ "graphs",
+ "logging",
+ "path",
+ "package_config",
+ "pool",
+ "pub_semver",
+ "stream_transform",
+ "yaml"
+ ]
+ },
+ {
+ "name": "build_daemon",
+ "version": "3.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "built_collection",
+ "built_value",
+ "http_multi_server",
+ "logging",
+ "path",
+ "pool",
+ "shelf",
+ "shelf_web_socket",
+ "stream_transform",
+ "watcher",
+ "web_socket_channel"
+ ]
+ },
+ {
+ "name": "flutter_lints",
+ "version": "2.0.1",
+ "kind": "dev",
+ "source": "hosted",
+ "dependencies": [
+ "lints"
+ ]
+ },
+ {
+ "name": "lints",
+ "version": "2.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "flutter_test",
+ "version": "0.0.0",
+ "kind": "dev",
+ "source": "sdk",
+ "dependencies": [
+ "flutter",
+ "test_api",
+ "path",
+ "fake_async",
+ "clock",
+ "stack_trace",
+ "vector_math",
+ "async",
+ "boolean_selector",
+ "characters",
+ "collection",
+ "js",
+ "matcher",
+ "material_color_utilities",
+ "meta",
+ "source_span",
+ "stream_channel",
+ "string_scanner",
+ "term_glyph"
+ ]
+ },
+ {
+ "name": "material_color_utilities",
+ "version": "0.2.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "characters",
+ "version": "1.2.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "boolean_selector",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "source_span",
+ "string_scanner"
+ ]
+ },
+ {
+ "name": "vector_math",
+ "version": "2.1.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "clock",
+ "version": "1.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "fake_async",
+ "version": "1.3.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "clock",
+ "collection"
+ ]
+ },
+ {
+ "name": "test_api",
+ "version": "0.4.16",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "async",
+ "boolean_selector",
+ "collection",
+ "meta",
+ "source_span",
+ "stack_trace",
+ "stream_channel",
+ "string_scanner",
+ "term_glyph",
+ "matcher"
+ ]
+ },
+ {
+ "name": "flutter",
+ "version": "0.0.0",
+ "kind": "direct",
+ "source": "sdk",
+ "dependencies": [
+ "characters",
+ "collection",
+ "js",
+ "material_color_utilities",
+ "meta",
+ "vector_math",
+ "sky_engine"
+ ]
+ },
+ {
+ "name": "sky_engine",
+ "version": "0.0.99",
+ "kind": "transitive",
+ "source": "sdk",
+ "dependencies": []
+ },
+ {
+ "name": "integration_test",
+ "version": "0.0.0",
+ "kind": "dev",
+ "source": "sdk",
+ "dependencies": [
+ "flutter",
+ "flutter_driver",
+ "flutter_test",
+ "path",
+ "vm_service",
+ "archive",
+ "async",
+ "boolean_selector",
+ "characters",
+ "clock",
+ "collection",
+ "crypto",
+ "fake_async",
+ "file",
+ "js",
+ "matcher",
+ "material_color_utilities",
+ "meta",
+ "source_span",
+ "stack_trace",
+ "stream_channel",
+ "string_scanner",
+ "sync_http",
+ "term_glyph",
+ "test_api",
+ "typed_data",
+ "vector_math",
+ "webdriver"
+ ]
+ },
+ {
+ "name": "webdriver",
+ "version": "3.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "archive",
+ "matcher",
+ "path",
+ "stack_trace",
+ "sync_http"
+ ]
+ },
+ {
+ "name": "sync_http",
+ "version": "0.3.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "archive",
+ "version": "3.3.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "crypto",
+ "path"
+ ]
+ },
+ {
+ "name": "vm_service",
+ "version": "9.4.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "flutter_driver",
+ "version": "0.0.0",
+ "kind": "transitive",
+ "source": "sdk",
+ "dependencies": [
+ "file",
+ "flutter",
+ "flutter_test",
+ "fuchsia_remote_debug_protocol",
+ "path",
+ "meta",
+ "vm_service",
+ "webdriver",
+ "archive",
+ "async",
+ "boolean_selector",
+ "characters",
+ "clock",
+ "collection",
+ "crypto",
+ "js",
+ "matcher",
+ "material_color_utilities",
+ "platform",
+ "process",
+ "source_span",
+ "stack_trace",
+ "stream_channel",
+ "string_scanner",
+ "sync_http",
+ "term_glyph",
+ "test_api",
+ "typed_data",
+ "vector_math"
+ ]
+ },
+ {
+ "name": "process",
+ "version": "4.2.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "file",
+ "path",
+ "platform"
+ ]
+ },
+ {
+ "name": "platform",
+ "version": "3.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "fuchsia_remote_debug_protocol",
+ "version": "0.0.0",
+ "kind": "transitive",
+ "source": "sdk",
+ "dependencies": [
+ "process",
+ "vm_service",
+ "file",
+ "meta",
+ "path",
+ "platform"
+ ]
+ },
+ {
+ "name": "url_launcher",
+ "version": "6.1.7",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_android",
+ "url_launcher_ios",
+ "url_launcher_linux",
+ "url_launcher_macos",
+ "url_launcher_platform_interface",
+ "url_launcher_web",
+ "url_launcher_windows"
+ ]
+ },
+ {
+ "name": "url_launcher_windows",
+ "version": "3.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "url_launcher_platform_interface",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "plugin_platform_interface"
+ ]
+ },
+ {
+ "name": "plugin_platform_interface",
+ "version": "2.1.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta"
+ ]
+ },
+ {
+ "name": "url_launcher_web",
+ "version": "2.0.13",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "flutter_web_plugins",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "flutter_web_plugins",
+ "version": "0.0.0",
+ "kind": "transitive",
+ "source": "sdk",
+ "dependencies": [
+ "flutter",
+ "js",
+ "characters",
+ "collection",
+ "material_color_utilities",
+ "meta",
+ "vector_math"
+ ]
+ },
+ {
+ "name": "url_launcher_macos",
+ "version": "3.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "url_launcher_linux",
+ "version": "3.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "url_launcher_ios",
+ "version": "6.0.17",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "url_launcher_android",
+ "version": "6.0.22",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "url_launcher_platform_interface"
+ ]
+ },
+ {
+ "name": "desktop_drop",
+ "version": "0.4.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "flutter_web_plugins",
+ "cross_file"
+ ]
+ },
+ {
+ "name": "cross_file",
+ "version": "0.3.3+2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "js",
+ "meta"
+ ]
+ },
+ {
+ "name": "qrscanner_zxing",
+ "version": "1.0.0",
+ "kind": "direct",
+ "source": "path",
+ "dependencies": [
+ "flutter",
+ "plugin_platform_interface"
+ ]
+ },
+ {
+ "name": "window_manager",
+ "version": "0.3.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "path",
+ "screen_retriever"
+ ]
+ },
+ {
+ "name": "screen_retriever",
+ "version": "0.1.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter"
+ ]
+ },
+ {
+ "name": "flutter_riverpod",
+ "version": "2.1.3",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "flutter",
+ "meta",
+ "riverpod",
+ "state_notifier"
+ ]
+ },
+ {
+ "name": "state_notifier",
+ "version": "0.7.2+1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta"
+ ]
+ },
+ {
+ "name": "riverpod",
+ "version": "2.1.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "collection",
+ "meta",
+ "stack_trace",
+ "state_notifier"
+ ]
+ },
+ {
+ "name": "shared_preferences",
+ "version": "2.0.16",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "shared_preferences_android",
+ "shared_preferences_foundation",
+ "shared_preferences_linux",
+ "shared_preferences_platform_interface",
+ "shared_preferences_web",
+ "shared_preferences_windows"
+ ]
+ },
+ {
+ "name": "shared_preferences_windows",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "file",
+ "flutter",
+ "path",
+ "path_provider_platform_interface",
+ "path_provider_windows",
+ "shared_preferences_platform_interface"
+ ]
+ },
+ {
+ "name": "shared_preferences_platform_interface",
+ "version": "2.1.0",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "plugin_platform_interface"
+ ]
+ },
+ {
+ "name": "path_provider_windows",
+ "version": "2.1.3",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "ffi",
+ "flutter",
+ "path",
+ "path_provider_platform_interface",
+ "win32"
+ ]
+ },
+ {
+ "name": "win32",
+ "version": "3.1.2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "ffi"
+ ]
+ },
+ {
+ "name": "ffi",
+ "version": "2.0.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": []
+ },
+ {
+ "name": "path_provider_platform_interface",
+ "version": "2.0.5",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "platform",
+ "plugin_platform_interface"
+ ]
+ },
+ {
+ "name": "shared_preferences_web",
+ "version": "2.0.4",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "flutter_web_plugins",
+ "shared_preferences_platform_interface"
+ ]
+ },
+ {
+ "name": "shared_preferences_linux",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "file",
+ "flutter",
+ "path",
+ "path_provider_linux",
+ "path_provider_platform_interface",
+ "shared_preferences_platform_interface"
+ ]
+ },
+ {
+ "name": "path_provider_linux",
+ "version": "2.1.7",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "ffi",
+ "flutter",
+ "path",
+ "path_provider_platform_interface",
+ "xdg_directories"
+ ]
+ },
+ {
+ "name": "xdg_directories",
+ "version": "0.2.0+2",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "meta",
+ "path",
+ "process"
+ ]
+ },
+ {
+ "name": "shared_preferences_foundation",
+ "version": "2.1.1",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "shared_preferences_platform_interface"
+ ]
+ },
+ {
+ "name": "shared_preferences_android",
+ "version": "2.0.14",
+ "kind": "transitive",
+ "source": "hosted",
+ "dependencies": [
+ "flutter",
+ "shared_preferences_platform_interface"
+ ]
+ },
+ {
+ "name": "intl",
+ "version": "0.17.0",
+ "kind": "direct",
+ "source": "hosted",
+ "dependencies": [
+ "clock",
+ "path"
+ ]
+ },
+ {
+ "name": "flutter_localizations",
+ "version": "0.0.0",
+ "kind": "direct",
+ "source": "sdk",
+ "dependencies": [
+ "flutter",
+ "intl",
+ "characters",
+ "clock",
+ "collection",
+ "js",
+ "material_color_utilities",
+ "meta",
+ "path",
+ "vector_math"
+ ]
+ }
+]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix
index 84015ba4a3..6282b812b2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix
@@ -6,12 +6,12 @@
, gtk-mac-integration
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "zathura";
version = "0.5.2";
src = fetchurl {
- url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+ url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6";
};
@@ -25,16 +25,17 @@ stdenv.mkDerivation rec {
"-Dconvert-icon=enabled"
"-Dsynctex=enabled"
# Make sure tests are enabled for doCheck
- "-Dtests=enabled"
- ] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled";
+ (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
+ (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)
+ ];
nativeBuildInputs = [
- meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx
- gettext wrapGAppsHook libxml2 check appstream-glib
+ meson ninja pkg-config desktop-file-utils python3.pythonForBuild.pkgs.sphinx
+ gettext wrapGAppsHook libxml2 appstream-glib
];
buildInputs = [
- gtk girara libintl sqlite glib file librsvg
+ gtk girara libintl sqlite glib file librsvg check
texlive.bin.core
] ++ lib.optional stdenv.isLinux libseccomp
++ lib.optional stdenv.isDarwin gtk-mac-integration;
@@ -48,4 +49,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ globin ];
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
index 939611a562..0659fecfc0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix
@@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "zine";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A=";
+ sha256 = "sha256-ydcrU2nIlu7Jx7S00DZmD2lAwLIFNzfv4zzM4SwJLVc=";
};
- cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck=";
+ cargoHash = "sha256-j87mpWuYOx7oQyUIlvqKeQ/LZ2lRxz4hyPC0TsrgX2g=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix
index bcd0e1f88b..3fa423e392 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix
@@ -86,11 +86,11 @@ let
in
stdenv.mkDerivation rec {
pname = "appgate-sdp";
- version = "6.1.2";
+ version = "6.1.3";
src = fetchurl {
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
- sha256 = "sha256-nTQDQxXWMHkHgKlr7mIlazH7kW3HJqNLrUATo4s0N1g=";
+ sha256 = "sha256-uk7+XBKtTGnX/bHBQttmxlu9+gKvFqu3VhzC7uIYCNQ=";
};
# just patch interpreter
diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
index 9ef5ebe21e..170255339a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
- version = "1.9.16";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
- hash = "sha256-xskLRQLjLSXXHK39h7e8knP5OtIbcllF7OvefPpIQCU=";
+ hash = "sha256-OQh8xub/4DHZk4sGIJldyoXGR/TQ9F0reERk2lpjYi8=";
};
- vendorHash = "sha256-lyXP1mkJmHpHHMtH0rXa0orf5u+AbZ4H/MJXt8o49ng=";
+ vendorHash = "sha256-etvCtNCW6tuzKZEEx2RODzMx0W9hGoXNS2jWGJO+Pc0=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix
index 5b2effb2ca..b18fa340b8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix
@@ -6,23 +6,25 @@
buildGoModule rec {
pname = "blocky";
- version = "0.20";
+ version = "0.21";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-l2GhqJit/+WpNDICD/NUzCAGrKrTNHzEzgpF9k3+DLk=";
+ sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
- vendorSha256 = "sha256-CS8+tsE5dptG9gF46OFoJGzn1FnfjekXLTLrpwIQdFQ=";
+ vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A=";
ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ];
+ passthru.tests = { inherit (nixosTests) blocky; };
+
meta = with lib; {
description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features.";
homepage = "https://0xerr0r.github.io/blocky";
@@ -30,6 +32,4 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ ratsclub ];
};
-
- passthru.tests = { inherit (nixosTests) blocky; };
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
index 7deb802e5b..d3c4e67b11 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.50.114";
+ version = "1.50.125";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "sha256-aZuNxO4whVRUb4Up0VwyMiI50OumWuCDfzm15ywGdIk=";
+ sha256 = "sha256-QVKCH8w593uF948tyavABI0g6sG0oteS/1O8Ncz77ps=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
index 202b0cab0e..47b768cfb3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix
@@ -166,7 +166,7 @@ in stdenv.mkDerivation {
buildInputs = [
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings-desktop-schemas glib gtk3
+ gsettings-desktop-schemas glib gtk3 gtk4
# needed for XDG_ICON_DIRS
gnome.adwaita-icon-theme
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index e34595db62..b36e0c0ba8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
{
"stable": {
- "version": "112.0.5615.49",
- "sha256": "0hgzbbmz40235binfn3vkkxzvwxilaxg04dclqrz980z7hvkgzfx",
- "sha256bin64": "0jq5pbyayk8pa9ksxp2dk3k7j2jic506mfpkq1a1z48j1l4fkr5i",
+ "version": "112.0.5615.165",
+ "sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n",
+ "sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm",
"deps": {
"gn": {
"version": "2023-02-17",
@@ -12,16 +12,16 @@
}
},
"chromedriver": {
- "version": "112.0.5615.28",
- "sha256_linux": "13i2y1zd3dxjvs9575m00gg8xxll1g08sn7dayl7l8qr3zy74p98",
- "sha256_darwin": "0mw8h7ijc0nf7c2j731w30ajh6djy1lk6nak81fpksgk98vkv64f",
- "sha256_darwin_aarch64": "103b3n7vxqvim4ks8vi5b29d41wdldkj1rz94fnqvgw04lykm9sk"
+ "version": "112.0.5615.49",
+ "sha256_linux": "0acp7hck7p9v1ysyzdyyrj43z2azlj35l8sw2f8fn5nfbl4bsbkf",
+ "sha256_darwin": "14205fqfinlqw9kbs2p6pzb666mnz8rbfim1crpdkzsrfn5dlb9h",
+ "sha256_darwin_aarch64": "17v9k9k5p3rwq1i58xw19p93hzirp0r0aiq5s3gc20i7ka3bk1xj"
}
},
"beta": {
- "version": "113.0.5672.24",
- "sha256": "1z7yv5lqi1n4ycymkf0kz1v8ig06n430a37ik8hri3a6db8r9lv8",
- "sha256bin64": "1y9jaw47dgphqr2l8yc36s7k9lf4qrbmfll1d2d1zdjd5ma3slab",
+ "version": "113.0.5672.63",
+ "sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn",
+ "sha256bin64": "1n1bcim5wfafa3bl9grp3ckmnbi1mzhdxz8pim408wz892da34zl",
"deps": {
"gn": {
"version": "2023-03-18",
@@ -32,22 +32,22 @@
}
},
"dev": {
- "version": "114.0.5696.0",
- "sha256": "0hcf971azy3jjsl211qk53b6nk0f4pzf2dwfv3rjh4f6fa3nbwai",
- "sha256bin64": "1ssj633vdg3ghd87az28q262ly1fk7rc3k70l1531xvj2030ijrl",
+ "version": "114.0.5735.6",
+ "sha256": "0wxlfqxrawk77yzm00hb1fbssrycl4mha53wm4y5mlb8warqs5jk",
+ "sha256bin64": "0vlb6zr50kn7i0rfvy3yvwzcffpg5ki7is8i3ck43b1gr1bsmgmb",
"deps": {
"gn": {
- "version": "2023-03-18",
+ "version": "2023-04-19",
"url": "https://gn.googlesource.com/gn",
- "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
- "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
+ "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
+ "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
}
}
},
"ungoogled-chromium": {
- "version": "112.0.5615.50",
- "sha256": "006x62z7cpb2aqi2q67l1n3nq1wyrmdgdnkdc46xjw751jax8h8j",
- "sha256bin64": null,
+ "version": "112.0.5615.165",
+ "sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n",
+ "sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm",
"deps": {
"gn": {
"version": "2023-02-17",
@@ -56,8 +56,8 @@
"sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c"
},
"ungoogled-patches": {
- "rev": "112.0.5615.50-1",
- "sha256": "0axz76hbcc5h6gqv41yxd0yy9vcldps5xn9ffx98iyzghi76z1sa"
+ "rev": "112.0.5615.165-1",
+ "sha256": "1q2870z4k2hkn3jh24xc0xiadd1sxc4apn1jz740yzlwsi6jmcgw"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 39d06866a3..3b207532ea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,1005 +1,1015 @@
{
- version = "112.0b9";
+ version = "113.0b9";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ach/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ach/firefox-113.0b9.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "c91087958058c4b5754f6963f676f2bbac87c3d2f2b13f1b7ae7ad449a7a9f25";
+ sha256 = "bf37354a110882db36b5112e6212b6c41812280a78e1bc107c7f33a89c8256d1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/af/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/af/firefox-113.0b9.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "3310d41e3b0167dae3cdf364da748f5adb41e5ad903ae09377c5966b4c61c9f3";
+ sha256 = "acb192bb60d9b1cf7099b64fff505fdbdeab9affdff9244436f9f6f562a49bbd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/an/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/an/firefox-113.0b9.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "112dd28095ced2b4eb183f3ca320b171004c2543f7551ea84f6d0bbe2a60d15f";
+ sha256 = "d8cc34bdae02fd5b2c0915738db92a3bce14d1ebd58f5b80e72845726e5cc5d2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ar/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ar/firefox-113.0b9.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "14a0b63620dfbd1becbe36b45f94a1773c9329c3fed50b81fbe689d1e7ba5d5a";
+ sha256 = "4375cd8b9b50e206f96a6b4af34b7d9353511cb2bc69894b3d8d8e25038a85b5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ast/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ast/firefox-113.0b9.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "34a5dd3aae37ede37a8425af5a5905bb8f4e1288132ede86b191eae05cdaa9da";
+ sha256 = "a0e9dd82564713447d2a58a28be2e30a3fcdf4208d653f5ec73aedcee157260a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/az/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/az/firefox-113.0b9.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "477c4bbeb522b47cdc5ec0009ce55ec81d5f5ffb1d5c49fcc57904d8f1fe0aa4";
+ sha256 = "05476676f674aef2a3db6faf8eda6a408811f6fbaa7b5e4cdcf08a27269f0fbb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/be/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/be/firefox-113.0b9.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "ea066f5d7ca3f7f33e1b7be303708ee59323fea46f1acbfb6037144768cfdc16";
+ sha256 = "ddec265363cf870f8ffa363294bca77ecacfe38f9dabdd2a8d0a87088c4e8873";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/bg/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bg/firefox-113.0b9.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "a15fc91adafa49629692b00257bc20ef8f75af2a387493de5887319b51f495e1";
+ sha256 = "89d64f783cf0579631f10caf3b28aaba2afdcaf2f5fa37c2b99488d98a338b2a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/bn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bn/firefox-113.0b9.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "d20d14593232e3e19c82245846120e44f40fe224c0a8a925fecbc326d1d41731";
+ sha256 = "0fbd49d694e7fcc206b51aed7b0acbd92f4fce8ba1f0c3fcee12f4a57d585e6e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/br/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/br/firefox-113.0b9.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "6dfe902d2a46e6c81e94fd451e4a698e615f151c86c54ed17493de38b641089d";
+ sha256 = "9ecd657bfa96c9a9f2a7c1b639c6a6186826b32af416bb69aa79f64b9553e2c8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/bs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/bs/firefox-113.0b9.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "98dfc8936651c15a5685ef29c35382cdda66c1ba8b4aa335ef824227093144f1";
+ sha256 = "67c2015588c815d11675782d606ac8602002ab68db57537ba441f6cf3a37e940";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ca-valencia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ca-valencia/firefox-113.0b9.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "6ea7553b2eaf81698dc82a144731326773cba371d7ce8903abcfb4f3bc46683e";
+ sha256 = "a1462095f3233fbe74f9623128f3d08b769857ce11882d41c81b97c70d864982";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ca/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ca/firefox-113.0b9.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "5b5d9c296c619786bd5ef3362610796e7d2b51a7f3520f04bc62a675bc32345f";
+ sha256 = "10a528f99b3b42ae6c1c598101e3352d0e23509c0094163fa072490d5fae7b08";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/cak/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cak/firefox-113.0b9.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "ac11d4d349861efc3d19e0d486e3bf7aac7aedf0d4c523487dd0d688d72fbdbc";
+ sha256 = "35a2a38b79e6438c5216257aa9c4d9e0bba3083988a85311e243252a7fe3c21d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/cs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cs/firefox-113.0b9.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "d850b6adff4f6605b3e836d928f4bc0dd306cc8fa6ac12536b3cfe38a1e309e2";
+ sha256 = "00bec4c57f4b4b84b5158b8a1e63ec03f7c07649266a7a90e00ce22c2dba1652";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/cy/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/cy/firefox-113.0b9.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "8067968db0cdf0a3cd01e07953d91702341b23b79cbbf6728caefd0f3de346e6";
+ sha256 = "3d2461e6c147d7adaa787aae0b796cc7bb8f71c758a678eb3cfd3794a9b58ae1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/da/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/da/firefox-113.0b9.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "52fe4a02dd5b545e5f43e77037588b85cdc3495274e03ef96cf8186350ce91f1";
+ sha256 = "1832342c65bb017dcca582f06c01735f8139f18d6a8730f6d93cde79d2d7818d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/de/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/de/firefox-113.0b9.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "13965286b1837f441cf5c7a864024221c7d0c81f7ade67d2c6935f778786cc32";
+ sha256 = "0b4ddaad13832e4ce8cc2333b82bb6bcae2229c09c9163bcc4ac96622bc2813c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/dsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/dsb/firefox-113.0b9.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "ab5d69a055950b52ffc795485a2a6cbdb99d1a5b376ab859da7f2ce5da12a99a";
+ sha256 = "12034bcc0530209cd0244d3ee1f1925cc69ef57c5f669e6c6b874f7b65b1537c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/el/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/el/firefox-113.0b9.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "8e29c5f596ac93fef337ebab39f20870d84c3183901e3b8e3512b60d1ff263cd";
+ sha256 = "980856e56b28f08d1b89cb1fa7f6a7ac7160992481cd8ec9f3e118fc00473cb7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/en-CA/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-CA/firefox-113.0b9.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "4e7d5b51cb77ceebcc99870ba66413aef3d3d585058c443b642a412f2254aa09";
+ sha256 = "76ad769640c1f7f9e3c6bc6e43d205ce13534e64e7b8431ecab803a7688ad3ee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/en-GB/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-GB/firefox-113.0b9.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "9f09899c1cb5a9c7a1b2779fc6a43b52bfd00d96b4a03ee8479e6a05ef9e91da";
+ sha256 = "c52effada0b38f2c567d787eb62c254f4168535f3c6d5ed56776be4c9b020d0b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/en-US/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/en-US/firefox-113.0b9.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "7f317521402574db83930e9d5792b3abeaf5643810633c7ff6294936bef9744f";
+ sha256 = "f57ef25d7550bb6ddd1d4ec7d78cc6a24dec0ef6bd2a3d9a99e1ccab247e2de3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/eo/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/eo/firefox-113.0b9.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "f70719d08ab219cfaa0df7507ca1b6fafa7d02d88308f12b9f671dfa4f8935cf";
+ sha256 = "70872f8616fd776cc948714e3145d4e74705f44f1d2fd5efb8bb96a02e300c86";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/es-AR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-AR/firefox-113.0b9.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "832b173660c95269e0f76009d8b5f9b6af4094a397f40080960be2d6b746be24";
+ sha256 = "e92401a0e98351587f5eda1be77049f545722e59e8ff8bf3e845892c2fc95668";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/es-CL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-CL/firefox-113.0b9.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "e7f1135fa7fc8108cb7fde420caa6a9ed724f0910c7f07678d71c30d0132b93d";
+ sha256 = "9393b49f5aabd3c51e6de3a028af556e823e020739a73085cff253c5cb97dcc0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/es-ES/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-ES/firefox-113.0b9.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "f2293b64fed57fdeccb05e868b03e60dc2b9a6ed777db5f38c85a36f8c367b3a";
+ sha256 = "a2c5f9bf3e8bdfa903affd12f06ec303135065e220c2df1b886a12d245efd1fb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/es-MX/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/es-MX/firefox-113.0b9.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "1df136aa779e5ba69fb85139e82e80f667973294a99e18a78f7874ed36f162de";
+ sha256 = "a957cffa6b81159e01d08c62d4f6971efa73f5880b44dc628fde95eb2329836c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/et/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/et/firefox-113.0b9.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "0f849766885159cfaccdc84fa82f63e934c412c2eed102f4d4b9e81eba3e9ec2";
+ sha256 = "4349983d056402209e5d1095fcf0d3fe71430d5d843c2f50f1d8d95fb5ad5da2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/eu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/eu/firefox-113.0b9.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "19450d79c3afafe0e952bba089432f2ebaa6de852962f08130c0fb08b91dffb6";
+ sha256 = "3c8cc5fb4001c9db5847be7dc130d3ad9e53627203e795d2d71d8711090814e4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/fa/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fa/firefox-113.0b9.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "8f780dd33aa83a6ea125a25345109fef9ea0e41e1ff3ad18373bf5427926dc18";
+ sha256 = "b44aa38f0e4d844448358ed627cb3f37cd77850a0585ae4016b536750faeb51e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ff/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ff/firefox-113.0b9.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "693324571bf5093c56441b2ead289badaed3b6816fe55529575be6440e8dd803";
+ sha256 = "310a8adedffdd761eda3724ccef02b9716653eff2fb9d57a19156adbf540e261";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/fi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fi/firefox-113.0b9.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "00752c61bf9782863317133c5650d8a6357afe513b343615d3d89e24fea0ed4c";
+ sha256 = "cb3fd7e92cab2f67d6761d683cd8e251f2c458290481f33b5cd315391f30306d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/fr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fr/firefox-113.0b9.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "f7651898bbc14c1d320072408b5030ed9a63c53c168804706639cefc0857dd72";
+ sha256 = "d18a2992446ed7ccae3303c457ced3fe876421ae87186a3284641fe7658162c7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/fur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fur/firefox-113.0b9.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "d8799c511e0fe687c2c9844d7222654bcb37efd14d0cf49ec84b68c7168259e3";
+ sha256 = "73c698e3d6ee95e676ce969082c14ee0a3e436f6bfe22c64a63738594c7cd028";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/fy-NL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/fy-NL/firefox-113.0b9.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "8f65f1afe53d5f5390c6c830698afc6e6404e21f16aa5569876c4c5d7988fb4e";
+ sha256 = "97443e9f9cf8b1f539ecbb58aac85936e6a1da8919c8fc104233c52d6f12d67a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ga-IE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ga-IE/firefox-113.0b9.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "8f570a58e9057c17c1ca09af3570c54366d03c780c7932f5c50d479038387ef7";
+ sha256 = "fb228d6195bd85187d9826a2e281b38ee0a43f2f7858be5db602113e088f7c51";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/gd/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gd/firefox-113.0b9.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "88b0b08c4152e154eea9e8d3bba04e2a7d23a12cdca5ce9ba1474f5f95240092";
+ sha256 = "fe0e79062595250570a6854ad351b0d56126bda4e8a16fa1ad91f8a9c43f5bf1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/gl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gl/firefox-113.0b9.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "dd1b5fcf0dbf72ba3a2da6a8ee6d5cd314443d97182843399f54ec195174e412";
+ sha256 = "8e118ca4f8e50053ebf9e3ee634d841a78e94030fe6a2951e93a23b2a90a8a30";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/gn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gn/firefox-113.0b9.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "a0d3af8127b6100a645a54e8955f2c303b58284a70a151255408c980c507da2d";
+ sha256 = "d3f55dbb4285c18b465ff016e0127a6f4ecdb42da1ca526da642d3625a423995";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/gu-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/gu-IN/firefox-113.0b9.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "40b36cef0c9f9affd3d9e3a2ac048d3e199928260dd3434ef51f8b93a6a6a8bb";
+ sha256 = "7a0ef37a288cc99c6351ca6774000b70479c64b5d1c00aacaf5745f37e53c0a2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/he/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/he/firefox-113.0b9.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "6f5e3f0ebe69f2e1e4f326c3f182e835d1dc8cba4b60fb06eb98ba48bb54ddef";
+ sha256 = "354b2aaa46600b21c4d45bd7144f8e41945a9463d2598c953675bbb32c91012f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/hi-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hi-IN/firefox-113.0b9.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "af347c086bfb88b37153b6c00e8c6ff609c0e55755915df567d4ffd448affbc2";
+ sha256 = "39b3f402f736cd0b578f5ceb4b968057f7815e858b7d0b739a58a6627131744b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/hr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hr/firefox-113.0b9.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "6700d8222630003eea6ce7167bcd2c722482c0be47403c2fc744b4c5b3526a5d";
+ sha256 = "d8f8cd5cf572df2364535896b012511c55684c00409b65b5da39847d9c9c5fff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/hsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hsb/firefox-113.0b9.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "fac03681f8b57f3ad7fd0179288e8462405afa6158b1db73275d4c08e0e89da8";
+ sha256 = "51e849e33bceff938114478a5d30e0134f86ddd1784d0d1ee4c0dd002e6dd43b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/hu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hu/firefox-113.0b9.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "406b66fac8c6fa8cc9805946d4466a40ffe2f13a05ef5282d10416423ec0f969";
+ sha256 = "1cba3499b00bf791f1f73347dd0eb8fdd75590c845baaa4fc6caecebedc4882c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/hy-AM/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/hy-AM/firefox-113.0b9.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "9c6cb600a01dce15c33e626183960915d57ac83ac52de3ca9908b2d23e68ebad";
+ sha256 = "5add82d7bf3bf6ef3696a8b2f7abd56602c6e8b449be8b7efa0a5153c3a8f048";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ia/firefox-113.0b9.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "2dfa86e4afa8cc2b22f9d4f4611d20febdbd794864da035c162cfd9891006524";
+ sha256 = "b53a0de21211a8c18972e222e99bce6f9e898e5003e5af4e2ac41b633a321bee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/id/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/id/firefox-113.0b9.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "747b9d17bc0a20ae2cf7b6532cb4ad597a32f7bebcda03657144d8b5994246af";
+ sha256 = "5ad92f37e7e9971ae19e826af3f29431e8bf26faa9fc4f09b73a9f2196c015d1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/is/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/is/firefox-113.0b9.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "c6bd6f66c31048162d617865178f0c826abdb41ebe924e2ff5e1c3fa072754b3";
+ sha256 = "06142c86c4f94fa27ecd1253253ad3ac0c2c80b38d12d0a8b22910e4025839f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/it/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/it/firefox-113.0b9.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "b2c63ab01dfffb914cae739a75290c6be50e87a21d16fb8f3310199bfb2e507d";
+ sha256 = "934d8bc7af80275908ded3b36379985215f2263acfe3409c9a48cadcadbbe152";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ja/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ja/firefox-113.0b9.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "1d997906bbb6307441995981052ade53f5beb77362b7644fc8880facf7d8b483";
+ sha256 = "60e9ff96c14b1066c2cf021cecec46d673e6b8229aace87e4aa7c87acf3dc4df";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ka/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ka/firefox-113.0b9.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "a2b73a567171b2e2db8176c214fdaba76b0c315ed456c601db88e0ab71fcf837";
+ sha256 = "e339149dde7cbd6507cfcaff5b7bc5270a3e95d62d6d7b35a6f95f5ac7898035";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/kab/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kab/firefox-113.0b9.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "e6cecce0cde14c1eef3a497c555855b1edbea8bcf71e68eed14c10200183a734";
+ sha256 = "6c2a11cd09f11b5c54f2b130ff21a37cc9464f8f19b7679da66e870305c67277";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/kk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kk/firefox-113.0b9.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "a0337d8b84b94e80dd81edf0a87a1fdd7c212dd5f5664c47cb906d43ea5b2a90";
+ sha256 = "8a0f921987a54606d4e812533e678bd15d3d8e36832494555976f8cdeacfd51d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/km/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/km/firefox-113.0b9.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "85b2dac6ffc335e9e81cdf4d964d6f6d2905268eb5b013e7d4e023ffb5fdfbc4";
+ sha256 = "399d02fc79d01f2d1677d4b5d3d3b10f79abab3c8935379b4c54d8c9a6b16366";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/kn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/kn/firefox-113.0b9.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "2e08b43b852f7be3dcd784f5475cd26703deb9ad93f7df10285ab24cfd82a49d";
+ sha256 = "eedb85a910e952461c8d349b5b2db4130e6821055ad70e1ff723d684c8dc964b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ko/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ko/firefox-113.0b9.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "87d952317527c50a458bb5fe5f244ba52347602bad07045d599e1aa3c1cbc8db";
+ sha256 = "0dee36458326a2d5fb3f1764c92c1e3bccea1a47f2479ffcf769c97348a13783";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/lij/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lij/firefox-113.0b9.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "7fc982962a030da5576761f2a23c3f85b17c2a715b8553d5aeb79a1994e2e5e1";
+ sha256 = "4ad41499b6bd174f5849f0699792025ac7e37807d0d43ecf92584fed629976c0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/lt/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lt/firefox-113.0b9.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "dacd492905102cfcee1fabc7690816df39c5adcee081eb14b978c15565d02989";
+ sha256 = "43a64dff5e47c6ba2ed0c51a84b82c309b05259c0ef2dc60a25df307bdb709dd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/lv/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/lv/firefox-113.0b9.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "1182fcc2818f0a1d81cf14e0240b7d66a9edb070dd73cf01a4a6cd3ba7d44232";
+ sha256 = "6a92121065b9fb881df3ee25d93eeb201a71953770798fcaa1d623dd02fe11d2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/mk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/mk/firefox-113.0b9.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "40451812d7c27d67a0ceb03a96e501bc3aa0882387dcc44bcdb864e954455574";
+ sha256 = "57e373e76afe342a5bb47edd807d86858e9806f248a28a8bcc34c3679dd4b285";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/mr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/mr/firefox-113.0b9.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "725cd79039f740876c74489185e782800d77b52eae382efa6ac878367e83107c";
+ sha256 = "b1255c47970d3e32e14d000f185c0f18fcfc3bf1df6a7b5986bb751029bb736c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ms/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ms/firefox-113.0b9.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "f9c7216817b683da598024b322e1cb3a6e7f4b2e2f22415b9b08c44d6503f71d";
+ sha256 = "55f2d076fbddfa7fa6a40570f3588b9d1fcbb980af744f3cb7d87d23e7712943";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/my/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/my/firefox-113.0b9.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "732c2b0615039a004a63382e8f016d8708c1b72804b9bee77c6faf29b4011e94";
+ sha256 = "e1645e880f7c99d12b03d3e647f974401a365b508d3c878309a773de17530b9f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/nb-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nb-NO/firefox-113.0b9.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "a29b80ee29f1e552d50943693fc244c9c7014bee4291e9c92549555d62dbd0cd";
+ sha256 = "f379ab26d7ea277827adbd41a5d0ec9b2f965013ac82df769425affb0147695b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ne-NP/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ne-NP/firefox-113.0b9.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "a45b0b7a6118961cf79c0095b6d2f774204493e6635e44ef8dc98097f2b6e25a";
+ sha256 = "43719374f08eba452873ec55376e9deb427ba68d9753977fd302224db9111d6e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/nl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nl/firefox-113.0b9.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "a0a0b20a92fe9839b5f88af8e4658eca0221a40bb7cdacdfba7ea08a949b1bf9";
+ sha256 = "34b10175db5f3d5a4d0da5686a6a26599966fae5a81f23b8cdd47bd2354fede9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/nn-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/nn-NO/firefox-113.0b9.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "660c9e979aac5fbd431771c1f4c6b3cafcdc7077b9e02aa70bccb8189e85ebb1";
+ sha256 = "9042f22ba6abe771af8cf9d036e0afc6e00f0b3a5342f027d5fefd7790f9d9ee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/oc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/oc/firefox-113.0b9.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "7b50d8d0f9e84a91d2975770aeec54cf1c1c1c8c021e91e078ea966ae3240d24";
+ sha256 = "04c76b40e3da68cff3954c5cabb4b03cf806c9b2d7915da712a5208414884aba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/pa-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pa-IN/firefox-113.0b9.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "fd569c37a2785f84aba84da769aec856eb53c7d045a911e48cd83a4d3dd54ccd";
+ sha256 = "ce79da9f8f41e1d3d7d9fcf5ea1253ffab4df4ee71e6f9f16fb87e915d6c4e46";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/pl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pl/firefox-113.0b9.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "b8bc32cd7a3bca6b53fb2902e5ce07169a2a940886cb86050280e55a7a563548";
+ sha256 = "f37d598ab4079c40de92d59bfacc591c3e870ec1d9b8f0fee202daf953535b56";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/pt-BR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pt-BR/firefox-113.0b9.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "7a8dab23a431d69224c8a7e4ebe1d2f5895ed49ba4b528d4b855001d1152c095";
+ sha256 = "1e77c01ccd08e5a558a9e83a2b4a1852ba9324248095e9125bae5b0eda3b5e42";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/pt-PT/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/pt-PT/firefox-113.0b9.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "dc15ab170a81b9983179ce1f7cada72b33724a6743069d2049efea049d511e7c";
+ sha256 = "2a7a99a0f585e6ffc416c387be6b615d4aa3d59e3fbcc6c07377450eb7d107c3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/rm/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/rm/firefox-113.0b9.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "9d1985d608397f35b27103176512102dff24a2958ba5f1e9d119b95fd1aa1748";
+ sha256 = "7bd997ec2fd111d8d9d0ed8cb7dcb6c147294bc131515c8efedf51d99847c6fc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ro/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ro/firefox-113.0b9.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "9d05495ececb294c3bb29fd729e4e5e9a9e3fde86b9774a91ea06963a8b491a4";
+ sha256 = "58aeca4359472ef7f454574ecad596a132668419ce3dac5a516fe15e95bd532f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ru/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ru/firefox-113.0b9.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "8e3e666acebcd426a14aca3f45b2d3c372b0904dbf1582151a8c3983be7a7d61";
+ sha256 = "a380f042917ceb4232b2cb00b2fe41b3562de1855ca9da12169c26c93110cc0d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sc/firefox-113.0b9.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "2b3520e7d46fc8604b7a7bda838fb9f875a5916ed20892acf6fc48a7de869e73";
+ sha256 = "e51c6c02ff7932a43c9a2176a9dca79acdc392fc459aa652cb3cafe4fff8f81d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sco/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sco/firefox-113.0b9.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "38b16f2289e84fb6ecc9d8ab69cc9ce9c676500ea43649f777f39b9592bdf292";
+ sha256 = "0e4503874f17bf4e28f4ce0067f1c57b47ffb08dbd51a1174ea5123784b2ee1f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/si/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/si/firefox-113.0b9.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "3a48e41b4de39c8f0bc84e14f120860bd12004912d0aa4246d0c9247b11320f6";
+ sha256 = "3620a56e36619a9d13f1e5718a54544e2461ed3cd57194c5bdb3e82f35d5c7da";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sk/firefox-113.0b9.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "1abcf1c4de65e1f02a63e98e3d4465effc06b30f26a3d1ed8dc827258185df21";
+ sha256 = "04be99c1479505ae1020ead421627e0c54a9b630364a06ddce31ac9497431a0b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sl/firefox-113.0b9.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "3090db10e9f989b9e1eaa107af3b72b5746c597b50a25ad91d7de903ac059631";
+ sha256 = "95163e0fad6886d506d2dc8305ee6e49e0feaeb81b670c699088a7930967d05a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/son/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/son/firefox-113.0b9.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "0b23cfe755a48e47408b1625cfd8ff82c00c4925ac2be19b3ceb7b1f5b0ee669";
+ sha256 = "3b59887d89a629fac44ba9b3f9ae2b008c4a72a1c3009f8805c69a3aeab61ac6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sq/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sq/firefox-113.0b9.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "00b5a49bbdfe5466edf4bf6e2b004d59fe19484d5037e5d378fdefc8e598a20f";
+ sha256 = "e3e3e7ad4e93c85b74906785345724ca12d6c672d8c8f86455aedbd409184a62";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sr/firefox-113.0b9.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "47d9e5648f97fcdb6f500e06f77e7410a3e2b86859ed61977e62a87becfe641a";
+ sha256 = "fb7a034eab40cbb2bf0fc0be44516ace2d7a0f420cf0e45de41ca73493d399bf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/sv-SE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/sv-SE/firefox-113.0b9.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "92a2a272fd9230a41bab143d4de030c13c57aa9858328b17e90647dfe4942887";
+ sha256 = "5ce8bd9e7d949807bf1c79a2cae9e00f67db0889de45a21c600a7e9d9efeeb17";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/szl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/szl/firefox-113.0b9.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "f35d7d58313dd9f9a95d2b22906aa67d7d125015bacb78136c19026068cdc93d";
+ sha256 = "81aa017303c68a6a8edbab76cebec09eabcc1679f1952b558ad82aedd660bc2e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ta/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ta/firefox-113.0b9.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "5337aa72997e8a76ed924d120b7fd97a6613b850f8fbb6713e35baa0c9b5ebbb";
+ sha256 = "e635b00c4157143d4fcaff07fd1a60b441e43d3cd5cf5bf7bf12162ff8a32a8c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/te/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/te/firefox-113.0b9.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "484a05ce013e11c8903d362d36eb7f22efb562d82ccfa228d2e4d7a7323e45ac";
+ sha256 = "1a5a50682f7c9c6f8b950a163f148121148770afe12fcc74e4583fbe669837bf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/th/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tg/firefox-113.0b9.tar.bz2";
+ locale = "tg";
+ arch = "linux-x86_64";
+ sha256 = "7c556522cc2dd4c86dc2fb5909f38074126cf0ecf6f930ff87089880cd6c6986";
+ }
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/th/firefox-113.0b9.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "85a27c2dbaf72fd321727810ba2779f4bdc660cd96984f4d7b2191abe7cdf0dc";
+ sha256 = "4955552817314dca3fe585fcc29b509aaf995ab6183e34919ddf9722edd355c8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/tl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tl/firefox-113.0b9.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "2aebae6fe3952b6ccf128b78fcf372065c20ab687f7d319ec5bcbfef83adbb6f";
+ sha256 = "3efa59f44ac3945d85d1ab7f26c22a9bff57ad136e49d42c0a0fabf30a74c74a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/tr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/tr/firefox-113.0b9.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "0a64883bd34d2973404757ab585158e14e146b23b5919d4329f5deaabea0dc15";
+ sha256 = "a9b839e2d0d561c6899255dac676308af02d8b978157036299b3b1855704fc5b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/trs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/trs/firefox-113.0b9.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "667b276c10440880a5168005cbf73ca65865584e006ef148543216d07e252b4f";
+ sha256 = "f5cefd3ac5ede0c14cce148f540992c8b86fc31452fd392cace3d0fe3af9d08e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/uk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/uk/firefox-113.0b9.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "958d00d6d6677587097081438176577b3c47b0bf45cbd685923ae265d89da026";
+ sha256 = "6f7fcc4592ece31b7dbf1151b3ce285446fe2425e8dcada50a869a8e17b4a6d3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/ur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/ur/firefox-113.0b9.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "327e41a6f45db5eb0a5117267ce36c69643017168955b234fb76cdd7d669a049";
+ sha256 = "c36495d94c374798a85664952e44d4fc45eedd5eaa890c035b77c0bd5bde9e81";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/uz/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/uz/firefox-113.0b9.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "f638ee8433306b7b3c674fa75a65506c91306691665084cf9b0d97a9bf65586e";
+ sha256 = "49143062e7989db0e4e2c09d3f9e38947824d7df4eaa2165c34a0fe0e877ae19";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/vi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/vi/firefox-113.0b9.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "a5dd6da3ac7822e4a03f281beca68568414572faf189c4e1f6413ec7ccf80ad0";
+ sha256 = "81003d8b9f48952bed992513db3fb01a6cd65ffce19020586206d1a01b10a910";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/xh/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/xh/firefox-113.0b9.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "f040d2b117c3e0ce55d5c644ed5ddb0d56ffe731afcd4258cd072fc3b7a67be3";
+ sha256 = "1cfab2f857f7b29dd02d7593cd6727e70141f3e4642a0251054b3a5771a5ad73";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/zh-CN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/zh-CN/firefox-113.0b9.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "e3b43d1ca778407228f541e1c505177f584b080af007a79bc3367cea01945e81";
+ sha256 = "ddcda8e792391c9bec5d394de2d1f5b9e7eb2cf94ccd4935f42dc643f3b0184c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-x86_64/zh-TW/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-x86_64/zh-TW/firefox-113.0b9.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "5ad9fbf8efc1f5e9421b159b4de131ca039408b4d50d5484f6ddf0dda9aeb636";
+ sha256 = "8f3a86d5e7f4f6f7f268408ec6d5432911a77bd724d6d9dc2fe3c1f10d36129a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ach/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ach/firefox-113.0b9.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "001c62c8746bd1af868005c8e5b3d11736f90752e0df2c416a2091ea3ad36e0b";
+ sha256 = "f9e0022a9b2ae3510a0a991ac93f6955acfd7ebce553dff64695b03465bc429e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/af/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/af/firefox-113.0b9.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "fbb4789c2bb201ec502438825412af985e8e5a8a7ee6065dd0f1dfecb4d70336";
+ sha256 = "86afdca6617f548711d06a6a041a2deb987ecb6366f35e64fff7d904f853be8b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/an/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/an/firefox-113.0b9.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "d539b0245033c3f67e2ed770c012de9ab838018f927a8fc7fcc920767788b9b8";
+ sha256 = "2eb0f84c986a528b44a8771400c7e086602dc98a9d289ae1229ce30ceb7f6dbf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ar/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ar/firefox-113.0b9.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "a562eddc3915e008b494c26d1bca3a7cff734ef45d79860aac498007622d49d4";
+ sha256 = "4d6e3e05d5fb14e96b4f1062eadeab126f1559c2dfe4ea84e4cd6e5bb1f66ee1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ast/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ast/firefox-113.0b9.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "fcf2cf56b269a6bd3fa902052f3fe9e273c4354f6592e30cd5fec0f193e7386f";
+ sha256 = "30425c1c4ce1694db1eb7725f6ba18ad6c0142d2d1e4951605b551268ce87e3f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/az/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/az/firefox-113.0b9.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "824142e74794384514ca6b5b0a05b11303efde83de0065f87035bd1810ce902f";
+ sha256 = "ee516b2ab21415e5ac2bdd0fde54bcd870ba1511d3007671b981fadcc4826736";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/be/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/be/firefox-113.0b9.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "3f41f87f2182a22a00f8c7e6420c7da9b71ba0c9e1f5efe8858b8f8e5caf450e";
+ sha256 = "e3c54103e912890c94e2b3f9e4999649e97d396cc93415dd4ecb01c87aa5b4c8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/bg/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bg/firefox-113.0b9.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "7f158c167e788dbba7e0eabbd8e9b281c0de1d6d8aa526d69ae5a8ec69926e5f";
+ sha256 = "b1a11ae51a1bf386b56d2645edae98a7e541c42862d5b77fa00aba24330d27f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/bn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bn/firefox-113.0b9.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "fc342a5d06299ca9018174f5c83ba9cb72c044aea2fe7e59c061612a1a40628e";
+ sha256 = "f1cbec0320780a85f9bbbdea75b8081d020ad3517922c2098e1615c9ce5c9ecb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/br/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/br/firefox-113.0b9.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "3ddfc1faea2933ae87860cec4fb789e58ff89c0c1bc056d8e1708c44f9749514";
+ sha256 = "f3f9755d62364c18ac407e8d26f6cbf552faf79c3e69ea1c949aac131804e45c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/bs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/bs/firefox-113.0b9.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "891e67716653251518709ee89ecd92cc8f03e660678744bd180f616ac48e1b69";
+ sha256 = "bd7d0070959cc662d13eefc080ec30bfd65ab2fb18404de523e5a748247e719f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ca-valencia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ca-valencia/firefox-113.0b9.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "4c6fbf059bd2baadd4d56c9fcb39afff2a3cac19172a9a5b44fa81c59a6ac2ac";
+ sha256 = "67e85a13b2a178be372665b366bbf4803640a0d4a2644fb0c6f3afb064855ac9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ca/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ca/firefox-113.0b9.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "aed5d1e5f9f0b36039e441cff1734dd6c9a19beb42df6f4751fd5c2435c0b78d";
+ sha256 = "be137a856bc21089aabb32737d1d5b7e56c30efe712b82d7d5e9763db7a8e12d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/cak/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cak/firefox-113.0b9.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "5f90a690e0c73087f041f84a43b7b0c59886d1d7cbdd8c4f24c4bbe7e45203d6";
+ sha256 = "e2dd719f9b49aedcd9f22fb225e457e179e23ab69832e24dd47ac77ab1a50fe9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/cs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cs/firefox-113.0b9.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "c8d0f07d810d330400484b065c31d7ada75ce1bf7fd06cad5b5839cc8de05fb7";
+ sha256 = "e88506b5b0292ba820f82abe9474544f34eef79dd3a31313fed6e9f4516fe415";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/cy/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/cy/firefox-113.0b9.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "243b4578c636320cbb54b8c6b753300758dfe1cacf4c7b0bf59f9fab88d7918a";
+ sha256 = "21d5df9331cc5584fbf4aa8dc4c561c2cf5d5a9096126e6b6201aad8b29c198c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/da/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/da/firefox-113.0b9.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "c6453746d7cd3ce1b447c2c31b551d72e63a3f7672cde7d63cf043709b04f82b";
+ sha256 = "be01439b3fe1e1f90b5ff13e4961e8abdcaa7f3513b4a47c0a3185a73eca7dd1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/de/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/de/firefox-113.0b9.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "c6d75e3b0085c550891491e74bf287d5afd50b5b4c2ea5962ea78c30a924a28a";
+ sha256 = "3284d2efbd755fb0fe308c2839c95282309aaa422261fef74769420f69c002c6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/dsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/dsb/firefox-113.0b9.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "697787ee71435999eea79f068c1df0cc985d8f3d1e4cd0ce656f843a5f1a84b2";
+ sha256 = "ff30b4f27aedf0beffc9004854ebe9f3b7563a861c12fe7b8698ac5f370e8718";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/el/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/el/firefox-113.0b9.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "3e44427cb177f2e557622d0c0c96b495f1b129d6583aafd6a89f159ba8832657";
+ sha256 = "8900a98bae3882729654f291dc3d52b11f417902cadaf80c823de5dbec70047b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/en-CA/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-CA/firefox-113.0b9.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "07791c9b1e6dadd6778298e988b81a282b076de1a8486a77863cb5a0e88e66ac";
+ sha256 = "c00548d6151d6071e7e23b2be32711b52da069d9325e5dee9438d770fd19a544";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/en-GB/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-GB/firefox-113.0b9.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "b298bc8b95c09ee8f8f4698a46d878142af3751e105264b8ae3b2b6c9d831f80";
+ sha256 = "d8ff0068f8a3be4cab1cb78c85380099a1fb8569638725257d73de39c016beda";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/en-US/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/en-US/firefox-113.0b9.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "572b485dbade05c1ca2a325068df1d0b0ecf61ea04672043721411a8338f7d40";
+ sha256 = "5a311340339bd32f09d79294b2c862a9214ee3468a23f6a1533fbaa6889b3d80";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/eo/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/eo/firefox-113.0b9.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "af6dbaa0a264a509932d02468a4641d47213fab1fed3a1e0992f2d46c541f923";
+ sha256 = "b4737a8eb6b3307e2cfbca4878936471cf754d5f074f5da689e5c7b84f140cb3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/es-AR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-AR/firefox-113.0b9.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "7db3733d8acb6f40c52c4d30ed72fd6a35fbc1da4ae09f2102eb10dcfc66447f";
+ sha256 = "e77f0b8f1c3816bffb64ab938a889900928e7891a9f991c8457b6e49336c76e3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/es-CL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-CL/firefox-113.0b9.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "02aaae0db0a2d1a3fb878ad0b766f8d13a3a032da55c74abed3cdd7446e0fa5c";
+ sha256 = "db458087b28a5f37e0ea9b253f2d26171d5804564dc322567487ec0db5a174fe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/es-ES/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-ES/firefox-113.0b9.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "6faccf46b02eac9ca64e0dbf4a73e0c28bfbb22c11a98c92b57e2967faabad58";
+ sha256 = "7a38fec5f08c732a1bbb70e849022a5ab2f41c9d094a4dba1eaac62c684737de";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/es-MX/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/es-MX/firefox-113.0b9.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "a9445244afc264af5fe4b5002346a0337922e1893dd2d48d061e1990bebd815f";
+ sha256 = "a7cc55ec8ceca76a64fcfadbae26e0d157826b93d9e362f8d7b34a238697c968";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/et/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/et/firefox-113.0b9.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "034225685aad456489a44a9099ec22a044a7e9d360da262cf86d5a39451a0af4";
+ sha256 = "aa8dddcba415d0bede1f329fb5a7a386c9240636a40a9ec10f4628c633a8e004";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/eu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/eu/firefox-113.0b9.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "ca6ac23940ec4382037b4a4eded4dbbe1693acb95831a5fc00e2017ce8fdbd5b";
+ sha256 = "217d65b47df73f798d4d7298a32e6383b3919db6f9ae4ca819950f52e584696a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/fa/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fa/firefox-113.0b9.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "974d705494078320428d090ae0031f72d2a6acdb25b9eb9bcebaca7a439d0b23";
+ sha256 = "0a82acfae52d093f7c935cd6d256b641cc094c6a96d4c0d322972889c9f12178";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ff/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ff/firefox-113.0b9.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "a14b310c0c707cd0bce8384eae06102245503662abc25c0058257208788895e7";
+ sha256 = "de6a5bb3ef1f43d1ca6cb2b6214109b079120a6b6c14435724de6004417ff186";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/fi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fi/firefox-113.0b9.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "307c35ee6515def64a9e251c3cebd463bc6c24b13092de1405535a98753fe4be";
+ sha256 = "5e12bd89e597cc74b20a0910a4dd60ae19a439b165d0bb6b3fdea2ee6fe5b41d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/fr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fr/firefox-113.0b9.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "c2f2629a15300b048caf402fa4d562d336f651a6a18fe623a0f6dbd5f679b056";
+ sha256 = "ce0bb4095fe83804be858770d56a74b264d6cc8aca24c49a60c95b1f7cc62cfa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/fur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fur/firefox-113.0b9.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "cbacdb7d7c2d7a4583449d803d968d8ddf38f8c93589d7127c79d90418286fd0";
+ sha256 = "34a0fa3fc4f96a8b9bb27f4422c631761023d626ec1920c5ef07c5d408b3fd1c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/fy-NL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/fy-NL/firefox-113.0b9.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "9a186e8cfa60299b3da75971fd3c2d9df39606cd871d8b31ea58d8f8eb3a4138";
+ sha256 = "4ec58211f6b244dd13be7f68909e8d1d178d56c73c04c8fdb5a6c246ddf9066a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ga-IE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ga-IE/firefox-113.0b9.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "e6d378c32b14f2ad2d8d449af1d5c7d2d8a6f4cade905e1a2d661c9909523960";
+ sha256 = "631ad527a31cba22ca0d0be6ef4fdcc96b446fdf591dda8f75af3c40be600796";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/gd/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gd/firefox-113.0b9.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "ac655198f738c3d4e98426ec55523ad4a72e1561a7adda5d844a2dd282c537f3";
+ sha256 = "1bdb7b1879a07800d87449b75cd7ab747ad1687923918781db8ade0b575a4faa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/gl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gl/firefox-113.0b9.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "606f45c27a0e735f78d909ba0d455258fe01582cd711442b0eba2711ffb7d59a";
+ sha256 = "7ce4889145a1f8866d6aee136e7d09c5ac9971048473b7d35ddaf0c237cb28fe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/gn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gn/firefox-113.0b9.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "4928f236bf60dbdf8edeb5e67feb51502568955f400f3fc7397203c94984f564";
+ sha256 = "d0e25dfe444962eff604b36a47e3cc9f56c939deed02b4482a47b722f39753b0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/gu-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/gu-IN/firefox-113.0b9.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "735307d42e67fe9f261ebcb8d6dacf0e42f61f300e9cf98c32ea250432f1555c";
+ sha256 = "e6094adc81217c79b84bbc23364f2ac409485c7d2021e1996b5d23356eec779f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/he/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/he/firefox-113.0b9.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "e69c30edd0dbaa7f013def86a664b9249d587f34f3acd39ca79f03f82b2393db";
+ sha256 = "98f6b432610e8dbcbeabbff7610dc6e6076842bea56bbb1ad5d9ce112be5c40f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/hi-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hi-IN/firefox-113.0b9.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "be7aff57357dd7edfb06d7c027aef25551defe14c8a731d5ef7990943b3f6657";
+ sha256 = "2107b4e3418f312f5dd09d1b8a6179221bbcaf5f701ef839f3127b776d70c07f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/hr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hr/firefox-113.0b9.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "407e181d5dde4f8b0e9c1aed7fcd8da1bda4a52839adb2723fae56dc64074e0d";
+ sha256 = "f4bc64fb075591e3e075b372389d025e2ea7ca1af160afc2e46bdc4b09ff0fa4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/hsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hsb/firefox-113.0b9.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "925841926afe7d51a1b2524c746aefaf0fe11dc870d2966d83d31fb1581e57b9";
+ sha256 = "3f7c00cfe1b323ff8381bdca377b1b3f0ac0c8aeb6c177e385e4f44eca96e018";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/hu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hu/firefox-113.0b9.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "e7ab694ae0fa9cd6938b1ab2d776edf2a30df17acde162f78de33b6b352f29e6";
+ sha256 = "d1f1f4c6083410cc217fc3e548a3c40dfc2fc115bc1ea494b0a5949a9e78b95b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/hy-AM/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/hy-AM/firefox-113.0b9.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "9e612d263cfbb2c75938857f8c6ca16aa38b4e8f9fa902772e2e2b1b0b2dd4d3";
+ sha256 = "c647bc2eb770777ee4e07afda88359dcb8a3cf1d38e1b6d1e46c37975cc45c87";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ia/firefox-113.0b9.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "00084df7281843c958824edea5364f254cec0febd03bf44c1394f50ed6a0cbe9";
+ sha256 = "1ac9ff84723602905a5ebe187c14123fd39abce581d65f3c0e8d968b7b4ae393";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/id/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/id/firefox-113.0b9.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "e9868ea3677cdad0da7428df00f41c2d7a6d890b5e6d54da6399d371a570c09c";
+ sha256 = "46334a2415d8086e24346e5771aa8dd368cf76dacd1ed9b9aa920b74da261d1e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/is/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/is/firefox-113.0b9.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "231a8843d23304693f0507df7b8469c6b6bd08a947eac93f1f69c4e9e487bfa5";
+ sha256 = "17b5e2e6478a75b071dc56b662391d6a24ff514680794274733e94d8e6810575";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/it/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/it/firefox-113.0b9.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c94519aee1ce82168831cb88dee1ec6871f01b7c688c8a5cde0f853ce57f76ee";
+ sha256 = "8707063a11c5ac39411fcd329c1a9668192d3b48828980c00e3580a0a0346e50";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ja/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ja/firefox-113.0b9.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "bea3afeb1156b7743dba2e53eeca6776544cf1df6fe9df2ebd346adaab11a58e";
+ sha256 = "0baddc68befe585499ae4259ba34f07d43b46e3d07635619a08376b329f0d6d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ka/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ka/firefox-113.0b9.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "92946165ddeae4d2bd630839ef0586498cd87d24085362a98dd3b53acd23cca8";
+ sha256 = "39e59405284faed2300122a8e92511f236c686f05ddbc6b45b40d8f7fe5fd1c4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/kab/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kab/firefox-113.0b9.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "5c950ecbc8f6c33fae46f123725cbfb4923d1a64300aee62faffe2cc646bca54";
+ sha256 = "cebd5ee8dbd6ae616b58557e23e2eb5e813b05c9c149b75b36c325a8850605bd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/kk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kk/firefox-113.0b9.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "ab6b432b3b163b3d0422f2369a67676003e7b4deaebe76ea86ac14022ee99618";
+ sha256 = "c0619d389877fbfacd26598670d6c032b91cba51646fe76f6946c7fc2577a9c4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/km/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/km/firefox-113.0b9.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "86428e0f0aeb4904c7c29e54af90ba072c4acec2e4e8485c9caf860be3bcb7ea";
+ sha256 = "4341a700a433ab5890b45b9ebd89f001f8e8f6cfc803172855ee0b058cc028bc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/kn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/kn/firefox-113.0b9.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "ca73f4d509954c9a35445527a69c5d0d47875cf6307f94424ed51bc9c3ba917a";
+ sha256 = "c1be3cbafad95411d4516e9ddefb8740ffd10851c3b3f121f9fd61f17c388131";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ko/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ko/firefox-113.0b9.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "69bba62a5da1995f312e692f3c05f9538718fdeb9c3d02fb5b7c807ab35f052e";
+ sha256 = "4942dff263b2ed717f17908a92631504087feb15fe490a13e43dc03392220eb5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/lij/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lij/firefox-113.0b9.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "4e8d99986a57d5482946eae060220e0005bc4d95bf0da4c3cd707e5f58a03c5b";
+ sha256 = "9c107846073b08a01d4e19f6574b74c99621ce2f4aa4043b5953b345780e4ad5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/lt/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lt/firefox-113.0b9.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "60ad6de0d423568454de600b90890b040c024a51d2b51eba0d09c6d754445148";
+ sha256 = "a9bff97829a95030c400a1d8514a897f74aa63b96dd7051f3fb2eb3c895359eb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/lv/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/lv/firefox-113.0b9.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "160b9432b3cea0db06d8a2baac55777d05aa5b9a31a1fc6587262895cf9233b2";
+ sha256 = "5770ddbb810b333b3b5ded1854ff6376b502f649d57e64dc048b70b99fdbe3ec";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/mk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/mk/firefox-113.0b9.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "91dfcd69c383631c86906a01c89d929e1e7cc3514527c6492675d4109a8154ca";
+ sha256 = "eaf55390ed8822a843a8c97ef8e547ce53eac54cd7fdb9e78f053bc19f85baef";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/mr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/mr/firefox-113.0b9.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "9b55606492b94540e168f62f7f4480863410979030f391b776a27c4e9f1b9b0a";
+ sha256 = "f5e8d195249bb42a2682094605a5b7b66a46bd61ae4ed67d9df90ac585a79b35";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ms/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ms/firefox-113.0b9.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "75f46a267f2b78f8b25867596f8a3b9c950a834dd1b34e49155f364cdadb7f83";
+ sha256 = "4479fd63269baef0ba699b84a9b013d4f031e1e5aaa704a11ef7557ab3415912";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/my/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/my/firefox-113.0b9.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "3aa2d313e43c296a0b965e7f7558a6edfe3a979dabdb8219df72a277715dd36d";
+ sha256 = "ae3b67a285edca870119241473efebf988b81878604b8058eb5a73736498ccb8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/nb-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nb-NO/firefox-113.0b9.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "0825f596c96bb4e21fa4eef7aab3af28e26c3278ceffd86d03e36f410f23c548";
+ sha256 = "2283581a00763630f7bd40a4577a5a56e07cabf97d4a5e3606d36c27688f0ea1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ne-NP/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ne-NP/firefox-113.0b9.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "d3e0da616c813daba18e7925a298459568b672f6e2036386f3586dc0a9367681";
+ sha256 = "2b3b89118cfbecd733014097df6020a80c74b58150b4ea4a1c7d2ef9b4aa155c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/nl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nl/firefox-113.0b9.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "48abc93fa80dc7eac44abd59808ad9b4ad0dd749ace3d9099bf8c880d971e9d6";
+ sha256 = "e61a1968d98f46f4f0c281988e74f2c5fe0eab540cf2ea71b962edb361ed6350";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/nn-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/nn-NO/firefox-113.0b9.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "dca656673d88ec5d8357c8015a4450933410d5df583b8a640aada866c87c0a13";
+ sha256 = "a978a22d160132a85ef37841b5ef1cc6c80718955b3e5c48a915b2359004e916";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/oc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/oc/firefox-113.0b9.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "81d5cb390b84aade67cc19e3a0de280a7d2535dbf785cbfd7ddf48dec0600332";
+ sha256 = "04a8ac538bd4098787220f03ca5395e0dcf423c133454ed7749067233142bcc8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/pa-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pa-IN/firefox-113.0b9.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "a0c284e96d18a1ba1c7368265691da61301ca4f50c2e1e0e627a7efc4a888b1f";
+ sha256 = "73a40acaecaa68eb26bbe44208bb484af4b67e330636015c776984d76b343ca6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/pl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pl/firefox-113.0b9.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "ed1c17add82a3c8e718ec3c4c001e74b89ad6783a877a320f7c0d4fc0b59b637";
+ sha256 = "2b5e57e69f43d8825494ee01706d3667d48ed0a8c3bcf25ee2472e38053016fb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/pt-BR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pt-BR/firefox-113.0b9.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "ad6e81cc096117fb7dcb13aedd7b478076d401334294ab3432f5dc5e7301bc4b";
+ sha256 = "3696d7871e564e6b2c59ce8e915617b9025162c836f9e6d5b2a885a3478cc79c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/pt-PT/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/pt-PT/firefox-113.0b9.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "66b5f05e316fdcff6b6311650ee1ca575dc857174c7a69a8f00cfb7a543857fd";
+ sha256 = "e7ee84ad6408322cd470328b3b1bf961337b881080640fcf7ed3bca8ad9de0ea";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/rm/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/rm/firefox-113.0b9.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "0a60fa14df631b8ad5ab93cd29b6d9d80325c581765b1206bdef6ed2cf294575";
+ sha256 = "fe7d553569681797f10a335a2d67ed94e82ff50823d9619937286e2e44b567f9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ro/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ro/firefox-113.0b9.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "99b4d0a7a329f44b5c97ac8fdb0d23e20b93fa938f5a398b356436ea11879348";
+ sha256 = "50a46f459e482ba86d2b72e2373a5ca8a2865cd1b7f0b5980136fb3423ee497f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ru/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ru/firefox-113.0b9.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "440e1bdf4c385acc9d82a7cd51642f6915c3f3d0168227f967acffab5101bfc8";
+ sha256 = "31977766a98e481529db4e0bb128fa60ede8be5b06663618e2ec3e4299a5fb55";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sc/firefox-113.0b9.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "2128ae7c222c3d30c80840281917645ca9a9d925eb71d10e5254ee4604538db3";
+ sha256 = "30a768e77431bcd6c2fec5d5a16c410f2010f00d2b04d2c94db2feb4a1633396";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sco/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sco/firefox-113.0b9.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "c4d32b4a961a0a6df1a2fb56c55cff1f4bf64a010c8f8a032beb1e6ecb28eadb";
+ sha256 = "0c2e876b3f617fcaf3cb94465906756e554ffcb62cab625a8fcf97288c2051f2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/si/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/si/firefox-113.0b9.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "7ac3992fac1ee7c11a461d834dcb8d7dfb3fd73787b2ec3e78378d4d6449eaab";
+ sha256 = "e4d79bda02cb18c61f12e998fa40f538b032f2f402a892d5b533790ce3a124b4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sk/firefox-113.0b9.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "5ec27a162a2d08030dee7b6e0ca425ae18df436f05a0e1341bc1558a5b6b5567";
+ sha256 = "b4363288ac3deb13d4c4e4894ba36f13bad1908997d749d8520b827e9312d1a7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sl/firefox-113.0b9.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "46abdc79f08ac80a7e39744c1072d220da3f1cac13d0976b63cdb270eea4041d";
+ sha256 = "22e5c04f8d413d49e9f197a84355a3d11811b3200c3255509bd524274bb81f45";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/son/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/son/firefox-113.0b9.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "9625fc87c1d5b149ef5c7569860bac3cbd949af60fc361541ebea1bdd71ec252";
+ sha256 = "b5ced74c0fd3673fe61a9092ba2371786daf270cf51a06e6c15c3fa393652f4d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sq/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sq/firefox-113.0b9.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "102b9c55b92a496d675f6a81189c478e950cd4463e6f1d40c285e08d63add7dc";
+ sha256 = "ec64341c7a3924d9eea619e04e5c174c6284cdcc22f109d30b74876cbca85494";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sr/firefox-113.0b9.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "60f6228683899cc014d7b7ca45859f68e2614e749a12b6c0102750125fe97b12";
+ sha256 = "be2f248866ab9b5618d31b993246e5733c8165339777f308d035e9b61e0d2ff4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/sv-SE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/sv-SE/firefox-113.0b9.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "a47a098f0ff5e453619fa9cf64da42c6f275a6b730c3f1a13b6ca3701b4226dc";
+ sha256 = "09f94a1715d17bd9aca19131ec1da0ad50f47ef8a2915a27b370551ad9ac5ba2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/szl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/szl/firefox-113.0b9.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "7c9ccf7499edad29049c01bd1e0ae210a010d8593e3387e7112ace7dd704530e";
+ sha256 = "4ed3db1e8c2158d71c31dd5c6b25f49be047be50cdb27e5e62da8f66b12c1620";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ta/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ta/firefox-113.0b9.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "f24bf63835bc49f47138cb1625e24e414c83b8045b6e1761926966015c91f942";
+ sha256 = "29d64c6358b42971fe068eebc409017afa71d7b7b0d488862f87b0a8d289574b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/te/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/te/firefox-113.0b9.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "766ffcf699160ead50f7b87eb17fd6e6c7bdf88b55a5c32c5cf9b879454739f2";
+ sha256 = "a970b11a4a984f307a4811d348636201c031347f2f23f15f3a4c3baab6027eda";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/th/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tg/firefox-113.0b9.tar.bz2";
+ locale = "tg";
+ arch = "linux-i686";
+ sha256 = "6c070ebb7bd124698f8841410f8a96bf3af450d838948429b8bd22a1b8524490";
+ }
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/th/firefox-113.0b9.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "b6b886cef3e8497af341a464b8e776f87ba8820c3ee3d408ecbf7943ae358f17";
+ sha256 = "12f4ec1dfbd83d6449bc9533753b33bd8fd901ab48b5ec8e7f00243446ad08d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/tl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tl/firefox-113.0b9.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "e6db1429e802bf36007e44f0f286ecd4f3900b599985f11a83c729a1160663b8";
+ sha256 = "58504f21137afba998250f2970e9486b3badcb201726a55c1db81b065f21acd4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/tr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/tr/firefox-113.0b9.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "db2bfc2cf8c644df3ca773ccea4f1ddd23eac5236fc9eb24176d240db4ff7544";
+ sha256 = "a597ab2ca3f2e04e6cdee195ee9c3e1ab4346182f8d11f707fe35b6e6cfd8c75";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/trs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/trs/firefox-113.0b9.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "5409112c980ec74dc459bfa7f72a0b014b563314d864fac54af7ee5d6c98e569";
+ sha256 = "28bad7892055b2ac4b0e6536cce6f580d46ecee7a23f3555c9674d7a06e0faca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/uk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/uk/firefox-113.0b9.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7a4be0b621b6ecc524c882c38f8d1097c833b3a8d5452109ffb90976a586b4a2";
+ sha256 = "30b8565e6b9c0a84c353557b4990ddc0fb6ef7c5ebcca389352d895cbb48c9d4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/ur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/ur/firefox-113.0b9.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "2b4dc07d6ff51183be77f3785d636cba98e34c2b2a3d0cd8213315f552ed8f0b";
+ sha256 = "f46b58f0879e0b2e560f37185572a8f1e73ded9c989cff14a29fe19b3be3108c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/uz/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/uz/firefox-113.0b9.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "9cb37a4268c0323f4eadf9fd615577aab6aee163ac0378fcbfdf04694d8e4638";
+ sha256 = "1b7925198bcde9df5cd473d142120c0aca49121b9567c24478c5f3b42f568500";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/vi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/vi/firefox-113.0b9.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "4d98d721f9193ec02def0d87ae9be17f461f56e4505153b1247416bd8cae3276";
+ sha256 = "b4809e5cedcaf71ea967cb6666ce53b393799c929304ad5786df7722c791791f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/xh/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/xh/firefox-113.0b9.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "6ab5df34d91eded96f9ca4d81338743f8d41e108b738a56c0782181802d2793d";
+ sha256 = "3ab444e4552b7d26ce041cf5e80265b815371cbb063db698a94cbd5c125dcabb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/zh-CN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/zh-CN/firefox-113.0b9.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "48c9b0e2947a076b1b03442a429472f6bbb8f69dacf07e4155ffb42610fa9e2d";
+ sha256 = "2285ab5184c7051cb3bf79717bc1bc54809541fc937508eb61c80f4e5791ddd4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b9/linux-i686/zh-TW/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b9/linux-i686/zh-TW/firefox-113.0b9.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "0f89adf447b3b837eecbaaef1f19533ca4761413ae4808a62ae33f779494e853";
+ sha256 = "923c6682d4ce81df5facb6aae4ba0137e9e293c8713c1db58ecaa45fe21f9403";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 40bcf49318..e83d95a939 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,1005 +1,1015 @@
{
- version = "112.0b9";
+ version = "113.0b9";
sources = [
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ach/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ach/firefox-113.0b9.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "14d3b8259d9e2d65ce5fb3c7c307cf61b8e50d9867f4e65c3a3457c989ac9d51";
+ sha256 = "dc158c80dfb28579bd80b46b8d62354a2c81aea73af2a30ced5759110e6776c3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/af/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/af/firefox-113.0b9.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "db187cbaa5a1018d7dc62d95d36277ef717268cf15d1185d8584563819951d68";
+ sha256 = "4b3d114bca0fafa66c86f150e488a5cae0572e87a7fab84767b6714117fceef9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/an/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/an/firefox-113.0b9.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "b812dc045e28bc3e046ab1b2b4baacc9ebd07bd98718bc94f004e6de0bb162a3";
+ sha256 = "2b3b4c3f326e9f58c74b675c6a548b31378800a9eebfc26af4ade435776f94dc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ar/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ar/firefox-113.0b9.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "c52824da48b5aae83cdfe9eed6ea5a62ce1bfd8258e2a9915f25bcca2cecf7f5";
+ sha256 = "e74d601ee67c9b81ab1b4d81cf4f9be9c27511c9b457796b8a2e113a0f46a39f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ast/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ast/firefox-113.0b9.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "d7fecf9e053c1b13ed0fae47ed320b7ff18013406d0240f4cc75f40a31bb28cb";
+ sha256 = "6b4534f7b2c33acd75c5d1c55820e5b45d12cf3fc0e72a719eed8e6978980bfa";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/az/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/az/firefox-113.0b9.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "f9f47b7889ea53be84577b12434f76c172e4e5775db4e03eb0b817f2dae0ba7b";
+ sha256 = "034b019553be4b94c3aba4db466e46e68469a127bf69cc88aaeb886191b3dbef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/be/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/be/firefox-113.0b9.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "c901627a339c44e8e16621aa707c781e4fa1743d48aa8df5df9fc5d738397e3f";
+ sha256 = "b303e3975fc9daafde7aa4e3e9d516857c8493fe6a76de4fbf9c02c19a3f040a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/bg/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bg/firefox-113.0b9.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "c3edcfc6827b73d176da28ad07a97c89b081c791dabbab516d854dde49b43003";
+ sha256 = "c2f0d3ab18c11e1ce8468025b2454a8eb8cc2730eddcd7d2d385625f9496339e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/bn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bn/firefox-113.0b9.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "fc533e2add5f4db8517148e611214a6398247830f475ccb42b90c74d31035880";
+ sha256 = "4d34adf3b2a579503de8abd5462a562d0b62e2605f04813a6a88be1b64935c3c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/br/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/br/firefox-113.0b9.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "fb490a436e4f12d82cf15341bbd3d97916ef504010fa73173e8ca73cf4001de4";
+ sha256 = "f5474ef7f1b0983a25da0bca716dab3056f4892c05c71620b055fe523f762764";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/bs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/bs/firefox-113.0b9.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "65dc7a81916e4ca1a76cdb49647facb4608810f95355b759dadbae2e5642330b";
+ sha256 = "b18c3715cd10a4913a33e2deb1270a2df69a2674148aebadbc007699445bba8e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ca-valencia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ca-valencia/firefox-113.0b9.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "3457074d65ddf6e8daf940a48658658b8fdeba1fe20adcd609a19d5cc0146252";
+ sha256 = "f9f09f77cf0e2785ce6fd143191c07d4138aaefaae5763858086efbc6ae1cd85";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ca/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ca/firefox-113.0b9.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "7338285adc5bcee541f9a607ffa1432d599f3f1539ff79d450b7146cf85fdf0c";
+ sha256 = "d807facc456fa1a249558e11bd36ac95f739474ef77cbfadd80b8cd47e70bd3e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/cak/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cak/firefox-113.0b9.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "dcaf4a9cbf4a7fb5be413848e6b839adad6e9d7529225dcae53362cd3cdb5b6b";
+ sha256 = "261947d078bf41063848734e92f88452299eb53122924a767350fb4b74ee9bf7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/cs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cs/firefox-113.0b9.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "d8a9209917d7f6fd4f1bff1772590335c179cf352d92229e1559a8ff6b40ed5f";
+ sha256 = "836d10d1f45b748dad92e9fd01d0f45b42bd2378fd89f00681192f663e5c12d4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/cy/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/cy/firefox-113.0b9.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "e0ae7beba555b6a205251ba304fed23c527c83f9b27a7b6986f5530a62c08deb";
+ sha256 = "bf688d5c5a3dfc7d0ca63f2482fd8a06c2633fcba5a031466d9ba76c328094ad";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/da/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/da/firefox-113.0b9.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "b7846920f2620e7d42d949574e55444bf971cc145e494e2a5ca763cac0544e38";
+ sha256 = "3e60d481bc4e68a507eb3f0f6d38dd8ee7d1934364a4d800b44d62b03c9e199e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/de/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/de/firefox-113.0b9.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "e66b5305871ef8ee1be9be91ea198102e468a9c79eecbb326695bf92d5de0d86";
+ sha256 = "a09a75e2132c73ddf22b52b75b2b8236fd09c401705ba56f658b85848504125e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/dsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/dsb/firefox-113.0b9.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "47a6c4879c3a20ce467a1797cd675f82345cf99f537e5a0151d7d99aa83d930c";
+ sha256 = "68ba26f1fb9255abcf42f18864c5c0681ca62a0f2cbd8b5eb00c8687a803aff7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/el/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/el/firefox-113.0b9.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "52b1d2988ea3f5e736736c2993c254ce8463a089353d9f6b67aeb7934025f48b";
+ sha256 = "5b1b4e392b0e33cbf16a0c9cbc5612b69631b725958f97d47522bf158d7c3aa0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/en-CA/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-CA/firefox-113.0b9.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "c2d13c20543b2e264de0b6a8ddf00abb81f9990f5c8d845bf49b8faf760be384";
+ sha256 = "4040dd3f61156946d63890fe5b3db550cf128d61cd66c51113bed3b4d31eebe3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/en-GB/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-GB/firefox-113.0b9.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "61f3679a3b366ca493dd9edf20e3706659caab11ac6a7d9a66f7b4d6f9eab1ee";
+ sha256 = "48db3df2408151d2ef7ea2e6d02b265348a5a6f91e7cb7918169aa1631bbfe17";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/en-US/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/en-US/firefox-113.0b9.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "c20b68a2391eea7bb3a46da86d4d3bf79cf73026b84b87555c46306e85278ef1";
+ sha256 = "66f54b02162ba597892efef36f95659431e04aa4b866fa1396132d63d1163912";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/eo/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/eo/firefox-113.0b9.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "923be915a414e0ff79e281455de59595c2913b4050d290d070f64c8cb93f62ac";
+ sha256 = "885a1169a2bc3a753da283032599f9e3280b9f44fbc1a5cdc8e12a770f85658a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/es-AR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-AR/firefox-113.0b9.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "00eb3cc8a00d6b4dd1603471f295942d1c8c26cec51ba515cfff41cd02d81596";
+ sha256 = "d7f02d814e3912564078a8388bf18cf5ddda223ec15b0c2f8ff2f94ff00111b8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/es-CL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-CL/firefox-113.0b9.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "cde98bd8189c8339d5e18e36247beb1d476acde5d883329bd345813bf626d8d0";
+ sha256 = "83614e8db3ab6c25b264f339c968a3334af2d29c1a041b3f6aedfe6b5f5963c4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/es-ES/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-ES/firefox-113.0b9.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "25d8cfd0c5118a744349d6498c3a4ec53f6e963bb105706ebd2a15397dee5104";
+ sha256 = "63f25742b4d9a8584f097f2a76f86b50245ff09c738607b4fcd85f3cef02aadc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/es-MX/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/es-MX/firefox-113.0b9.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "fa60ad1c352522597e1ff036d6dd5d6041820076386de6491e48fb90e72cd29d";
+ sha256 = "e39d75851cfa7a512f5f2aba69679212afa60a22709edd787e560b51ea60bac4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/et/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/et/firefox-113.0b9.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "5e3b4dc30fd2d2c475ace1cf5a070a07b93e284ddf62146ff3cb6a185abc4305";
+ sha256 = "ad77319e455dcd6678b43c21979504f4e1de4a3c1f5f3492b1157d3112ab242f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/eu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/eu/firefox-113.0b9.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "a14a0c0c801881f9bd5ab1cf3d872931401a05cf179893c58fb06bb10719ac73";
+ sha256 = "3d4c2ba8839c41d272dbccaa74285ffd62f8fdeeb4c4f40b502b0126a7d04a39";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/fa/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fa/firefox-113.0b9.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "30eb43d6430689134807be057bbd8b88be1a5226a22886a71bd6ec457c2dd1cb";
+ sha256 = "f38c309d7ac3f942bfdd16387c3dc70ee27c966236022e1a558b8ab5b4d8059f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ff/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ff/firefox-113.0b9.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "78bdd7b220d43fd09e1ac785651f762f5dfd22d797fab41bc484f1593f3be99e";
+ sha256 = "ca85c752fc7cf4f6cd4baa2b56104bdbd772f823bfdd5731349c6234dc146fa7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/fi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fi/firefox-113.0b9.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "e302d1ca154ef7cb8f03d9a08558cdea6f0c5a81ba73cd5fa140c26f5aa66275";
+ sha256 = "074b519d3907b03cf22c464e7a888ba12a2e2a3169aba859261dc5f7c1276fac";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/fr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fr/firefox-113.0b9.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "740e37ad6c1adcbf26839ba98390ca48dc36cfa8a781ef5ef6efebfa343b9c7f";
+ sha256 = "f6a92462940fc5386335b6f477f49b20c703e58505c5a43ee2fd9bb04cc33e3b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/fur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fur/firefox-113.0b9.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "6c551c21b3197931f855d203569fc48ed88135674039b4dace90466397014e28";
+ sha256 = "884ba026f976c6776520d4536daa91553fea6f759c3c56f0bd884391ea4573fc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/fy-NL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/fy-NL/firefox-113.0b9.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "d5ea3dc8a420f4b1ce431e31ab960648c8db4d5757c481ca85b57e3280e05b4e";
+ sha256 = "eea6e15f026894eda457c8900a24b057fe32960f56b39d28719e65cb43d6ee17";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ga-IE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ga-IE/firefox-113.0b9.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "35cee6f755d1161201106bcda6bc74bd2cc5b7e4ab800d8ccb9ac3395a262053";
+ sha256 = "9ca4d3e4b0022192ec2c028d4741164935f0b31444fec7b43edbd21a265d583a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/gd/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gd/firefox-113.0b9.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "9ea267696100d481baa754d9e9e4968316630237ad7d71f864203eea5a21f513";
+ sha256 = "5c70bf5c25611db71ee9ac8cb6cebd16ce8564f7acfaf7b9bc83a7ed5063b9fd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/gl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gl/firefox-113.0b9.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "577b34e526da0107f362432854a1ee18c40e97e9e27e061b023d07da9863d04a";
+ sha256 = "d2a6da38ba64866f51ef98926e7199a41b857d983f836c9c14315ccfbec6b530";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/gn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gn/firefox-113.0b9.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "3a79deb8f9557553b9ef17e78b8315d789cf87eb9c905c53ca079a03e009dd0f";
+ sha256 = "190c68400b1bab7b6540125d3d8fcb933e259e5a0fdb22d0c9125855e32c39e3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/gu-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/gu-IN/firefox-113.0b9.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "9e4d46b7dcfd4f01ebd61ab4400854efe7c4c6ae801acb0bbde7c5e4c828de06";
+ sha256 = "f7f83aa3d17aba4aa3f5ea7aa23f16ebcae174fc49f5139c87f93cb807f49091";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/he/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/he/firefox-113.0b9.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "83b5a933dffd7f82ae11c8da27d023ed95a10646aa78090b1ae98b860a2456e4";
+ sha256 = "b24374cd20a154d15dd95aee939d92637281cecead79bfc88aa65a6246df79b5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/hi-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hi-IN/firefox-113.0b9.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "c70d1edfc326b21557e1b9b286533a326c593fa4cac20741a6fd74bbf198a9de";
+ sha256 = "cdce840c3ddec26d3717a2a2bae0de2b1d0cd392941027c7711a449197b6b8b5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/hr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hr/firefox-113.0b9.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "3c0269b9b2b7ef327b5ec0b09b5a9467a0259b12149b8ca79156eed5eed69bf3";
+ sha256 = "e5fc4f632968891df4e91c8a211dc54501f4660b6ce6062df338f2c9c474de33";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/hsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hsb/firefox-113.0b9.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "389e8dba95fbf251c8dd5285b8ddd0968ae776828f85f048a8fea419e301e937";
+ sha256 = "4bc5f354353a4530303f9fb3c8c6077721c95c775044f4c3866fd6740cc73267";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/hu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hu/firefox-113.0b9.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "8f42deca7e0e9e31db669367c849fc0743b8db3b7e1aeca97808df35c5e00599";
+ sha256 = "fbfe193897a394358d420fb54ff6505a50657a3f90e8cc90fa42a6f777c8b601";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/hy-AM/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/hy-AM/firefox-113.0b9.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "f8e85f74e3c000ef8c130686f7ca82844040efc24110b5007f9ea452a4d31d8e";
+ sha256 = "ef54df1e984d57b17e31246b9d2390013b13bdbb5c6fa9f7d96c05c8df870b95";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ia/firefox-113.0b9.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "77830f9c1c83ede9eeb4ffc5167bdd9b12e14573523d7f81eb92ad41f66d6d1d";
+ sha256 = "d08fd66c7c77f987377a99f65b90459a834cf3d049788aa16f4aa1dfcfb68bbc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/id/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/id/firefox-113.0b9.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "9fdfd3398294ae12a73948bdc7a49e781c459273d0213cfa43d01da5a0f8b8f5";
+ sha256 = "ac5a8ea463c8f6fd2ae095a0ef654f840571167e296a2ffb3e0da5aa86e43c3d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/is/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/is/firefox-113.0b9.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "acf9556611d9227c833daec3b1c77f460aac9856a0a77a599e3aa50eca71ef5f";
+ sha256 = "c023abbc95d09a970f392524b074db72b3f42bccf1da69e9893ef22a35bd9f1d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/it/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/it/firefox-113.0b9.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "b9f0f22523e1b702e589f9cde4301545cb8ed21b31121db87ccd1202eb0b0f4d";
+ sha256 = "ff02a3a5e533d1ce1f3ac42f731ca914ea50cf467f0d7cff4e011a9f6825a7ae";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ja/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ja/firefox-113.0b9.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "242fcd51d46fba53ff5677dc6fa82f2d9f60b2a0aafce7cd8a9c616006ce1689";
+ sha256 = "b322e8c691cb26ed46eb9e50c4d337094dd1b75f38905f7f4557555a835e067e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ka/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ka/firefox-113.0b9.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "7d43d33b89ae777f8b1fa0bc8952bb32d09e0c7daea455ae22c1019b6bd5a227";
+ sha256 = "1fe5183b36d952188df64859b2886ef87ba5ebdb35d907df709ca12d10709e1d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/kab/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kab/firefox-113.0b9.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "baa1eba4754b306595f24481d8ace5081a75014e77fba7a002369f36fff52581";
+ sha256 = "36e373026ae27b4eedf51a0a1a5dafed61daaa50fb03911669624649cd65d6f5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/kk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kk/firefox-113.0b9.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b7c3de9101bfb0347cc37f8e005082e452ff05befbf739c7556b2625233f44ea";
+ sha256 = "17131c348b2006bf55ed0911fd80c9885a54737b1e18d98e0165a159f5d5b73a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/km/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/km/firefox-113.0b9.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "7ad924897d632113c8ae216ecf5bb4e100a9e9f8e3e3723ae5dd89f8b92a5a14";
+ sha256 = "7c846566b8998799cf3ea7401a7a00afb3a2ccbdf52e6ccde58d8e0c3654db00";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/kn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/kn/firefox-113.0b9.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "fe2d436265c88188dad970809ae0010c98443c3368015954be84719607c5ef08";
+ sha256 = "fe8536512affd2aa546e00f0f2893df16ed1722b37bebd3f8cdf7a2b112cbafb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ko/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ko/firefox-113.0b9.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "1ce08126d751fdf3e06ee8a2b488d6a78b5a2fb5254e98d861e9ff6f6095e00c";
+ sha256 = "4c9e9356a0e32fe5d765312f715ccda7abb9faf85d5bc06cc6f42ed41242120d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/lij/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lij/firefox-113.0b9.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "f96c104e826680d2c8796c9dfb4ee9171b99164ed8c8b3b3257e461073c0dad7";
+ sha256 = "c3e65cd5f3a7adf595b53d4fab3ee482c019f9908bbeb003c3eba83945342edb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/lt/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lt/firefox-113.0b9.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "3a9890426d2054d191c981dffc289bb71111704aa121eb9cfb9fd8702f287362";
+ sha256 = "dede6788ceb5b9ff42d4342e1c117e11fc889dec62433aec2c8d14be2395234c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/lv/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/lv/firefox-113.0b9.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "52f607cc06ca3b3a7b8ffd5ba3451009669b54b4ea80aa51e22f3b28522b7c63";
+ sha256 = "e19539da8f21b3055ad6da06c345a80055a2f4705d469a40e026db2b5e4d2c8e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/mk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/mk/firefox-113.0b9.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "81c53806597904fa1eca2373d0624e0705643e9be209d7332d9b45267e89d3b3";
+ sha256 = "bb33b7878dc76e2be2a3d45bd86d6bfadc5b9134be9bb7750fd78eccbcad8ab5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/mr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/mr/firefox-113.0b9.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "6c691e4a1a59821aca8fb7296346e44952f86f819bafa34a81fce6a1a50675e9";
+ sha256 = "bbd907c7deef8438b05aebd0aef2d6062b4fcf366fa55a7f82e1a390ff69b682";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ms/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ms/firefox-113.0b9.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "a1cbe33f591edbafb8ffd788bcfdca57e0aadbc72b25c53c90321b3cb85973e4";
+ sha256 = "fc1f88e708dfbcdd7e3d3ebddd649fe94eb85f4874489b84449ed0f3e02ae6c9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/my/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/my/firefox-113.0b9.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "aafdf40d468a0fbe3963c0c209536e48cff38e9f04f109a3074c03f54f2651de";
+ sha256 = "113e5e2b07882ab425967fe926c4c61e95d6a3b7f160fa49a72c0e34447400d5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/nb-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nb-NO/firefox-113.0b9.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "f191a4d2f2c16eff77b8e1bc0b62dcd73853ddf7be2e37f1c02cd579c549c882";
+ sha256 = "6f808c9d3293d237bff3225c21c4de755c0a2a1edb7330426c6db99cc91e953d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ne-NP/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ne-NP/firefox-113.0b9.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "bd77efa143cde29fa0a612c0c4abc88e9cb6d4b200d325a8c96c982d87605461";
+ sha256 = "6199ea26291bea5d10bd17d43b1abf2f74ef96513929c655edbee527b931467e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/nl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nl/firefox-113.0b9.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "7da465a94a0b5473d8a8eaa19223c83aec2e93f0cd82d70c8c7cb3edf6a26a30";
+ sha256 = "38f7ee12715ba235f15596ed5a2be984768ae15aae30d850813210ff1c9985fc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/nn-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/nn-NO/firefox-113.0b9.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "d821d00911c5bfab3dd59a10293a8b855329d66ecf492d97927e03aaba5db94b";
+ sha256 = "1234343fc68003f5bc1114fca1271d0b278363cbfb39c7372acc70005b4ad3f8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/oc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/oc/firefox-113.0b9.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "0a1f1f543ad9fdd4db3649cf6d5ac4e4d3547305d0d9eda25ffc9e654b0455e4";
+ sha256 = "834b66efe98f3ba9435622680c7d90395aa993f9ff6329640a3212816c29a8ef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/pa-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pa-IN/firefox-113.0b9.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "8204c629b42dd8cc160f9c06162164a3e73d223fe934d3104815d667af379e83";
+ sha256 = "858f4e2d5deb533116bdb9c6bee089139075425e81bd96e98e34d33888d768b8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/pl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pl/firefox-113.0b9.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "3b8d9f7149b52859525d10f86df56974b13edbd5c2a9400f2ba118b25388d6cd";
+ sha256 = "df6e50d5c6e4fa31277e9b855ad64d1efdc2dca13fe0f1f529aa69118e7522dd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/pt-BR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pt-BR/firefox-113.0b9.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "5f9457aef6112f2d8aeb41a46048e6e66022e70f5ed94b25abcecb1d4ed59243";
+ sha256 = "2311eed3044e6defded8f894273b66263f7603404f541f1869687275af3063f1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/pt-PT/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/pt-PT/firefox-113.0b9.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "6e71242cb5b53c1819748af4c5b46376bac8461b1e44431aea4bb5e27f6fc36e";
+ sha256 = "6a3b14908ddc79d2a420c9523814ff000dd1465fffbed457756ccbff870d7dcd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/rm/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/rm/firefox-113.0b9.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "0a40ec006f769549d11bb03dedcb9cba6d63223c59730fd7b1a3d9439ddedc48";
+ sha256 = "e533e996e3e885cd79299effc46978f01cb797c37dc0fe9a37d0b363a18e5d08";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ro/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ro/firefox-113.0b9.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "a67633dab6822d72db5ddce84be42095cf74bf279552b96c9fb1693d30a46043";
+ sha256 = "d8e7e40ce30982c36409144bb694e0243be3077ec94a1589fef147ee2632b007";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ru/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ru/firefox-113.0b9.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "bf9a714ab7f07d781fd7cd3437f60f86494a21e5c7b437980977550df9da9b06";
+ sha256 = "d6ac06d4f6676992762bff826163aef256248544e9fefe734f7b897ae26f4040";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sc/firefox-113.0b9.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "0ccb2114341dc8126fb5eeabe247f428f98e7b4a497813d3452f1fd5ecad2524";
+ sha256 = "2be13f4aa18045adbf754c90a9831e24f0ba8aebf8506d5858eab7321e1139c9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sco/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sco/firefox-113.0b9.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "f55281f7d574ac9e89d1bdfcf1616b61d0aa56283e7d89824c47264a9e790cff";
+ sha256 = "4bd83c6eb8961e8bd01ad7be1a7b92332c85ca63e55605200f84188c93944194";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/si/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/si/firefox-113.0b9.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "d9c0c625b2f9b2bd4c0efb63342baecde07c24b20501df4069e1bcbac4d759ef";
+ sha256 = "3fcba136823af21cce1f9202459b2bef5b59ef9a8b296d9f629a82b2c4de1ff1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sk/firefox-113.0b9.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "f5ed9cd87b43380c417fcb0a245530daf5dc9b4bf4cd246ec4228d4bc37b5c6b";
+ sha256 = "c60e30874e70b5de14ea02e082849c9a052bef59144fd0fbe7ed63b1e8cfe4a8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sl/firefox-113.0b9.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "b91d7c6b54dac7e4759d1f6c5cb906e5e13bd5592eb92ba10b01fcd0c9aab99d";
+ sha256 = "9e808e99b0e432f22b88a6546ad78e8563fe1d785526965dc2ed87d94619a7b0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/son/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/son/firefox-113.0b9.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "10bfbf7229849a83a31a0a55e8bcfe366c33028e92af765ac5340e18013a8445";
+ sha256 = "14599ebbafc8009b9b969d4d5702a246c47a6f65c6c8148f26a208facf6a5d43";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sq/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sq/firefox-113.0b9.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "18ef58367831aa47b9d8697842c333e3381c125ac734dbfb68b1a8c2a561492d";
+ sha256 = "84310939a31cf602fc7d6f82273c2b920ce8bf6b0ef8f903eb9c645be399e3c3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sr/firefox-113.0b9.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "1ace53e69f0bd453f0400d01cfbbfbbf34e5cefae1555d383b8acbf309bdca10";
+ sha256 = "9a2f954a761da871f6a7d682bebdcc7de2681dcbba131cda9d91314621b2e94e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/sv-SE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/sv-SE/firefox-113.0b9.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "56065d1d5ff2be2c39e825c74f603e7d98ac4db60b94a409206a5b24f4fe2dd4";
+ sha256 = "6779b71ff0fdbea59e17eb1aea8ce79d2d2c80e8590531e28b4f5ae28398d565";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/szl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/szl/firefox-113.0b9.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "2aee3f428565748ba1ac1000f9b4514bc45d75feb46c63ac5408af8666941364";
+ sha256 = "6addcfaed240205a7e2c16c6b6ada8c3c445bc2fcb28565c4478570c0f089888";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ta/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ta/firefox-113.0b9.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "40527cf34c10283c2c9adb20e56d2f69aeaf80dc1ea3999f4e36aee1d5343677";
+ sha256 = "f9fff731b6db4d6acc8fc5d5ccdbb4c90159671663e80c8e554e184574015997";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/te/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/te/firefox-113.0b9.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "1a08ef30a532bad9cc25c3aa22214a29b65da98e817068ddef2d0dbf792babb9";
+ sha256 = "6f6eff9dd081de53df633f7a401699cb9fd927a5030feeae11b6c0d2e270f9b8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/th/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tg/firefox-113.0b9.tar.bz2";
+ locale = "tg";
+ arch = "linux-x86_64";
+ sha256 = "0f1ec7c79b3460bd7d25dcf8bfa74eae045f17f688e6e83a67280e6f92dabb56";
+ }
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/th/firefox-113.0b9.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "8297b3c16acde1d61ddf55bb9eda8146fcfb3dfea7c922ac2e82c968cb55ac3c";
+ sha256 = "498e9a15309a0fdbac652615540376a3ac9d70295af53adad3687b5b9009296c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/tl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tl/firefox-113.0b9.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "a8619906c9d94af9644c9bedd16ecb1cd0a324e2e0c142750934b3664f1c7b43";
+ sha256 = "9e437dff7b57715e79168608fd91ce7fc1d0e8d31122a4ab7d2a17e79057c018";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/tr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/tr/firefox-113.0b9.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "ad62288f0872a13baf8ed870cd3ba377433f054c72f476d75cfa6960ab68afa5";
+ sha256 = "973142b4a841da422afb6771e547262a331477751c4666aed148cb8f116c13ea";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/trs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/trs/firefox-113.0b9.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "eb94693acccfce8c2bfcf0bdf113fe6581b7c29e76c0f4c37a06a8846621d917";
+ sha256 = "5bd086122aaf39cc3ad5cf9ff41336c759d23983ea677c0e726113d1e86e2444";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/uk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/uk/firefox-113.0b9.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "7bba087cae9bbe38838186cae5a3377389f23e595eac83e6cf6f1f3ea85df577";
+ sha256 = "d4cd3fd8e213cb6273d5f7cb42368248312f2e4134fde1ecde5f3a03ddc7fd76";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/ur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/ur/firefox-113.0b9.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "8d922fd02396ae63f92000256df30366e5407dff5b9a220d8ce2fc36fae923e5";
+ sha256 = "67f321fa03554b7631cd0c6a8eb25eb3166f0921f9b392b6cb8134c96d6b94c5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/uz/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/uz/firefox-113.0b9.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "8c697b389c3012a656368d6386c048d3d72abb8386d873825b4c9e71bf5224b4";
+ sha256 = "b8a3587e2f6f567fd4955ca151fcc853fea384595b789c2fdeb3e7bd431615ca";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/vi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/vi/firefox-113.0b9.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "c3e1358a053978a889b5fed9e25d6d9ab12c6a3f911b5b2e71dee4300a051095";
+ sha256 = "04066efe6339f9cf2827d68ca1cb8911a1123139f3a8ec5f01f015b6b5c4b59d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/xh/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/xh/firefox-113.0b9.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "b3f990841a9724385fcb20bb3e3cf44dd0ff89a10b63c8410c0b1671df488edf";
+ sha256 = "fec6211b12e25ee8bdec8535b3bac3190dacee8e6c584295f5fdedbbb9d8855b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/zh-CN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/zh-CN/firefox-113.0b9.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "0ce22e1bf397ebfc6275e1140c0d9dce5bb76f5221f6944d8a86e003151f86bc";
+ sha256 = "9f786ae66b71ce4d7c82d2095ffa616fe477b167fa852b539db07e048ccbfd03";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-x86_64/zh-TW/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-x86_64/zh-TW/firefox-113.0b9.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "a614632f44a397e0dc96dce09ad9995ceb7b8bbaf7c4ec22199e65507d81b351";
+ sha256 = "6b6c68dea0abf84a6d20215fe790f7a4cfa07abb2d4f320f65c84e97bcbfa3fb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ach/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ach/firefox-113.0b9.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "dbeee7bee78c5f80672362c571835fa60de87e187b14fd0bb6eea798fc11df12";
+ sha256 = "7b5db17cbb53b58c24abb3b4b1c94e580467a58aae4fee79816b142baac92d9a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/af/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/af/firefox-113.0b9.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "a66c2f01f1a70cac06c6d8bfbeae915f83f99b42cff642f2230ba1b63125e7b6";
+ sha256 = "fdd1b627624168a882086e1061c1bf0b424fc3b3673f61bf4c8b64728e1cbb36";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/an/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/an/firefox-113.0b9.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "d1c11274d71ccc60740667e69f7fb32b7d28fc9931dec4c34257ddfc1cd3709a";
+ sha256 = "12f9fa21c13ee636712d2df268a7a030580b08485067f00aa8845d057aa25152";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ar/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ar/firefox-113.0b9.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "d3014dc83dfbf8132c54c3f501ba501641360248451e12b7c8773ce72400644c";
+ sha256 = "aa4fa6630b0ec522181a75fc5fff4ebb97f8bd37ffd52f24ebc70b432410b214";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ast/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ast/firefox-113.0b9.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "95ec058fd689e6439efaebf2a1ce4fbdf4630f44d07de7fbcbbf8f4938d219ad";
+ sha256 = "6c4bc54870ddecbece5c372f2f6313051d0276fd230b4240507055c0fa936de9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/az/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/az/firefox-113.0b9.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "e57b88318cb4b7d8677997dd524c0d75dcb873b57ed62cd5f7d09edf95791ce4";
+ sha256 = "4b28837661abe524048c51a9ee4c1a65fbb2288465755f54ba9437c8db7527c8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/be/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/be/firefox-113.0b9.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "7375449539a0992741f7c8a54da6fe5d1db9af50d707d9cd1415cd09cf33eddf";
+ sha256 = "fb8ec0fa01c07540bf4dd6ac3c857c80e16ef6ee158aac2ae5b8dbca05ea63a5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/bg/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bg/firefox-113.0b9.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "f749a041413a34da71dd46e0a584fa9181ad0658d19ec89d7e6c20d417ac2b1c";
+ sha256 = "36e1428e679831e577490fe0d6a40b614b31d4fd627a8d2b8b38fbc32b009547";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/bn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bn/firefox-113.0b9.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "5c4063683ce344c9fee3c100b4c737813a31416c8e86f242576ef9f4bd94b332";
+ sha256 = "1d53220a7c240cd1024b32f5e9c6df2565a3c900f7fa92527d7f4bae6c0970c5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/br/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/br/firefox-113.0b9.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "c8d738500e696b776494897f9cb27210b566e6459ff58fa2916272b883c3e534";
+ sha256 = "8210d9cb63ce6d669ab562c732cc5d2a21d62492e6f0123b18dfef361c4d438a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/bs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/bs/firefox-113.0b9.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "d81b34fb97f7fb39ae6c9ff83f53ed5ea21770656ee00d962c5fa337784a20bb";
+ sha256 = "b677d30de8ff53525e47a874837c7a0c8077fd240f95b1b90753f892e731d0d1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ca-valencia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ca-valencia/firefox-113.0b9.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "eccdd0693103809b833e6beeb885325cd40f1e4ce5d77932f10ba6e73fd30194";
+ sha256 = "eebfb9d6d3329614f7d7cfe7d30fdf0421d2dc7595dfcc55a515ab48d42ee1e5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ca/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ca/firefox-113.0b9.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "5da0eb117ecc1bea59a7da773be9712a83e22cda716e72323fdbe92650d4048a";
+ sha256 = "66f0d0358b4e3cdf434fe97271d2aedbba03fee352b2911fc4f8f4d54d2472dc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/cak/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cak/firefox-113.0b9.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "23916f6e5f7fcf52224ff0ccf2f89cbbc875072e553028bac413603247b1c0b7";
+ sha256 = "7f6b556b02fe010949f6bc3e827e724f401eeb63d2dd81e5ce8ba1ab72b06027";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/cs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cs/firefox-113.0b9.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "b0f8565992048be1e57468df4a0918247264e6b220ccaf2f4513edb2eba9ed0e";
+ sha256 = "3a514266732fd75bbd522dd95193beee7a40daabde018f7b6232241799139970";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/cy/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/cy/firefox-113.0b9.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "0a76334c6fd018d5846294215abc4bcf90c406378b829bea17e47b8fbab3c19f";
+ sha256 = "82a3320dca2cc26d287d183676e4357b0a4905f142177a5f72050f29bf1f2917";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/da/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/da/firefox-113.0b9.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "0dfc849b5b8e71da29ec9961f373e701b4ac64263f60e3baa229e82210e4b33f";
+ sha256 = "2f5547506cfd7f6816fe3dc6ca3c310681de9495c759dc19e6576e331b21c5f8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/de/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/de/firefox-113.0b9.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "dd2b4f2a90eab01fac82b87645ca59ec246d21117e5e9acc6c878b0cb2f32637";
+ sha256 = "6ce75985d4f4786204cf0eaca8e37303baa608a71a09fc70da95e5338bfab274";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/dsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/dsb/firefox-113.0b9.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "21f16d8ff038bdf10886f0b5d9fbba3fd0c341b5f27c648d42d16b58c5ae34b4";
+ sha256 = "686d6f57cafe72915a92278c36af8fb7e3f170eeaa8f7349ae7efd0b748de4e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/el/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/el/firefox-113.0b9.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "7ee94f78c0a466d4691fd32d49b07187249b6d6f59681a039cee4ed14bfca499";
+ sha256 = "e71bc916cf8c26f52781b8ed7ff8075790578d068513921f9226067f3e62dcc5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/en-CA/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-CA/firefox-113.0b9.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "8f055b12c122b258fafc4be914e898af7e0b3fb94a1fcfa96480c285b4048ad0";
+ sha256 = "8cce0d2e65c6ada65c1c0bc1b4da1888b4929b7b245357be52c8572909906dd0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/en-GB/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-GB/firefox-113.0b9.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "779e43e31a561eac73581b2b4fc28677850f2c7861c014fb7fdf1635f21a6d62";
+ sha256 = "04f9c27cfb563157fe85f262f6e2143e3205121d68fc117816cf637f0ead6f00";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/en-US/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/en-US/firefox-113.0b9.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "25c64c4b17b8dcf9fce641be3d002fa9718adcb555e2aff179c487e405f90b93";
+ sha256 = "8129226d01e92011d3fd85f9be7de6d4b6bfb673e89af9cfb24e0e1a11d9a546";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/eo/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/eo/firefox-113.0b9.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "f0a3250e3cc260d1f9ae05f18912c082f3027caf20fb9b9324553d50cce011ae";
+ sha256 = "8c04506ba46b6aaf4ce5ee56f6273b425c6ae42aacd47d777cfea14181d9abd3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/es-AR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-AR/firefox-113.0b9.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "b539cf941825864a4f83129a3104b4bc662b1a6bb707d8de0db4ab0f8e3ff2ad";
+ sha256 = "8434b3870244befca3e8a2a79a3d291f7a0a5ea98351c13e89184b54274e8d69";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/es-CL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-CL/firefox-113.0b9.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "820a8228489595747767e62f2fba6e1f4784f0f42cf172794e49d752c9345d56";
+ sha256 = "542ead0257c78dae3caafd1d3715ba1a476193a4e57423913865ead964f3d07c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/es-ES/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-ES/firefox-113.0b9.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "c8b8ca226b25e8cc3356d65bb5718931ceb89a026aba6dbf21dc6093ef2bd13c";
+ sha256 = "0d9817bc6e056a3e4c52e28224ff92f953100198dd91a4936b99202a6313c32a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/es-MX/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/es-MX/firefox-113.0b9.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "0548558f5035a0d4d9a0ac786da82dcff921100cdd2548ee68164b00c084dbd2";
+ sha256 = "8262e88536cdfa5b7058da303dda68d9bc3058fcfefa28f298ce4f0057a934ed";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/et/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/et/firefox-113.0b9.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "cd50a4d857ffdc11e5176e75ded4ee7f5423e2f76dd6b97e350588f31bfe36bc";
+ sha256 = "8c21a6aad42bda0a3de33d571817392cf26f8bcac573acd270d59e9dc9eaae79";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/eu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/eu/firefox-113.0b9.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e53eb71791ac5d4b7c146397436953bcb13ef523bbf87c8bb635dda75bc6aad6";
+ sha256 = "c904e284d97c92e94e0203bc044fbfdde515f83cabd97d54866f7311f141f571";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/fa/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fa/firefox-113.0b9.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "7236e47b47458bd976ad2c8e31d15dbac86c858aafe0fef9a759b7c1b692ee25";
+ sha256 = "b243e98eb51a73616696d77b398112a7ec2097b19dea4948108f9e3ed9f88f37";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ff/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ff/firefox-113.0b9.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "fb918621850bfbdf20b24fae1d4a707fc26990a9ec2886f99241a946c46bc521";
+ sha256 = "83ea6e05de01ad6e495bcca86301fdd739e786d8f66feb085f75b7d8f47f0f30";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/fi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fi/firefox-113.0b9.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "a53e107f03b778d8efe35a3abe5d4654b0e630b26123f48be7c71d499d7e0f8d";
+ sha256 = "5e3d66c1e9a365eb6c53312d9bcf196825f11ff92f64e5484171f3e9de5fc0a4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/fr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fr/firefox-113.0b9.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "1fe21320a28ccc4eebe82736014ab35a220756bb53863a602367e7d0ab48069b";
+ sha256 = "ad6fc8e8ed72f529ae1ede3e504e7451fbc6c691b89e3338b07d4675adfff2f0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/fur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fur/firefox-113.0b9.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "261d16147d9322f25f270cc54b95a83320dfa65e348f77c3c3a8761281738c85";
+ sha256 = "447f80f773111c86ab51fc22dcd56304e713ddcb5da8a201d232388dd939372e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/fy-NL/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/fy-NL/firefox-113.0b9.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "e03aa664a31fb07d8b3ec4e2eaf5cea06328b1e0a17c74213acc20a441eb527b";
+ sha256 = "599ce63105ae0830c985238a87d5f19db0e6bed213c29a33bfd1ff26ffed70fc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ga-IE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ga-IE/firefox-113.0b9.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "4fa8df21724ef4fdd8af994b82e106e7eb885543d0137506885d6fba12adaca5";
+ sha256 = "fc42db04fed495d449e1b4ace47718f06177740f78add54a869ff7c82390d8d7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/gd/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gd/firefox-113.0b9.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "9538252e56a8971dc1ea7235fb4f9999fafa49c3b2a9581161d72df92c150ec6";
+ sha256 = "01e4b85055e7ce74d2132cd68b9f8a17fc6b6ccb45631eddf3285cb24943a1f4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/gl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gl/firefox-113.0b9.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "6b4972948eac477a0232d560f77568c9f5beb4197cb3ce23b751f1199bf71d17";
+ sha256 = "29e3bf59f47d56257eebdd0488c0eafe9f47c73612e6f5581fe0310581f5ec39";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/gn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gn/firefox-113.0b9.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "1e99274ec03597bb075e2863f973bae15e31edf206143baa5a8297cafd9d533f";
+ sha256 = "d5bde9c866b66c7b54607d57697c460083e33c03780fb5f671d1adff5664997e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/gu-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/gu-IN/firefox-113.0b9.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "730af60e5398bda4fa0a7235a79796e3ddbc94f4515246ee61a0b8630fea4ee7";
+ sha256 = "4d5854c9644de2e61b9afae8b831d97ab230a699332a358681c534ba1bf65a25";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/he/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/he/firefox-113.0b9.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "eef42078a61308baeb9bad18b73ef04284b8d596e208abdac3ba978a87aec101";
+ sha256 = "a20626220f1efd62403bf2b30eacfb85d36525723f4d2fd02cb02376ce0281f0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/hi-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hi-IN/firefox-113.0b9.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "137d94dc6aab34b1afe2f9f01dbb56a720c852b21928907eb3e13b677302b1b5";
+ sha256 = "f3fcf05bc4743699dac9f69210e0fbdd35e3d3e56c5ffcc7dfd6a63ecfc6aa40";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/hr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hr/firefox-113.0b9.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "3613e9210f985224cfb2fe8cb444953c9435ee53ef1dc54ac372dc0c421815b9";
+ sha256 = "ae3f2949ba7c9c98fef7c477ef08bd60c5371a9e91d60b2da0e4f4e83245f941";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/hsb/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hsb/firefox-113.0b9.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "4c99ce772ba3665a67f759e730c416f6fa9d3ce43e6321d3babf5f853b778074";
+ sha256 = "ae47ab089d4ed466099b4d5905e96e6d4c8936634923a56c9d2021ad13d94c93";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/hu/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hu/firefox-113.0b9.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "292f5be8074bed7f6b50bf2820d4b19b95fa9ec246d0b49999fffa6e0932552c";
+ sha256 = "6dee753f61eb15fc86a88fe9d4d67a87e6f48903601ef728739165813ed623f6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/hy-AM/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/hy-AM/firefox-113.0b9.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "419177cf4b483ae9c28772dc3041d8d08c081ad3f65de44f7ce4cda260ef6bcf";
+ sha256 = "7107634c0890878e4055e45a6b1d07097e25966cf9da44fdb50b07f44ef851e9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ia/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ia/firefox-113.0b9.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "de00ee9c794cd03d6b88ab8f8ff18c93b85c7d57123eae66f605de60a015d9be";
+ sha256 = "fb7e1907d9a58ef87d462dbe8eb5bf5a3fdbc570ae0ff05ae722731ff08f5195";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/id/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/id/firefox-113.0b9.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "161a435320690cc77f3c560e2dcc5832cf7e567e902bd2c5355d3b99a655329c";
+ sha256 = "c13559a24705c182934711351e16149b97c81db28164c6c217496409f1e4a28e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/is/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/is/firefox-113.0b9.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "ca6932f16206e076c0c774bb0ba37c8e402d1517af49f94572077dd181f52747";
+ sha256 = "2e898672ec55afaa28eba126f77bac9a13daccd3e33c9b6165828b3dc8186240";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/it/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/it/firefox-113.0b9.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "12e951633190af37bc946139060c42bdfe54f2d19c82c38ce38737915ccc3c8d";
+ sha256 = "2017923aa9a9a6a53aee09931f6b722618688278f9a68eb13a6cc3381d88a52b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ja/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ja/firefox-113.0b9.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "5f67aaa9b6766f75006c8afc523f76eded9b896df025832b1e6dd39cefcb552c";
+ sha256 = "fe551becc94d743082a2814fba234efe6ccf02f5fe2936134871e9265bc9e86a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ka/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ka/firefox-113.0b9.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "39994e2f83615b8c3783dc16a743c01f50ae0acd34bc84cfea2220d444d86709";
+ sha256 = "1e377de31bd73e509efa6cc4775451ddb6e226db76294dd48ebff8989511cdb8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/kab/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kab/firefox-113.0b9.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "10cdf68edc4dd686964e7eb86ccc2b7fe40297b142ac677e2a66956a3558488c";
+ sha256 = "0442088461d88653a94325b4720e83afa96c2f7ce4939e9e8e680b38f030ed95";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/kk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kk/firefox-113.0b9.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "c79bfb00636de01b471e2f1e54c2188de1981402fd6e6decef086b09d21b59f7";
+ sha256 = "14c587b7fff580a109efe0884563887ec7242356f34ba20067692730f2c7f161";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/km/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/km/firefox-113.0b9.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "e99a160126c6f1f2e52ba26d5a2472f7b3b33c97081a11ad83cc5678068a80b2";
+ sha256 = "307fbd2d10e13d2d049dfb4818f0e0de2a32958658664e71d5161ab6a1d0765f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/kn/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/kn/firefox-113.0b9.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "d061898a5ab1e649494512e876bcf44c180b304727d24fba59d21d8cecfdff81";
+ sha256 = "b4d0d5317b3edfcb848269f568fb08ad761114138a61229cdba47f13d6e53620";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ko/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ko/firefox-113.0b9.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "3f2ae9061fdf3921da0049d28b55a7ede78127958befa86c0631e03cf48392ac";
+ sha256 = "7402f1cd7dbe48e805bd98783517f161621d06b041c9426a2acba02e6faceb34";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/lij/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lij/firefox-113.0b9.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "a24e564bba652430850f4dbdcc0016093d42b3d7abe59e9af6ee0779b389d598";
+ sha256 = "d2699cc175d3f607bd58c4625bdf33570a0f046623bf23940ac908f02159f414";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/lt/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lt/firefox-113.0b9.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "a23381acf6a20be2eb4fabd8e655fd82de0f371178e059dc780d0e93fbe0ed37";
+ sha256 = "95e5876e01f7150da5189c1204ed64a7557d669b57f83db9b3f825186d186ff4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/lv/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/lv/firefox-113.0b9.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "f25f0023a39d2cb75a91e53b610b9cd5cd578085034f71b8b6699ecc5b4a70ad";
+ sha256 = "d9ac6d6c0a016ef51c7a3d740a288eb66ea01a04744f56227acf0a030bb279ce";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/mk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/mk/firefox-113.0b9.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "30bfae2b5862d920b1c4bab628beebef0d84c3a86bc5f3ec6f16716c79e5a8a8";
+ sha256 = "8aa4f4c677e3dac86d59a52c124f35ef654e2ceb40b3cac98dd6a0b37a64419c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/mr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/mr/firefox-113.0b9.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "0b6d868246682b953ebd15c6b8f9e062c2172e63a6575979e68f3cae4d4310b3";
+ sha256 = "13b222f21c5888e7059bf3e64b425a94435678a72c1ea9bfaeb6f887a2eb7679";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ms/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ms/firefox-113.0b9.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "d1d44a9a35c11cb6f9d37c295aeb5cc2cb8f90ac8d8847b7db730d659f567ba6";
+ sha256 = "cfe53db3dc55ccf184dd40e277535c6b735c9a291806538c67a73abd7627c4b5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/my/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/my/firefox-113.0b9.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4e59fef9898aac1d34ebaefdf1c4aff1c159d7a8b01b82c0d2a23deee8d7e7fe";
+ sha256 = "29381fde3bdb89bce3aee2a2df728d7e34860ebf25e50a2ebaad32e8bf32b7e8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/nb-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nb-NO/firefox-113.0b9.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "71de49987238a557a21980b756d455c6d3301e3af22ccd7518ceeb144a5ceb05";
+ sha256 = "df532bb0d1336a8896e9510d15fc7083e8c596364f2b0792fe4b0c490e61d126";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ne-NP/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ne-NP/firefox-113.0b9.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "185e525f708dc8e1d1f2267bcf813f278162230341e597d19be8eb36b591b196";
+ sha256 = "aac7b8aad9ff10e5edd79e97cf8b0c5110bca31c0d37e8f06ea0cdde158efd1b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/nl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nl/firefox-113.0b9.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "45bef7cd4fbddc40a07772b69957d917cbf2fd46aa791c0cc80d8564df8137ab";
+ sha256 = "0dca8ed34007c8cd4b06d85e3c57c8422eaacedbce18a7a7a51cf6bf4ecd63d8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/nn-NO/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/nn-NO/firefox-113.0b9.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "52889289331cb278d248aa99b067d824cfb380ff9e206d51a62de7092ec4c66b";
+ sha256 = "d19a24f25e67157e788f69b1a229c28c2a3d61f8295ec3ea58e4d1a8f7be2db0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/oc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/oc/firefox-113.0b9.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "da31d005b42c12ec543e69663bc5c11e88cb7e4022becdc165f78498b93281c6";
+ sha256 = "c2469e7bb387ad0e1579b565d171a98fec8cd80844efbde05bc578bfa3302f05";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/pa-IN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pa-IN/firefox-113.0b9.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "7504f525116b060d2a32ef21e0d047c64e5214d3ee2be75094718623ec5d2487";
+ sha256 = "96f7014cf43ca4bb5557d80e75f88112cc047b700ab53bfb0f00377008f65e80";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/pl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pl/firefox-113.0b9.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "26bcbb819370de9a319fa9ab78dee86f4f0ceda8fd7970323d4170415e163a5b";
+ sha256 = "1cf73f85f46dfbaaa118c4ab5ddb7460b7bbc6b2f80cb4aadeb035f6634d8925";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/pt-BR/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pt-BR/firefox-113.0b9.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "5decee49196cd32ac8099e34008133c6586aaf76b2b727d9224838b39ff1ec37";
+ sha256 = "1589f4467c0c00939a197d77b48cca58fd2fd8fe07e6d440c4b815894ccc2342";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/pt-PT/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/pt-PT/firefox-113.0b9.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "79971e1d9ea66396797e86a9b5a6cef874eefa408e985e902171fa67bd2ef379";
+ sha256 = "1a5795b1e311d2d71c49d8a9749c5cbb7ebe021fc82c7d5ce50d1a3722fb9f04";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/rm/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/rm/firefox-113.0b9.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "50b9f5d2fb7c4783511282a7a8a9c619f72aa7afc30f927f5e939318f8669677";
+ sha256 = "d428e26b8be57992a2cb6e1c5a9ec17736ed20d8acd6b3281e34ff13f4f04c6c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ro/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ro/firefox-113.0b9.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "2f1c61bfedbad282615d29f32e04b38555c8599ca3df7a682cbee1ec6b626f1e";
+ sha256 = "ccd90382e8c454fa01964a11d9a1354d92607887e39489c744f4e16f94fc1a58";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ru/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ru/firefox-113.0b9.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "af34ab546737c8783bda33717a3c70e34d12cd02e163785d968a0c8807b0cc55";
+ sha256 = "047db6217ded736876724241712c992909020d8c5adedac092a901ddd6a3f4fa";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sc/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sc/firefox-113.0b9.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "6eef5281d7d8264ef48b18d5a44ec1f6e9d90ff2007317c959a388e73398a431";
+ sha256 = "f59c735d303d0e3d029d1de4a00494f28886491d673cf40aa30454df1ac8901b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sco/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sco/firefox-113.0b9.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "9ef6ea368005ef655b6691d36fb45fd52356f09406c1a8f5e099e8acf4912193";
+ sha256 = "20402e2ebde765321d5e829ddaf4db6af5156a9ada0f810d2a32310f6422423c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/si/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/si/firefox-113.0b9.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "fa3bb662d0318931ef1fd06a7805f7dbbaf09a8be680b6b23c6f254f221b04e3";
+ sha256 = "fc7ba426dd13eef412bf0d5b84baa1697ae53f3ccdab11e4b176937cbf376949";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sk/firefox-113.0b9.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "797817df30d67c77382997887e2997515651431eadec6952cb0712d082440a59";
+ sha256 = "6a73f131366f3fe20004d7e2160ecf06a6e43bb0cac33dec7d1cb45a87dd9392";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sl/firefox-113.0b9.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "3e9e9b81e369efd7c561877d4f460f20e1ad1f2af077f86acc1a4012dfb95dd6";
+ sha256 = "6bcdad54f5173257a81f616a591d58c87402c02747e0fb2d945d9787b689dedc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/son/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/son/firefox-113.0b9.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "a8532bd84d1053568eaf532eb77e3c69dbc408711551f7b72f0a44f39428d619";
+ sha256 = "730699eed8e6c941b0115b4dcb404bc5f8295da7d2276c8f0f649620fb6f0cf5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sq/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sq/firefox-113.0b9.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "d6a714a82b0ea50b922b9bb98d8898e1745895f0f1c92a60fdbd8ca1e0b42acb";
+ sha256 = "58c9b7a606aa8ce98eb2f3e9ffa752bcc663957d400ce420c10f4251f85662a0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sr/firefox-113.0b9.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "43cad271b65f2678d44bb5bbe64fc836bb1a9ac97bc8f8c7945edb60dfdb6a39";
+ sha256 = "3179ab5f043bdd681d65aa32bd2d91078f1dc3b1ec0405cd4e1d59c2ffc3fb4c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/sv-SE/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/sv-SE/firefox-113.0b9.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "92ca723f06dd1a1ae031fa90eac0d851de3d525ad3b1ec4d2c9b53ae1779e2fd";
+ sha256 = "bfd4e60edc50645c4f7fffb6131d266c106bc6c5a067950845684e343b363a16";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/szl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/szl/firefox-113.0b9.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "e33b8c132ce3a190a2d95b9b586bac4dabc91e90c3fbb3f7a0b5b38ba516a928";
+ sha256 = "662a229a383734d002fa73215f51b6e83f1aab3fddb1bdc5a1c76f63c670a347";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ta/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ta/firefox-113.0b9.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "22bbda22f0d0822ce3514983b0cbf252b787abf717130cc3e20e0e17d8ff3c65";
+ sha256 = "cebc08bfd6c96fa05f7e3afceeff49106830234ddfd951d87e3a7fb3787ff350";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/te/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/te/firefox-113.0b9.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "1c3a65b3a2b8163d77d2b2010d01d91537720c72d12df389bff1f9d59b8c309c";
+ sha256 = "3c7c4dd5b2e17fdf835ab6347ab5575989d1ed24ea9abe67b14c3432a71f738a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/th/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tg/firefox-113.0b9.tar.bz2";
+ locale = "tg";
+ arch = "linux-i686";
+ sha256 = "10d715b50ae52cdd244c3a216c595558ef6b795447ab34bb35926eeecdf750b7";
+ }
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/th/firefox-113.0b9.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "86d431b1caf9182d1ea8bb26d58d498014198433002725c422b6850eddb5eaf9";
+ sha256 = "58ad7a27a39761e7af5a772c61b76a8492a906cc03d6fb4197765c9843b720fe";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/tl/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tl/firefox-113.0b9.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "8bfb89a87921a8f912ab9502d802ba060aa1ad60364465f231b9121d6134ee3d";
+ sha256 = "a7804d3c8967e838b9935b3858b36899a9ff85f70bc443cba9d0b8b42c7cd778";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/tr/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/tr/firefox-113.0b9.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "0a81097984bb2e9374a7f7aaec8041ed78640fda55f982ed852121f53218f553";
+ sha256 = "5ee096c8f024dcdc55d62fc0c98bb712be9d74f7aec1ebaf2a76992d404b81e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/trs/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/trs/firefox-113.0b9.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "dc72511645f769678ba696a909ce1c62b6b6ef8bb8de227c0e0baa8b14bfb75e";
+ sha256 = "020ce9d8b34813c65fc97a220c6080b6cf5396cfeaf33f696920e4b8a888e719";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/uk/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/uk/firefox-113.0b9.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "3eea691202fb0c5231d1385f0dfb7f47aa4205b5e0791351d908bb7cc9377df2";
+ sha256 = "a3703ab55464fa5cfd6ea2abde8aa34e0f88505a67175c8ccc7c9b6ff2c5f022";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/ur/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/ur/firefox-113.0b9.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "664e45452ef12bdaff731213bfbdf0e7706512ab3a0ca30774ce6ba803cfc64e";
+ sha256 = "1b2d6dd037573c13367a29708d6b503555dea4669b12d9682180dcba88767a0f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/uz/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/uz/firefox-113.0b9.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "77b9ed6ce3aeb2f86d45937449c0d1fe3d2c1bdd81afa0df7ab1ff5ed01c557f";
+ sha256 = "f5268e0288d914d32c7953ea2877739fa5eec249e0d58fabfc206f703d9a75a8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/vi/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/vi/firefox-113.0b9.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "8d0574109f296a3b9c8b4b4b48eb9009bbb3ceb8943af2a80292378b0589e03d";
+ sha256 = "f58b711c1cbc867c10b6cc86f3540c6bacdb6f0065d8a6e265c451d7a9bc471e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/xh/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/xh/firefox-113.0b9.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "0ca131a2014f5158d51cf493f21ef0b1088f7a8e0923ebefe003f9eecf3f8050";
+ sha256 = "639a24db66dc57df82e447e7bf4b3f66ee331465329962c70a5abefea8f00c53";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/zh-CN/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/zh-CN/firefox-113.0b9.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "222c1555846eeeb7864356a081fd51af1c29a17a0e1f2fa031bad6c10b4615ee";
+ sha256 = "c700678237a32c2855bededf63471c0d013ae468c1f191f02568a33ce94d2db8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b9/linux-i686/zh-TW/firefox-112.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b9/linux-i686/zh-TW/firefox-113.0b9.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "4ffb560396e144afe416123f3f0e9e15c85421eb9e3cca6c78fc27a9353d4e3e";
+ sha256 = "df5078776ce3eefaec9d5a7d8b1a9564d527d43b84df299bfe994f553abba012";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 5e6117add4..0aa5f37a69 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1005 +1,1005 @@
{
- version = "112.0";
+ version = "112.0.2";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ach/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ach/firefox-112.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "5b3e37c5b934339ff083b0f852a135c6cbb45c6abdf6467ec206a83647a1d8b3";
+ sha256 = "4a32600dad771995ad6c347174b85f8f186da8ddd5223255c80d5f1a88bba375";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/af/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/af/firefox-112.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "af22f08c6528fd447515eb4f914822265bc9e47ee314d7c15487b9bbe1dde42a";
+ sha256 = "ab23aed01c5e1ca7afcf09494ed11066625c9be3d3e386d68745e7e3a7d24b42";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/an/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/an/firefox-112.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "0cb1badd023ff3dd7131629229648956596c43e4458affc02273ba5036f810d1";
+ sha256 = "7a3c5919771eb1fb5ff5238339de9bc19139011293125c64216572b5ffecf28a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ar/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ar/firefox-112.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "673262175ca0f6fa4f7f0c43634ad15f242fea00768c614c97ca0b88abaa5740";
+ sha256 = "077af6c198cbcf37bd128cb4a6831868c8b472663246cb46adb89588a4451851";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ast/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ast/firefox-112.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "649d9bde87232463ffa532f2fa1a2dbc1732134cff8ab3f4628313f26d573bef";
+ sha256 = "494c7cc952ecd0d349b7e5626233ffbdfd541ad0efd7f502198f76d6eadee33d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/az/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/az/firefox-112.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "15cd7a54db2df0d6894798e508346ea51ccf05b45ba7237875e7fd32fb2a94d5";
+ sha256 = "87519f82b780e04a8fc4c41d0ab248562c3d6b6d6941d9a50b0f1d7ae1335367";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/be/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/be/firefox-112.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "1b2050268708cb475d8ced0fb8e0365f243c4993e817a553603e65b600ee7f05";
+ sha256 = "f65bf7ea0d9dfa5be6da26dd762e862dc562688f506a65c05d5d344693ef7325";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/bg/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bg/firefox-112.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "b6323dd73d10ea547c34cc022bc60312a949f339f0f709fe4d1fbf9cf8859b0e";
+ sha256 = "fdee1836538fbfcb9f5409a132a3ba13a0c6cbd56be5f5839c5a6aa10f21fb78";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/bn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bn/firefox-112.0.2.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "2e6699071dfe0efc6f6860eabb34e3cf64a4de2e11be2292fa5348808e731ab3";
+ sha256 = "b305faf020b19eb6c7967b2e1c5b1b8ecd026ea49d8387fbd1a7304e7fe4eec3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/br/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/br/firefox-112.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "5f488917c05c048fee13153de51a462febb4bd72d2954f2d2f321cd119da5588";
+ sha256 = "f373e63caeb791e7f6394e9339daf7e5604a5e8603f0b04bc138b3c9660198a0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/bs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/bs/firefox-112.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "5860c3f2677ce99622a0b575baef36d3db993d2f371b7c6aec72ef2a9d8e0952";
+ sha256 = "d1889939bce050c63a769c2d67666361d78b2d87210fcaedeb41b0ad13fc8e38";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ca-valencia/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ca-valencia/firefox-112.0.2.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "23ddc52776810445fc0352ebf19b27c2b4729fb8cefce11b0fe7df9f9e505dc4";
+ sha256 = "9092a32d66cf883b574d0532ccf7398468d4940186f3bb31fc6add6154430f51";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ca/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ca/firefox-112.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "2bbe66c628f5fc9c89880d63868eb5469f1284944728adb5e3741bcd85c57b18";
+ sha256 = "d7bb4dec533ba1824692e13dcfcf8b0dc2831d3c6556e8a2122285599227994e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/cak/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cak/firefox-112.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "d319f624941cd354df6bb78434f64cb6de41bad266a1186dbf7ddb0c2cfacec0";
+ sha256 = "89ebad425295cf88f6a33b238e98eaf593afd7459d6db3f75cc1f50cf3354273";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/cs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cs/firefox-112.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "614fb174a002e469a8dc83005422c102a6406cf0784d53b7120ddb70a0bdc708";
+ sha256 = "4a6d64263f1503cc35c36b2077bd64adbe9d2e7de4223a64c1eeb5eaf2e939a0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/cy/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/cy/firefox-112.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "111b820566db4fc682768b4ecc3b6583efc4039c44e880ea7bcf5ca352a62dc0";
+ sha256 = "d07924a243ce699dc200fdaedc57cf197126b3f31da78fd9b65ff8b24483729a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/da/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/da/firefox-112.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "87f670d5a7774d7af54bc20a5c788f47d63f6a1d2dae825889629d8c75057ce2";
+ sha256 = "401d14c70aaa14ded17b5f1f4ea1d5ebc4a1dffba349aadc730e3a226e78f1c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/de/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/de/firefox-112.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "36cf31e4b1472f61c80c70a2dde87f1fb56a64cee39484d22b12e76618b73485";
+ sha256 = "0b8785f1b6320878bd4a870adeb93512331fdd9ef86150ad8aaef0440c5fc0b4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/dsb/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/dsb/firefox-112.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "d068e2632550c03d92e7b3b6e3fee961e8d1c1d2bb19408b696ac483317ddb24";
+ sha256 = "d8324ff9c74be9bf6e20ba76f67d7ceaed2f6e551331873f4d1564f84eae18b6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/el/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/el/firefox-112.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "44115aad6db9d6d105d9418cf5c22cb71183b6b14f69d4e90642b3bf3fb2be57";
+ sha256 = "ec2b6ab8258c6b7c09524e5c1d6b7204d82aecf7b0daf13cee23f8a9c53995dc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/en-CA/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-CA/firefox-112.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "ae4e225641700ae32dc7b9a395352352a8cfb2ffc81636f2820684095709d1ca";
+ sha256 = "733933a42d4488689aab752954895d9ebf0f6c8bca3600816b2d97f047d7a0c6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/en-GB/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-GB/firefox-112.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "0f84ca1a632467ce5eb3f7781b24ab6f361d5641b19d1c36aa03a6df2494230e";
+ sha256 = "7e2014255101bcc88ad490eca8f8d6c7206e5463ce2570630f4d9c7829afc1d1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/en-US/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/en-US/firefox-112.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "31d2c3fe549cddaab7576cfde6467ed5a6534b1988adfb921965b60714970349";
+ sha256 = "dd91e070aa5c6fa2e174cd4dcfaf4794791e6ccacc2a6a8ad8ecb5b6a51cf6bd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/eo/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/eo/firefox-112.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "998019dedac2a5f3e15ec6fcfea26f9183effebcf3d9441436c45e87892e7957";
+ sha256 = "0fd41889e888e9ac017485f3883d21cc855ec45642879c4e7c38320de31674e3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/es-AR/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-AR/firefox-112.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "9bce94e6a9abd75bb74405c5c88d786621703c99a1482f2071cc3ea32e2af07b";
+ sha256 = "28cf2a097b222dd13f51eac35cb9d9ff500fd7a43003cedbf63cc3bad30bd013";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/es-CL/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-CL/firefox-112.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "9bdf3fe6bdf49cbdd2f2f6345485609b24160f938a7939a33c9029cbddb9e83c";
+ sha256 = "948eed7a7575d7c6624508abd734e2db897c4b1277f91bf9543d9a286bc9051d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/es-ES/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-ES/firefox-112.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "1692def0e39a94bea876efbaee57651d8a3820d0e47581520ed28e2c94412ddf";
+ sha256 = "3de6cdfa93914bc8da328100fc04313a4863a4c9c10eed3c9792ca3eba6a817b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/es-MX/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/es-MX/firefox-112.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "948f0d2e110e6b6980c88c59e0bd3b84df920a490b25ef9d683619390fb12bd3";
+ sha256 = "cac850a48979e1b96112ec144520728804d61f18e9f615a2e1a0738b8cd92765";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/et/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/et/firefox-112.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "c20d2fe028e2ad2a5b6d2e58bd2f21de02dd75f143b25faae9293225a2c2e411";
+ sha256 = "645ada14230634143a8bc338f8595596ffb6de4f448efde826ecb6e7d7e07ca8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/eu/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/eu/firefox-112.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "a24feef2fb182796593d97cdfeffc4e4eda5f008f8bc11c679861424eacf9141";
+ sha256 = "8212ef486ec59000dee4bcd62d61e55cd375381b5119c688980910f6ab27426b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/fa/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fa/firefox-112.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "499be0f1463f830c6416939e096e94ebcb4a1d74726558ef9f0547b2ae233247";
+ sha256 = "83886a65a04e7a32d3c479e953e228ce08b3e8b62b1074f07286e46e7265790b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ff/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ff/firefox-112.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "5ba8e592f4399dd31d95b06823a342cd6662d0ddd7e3794989ae5c5ac2e52aff";
+ sha256 = "e06797ab1e0c263ca31d1b5c1cd8b4e38823efc053f2be2e7467679fcb22e073";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/fi/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fi/firefox-112.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "480bafb6c43ef6da5b54543a5f96761e83706a86115247e683393330557cacfb";
+ sha256 = "b14d6bdf063177efa85eb6813c21f91ca0a6139b38aed501e65cc584a68e15ea";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/fr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fr/firefox-112.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "b91bb26a3d6293e88ddc0b74882ab2185c7538df893d952eb64d595b0ccdeb1f";
+ sha256 = "9729e6f1baf38fde3382869572fb073beeab30f8a9a837643cbc69b63a45f463";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/fur/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fur/firefox-112.0.2.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "ab91f915296d8208363f6c882c7e29954e9e5506de30ae62b37eceff1d3d7c7b";
+ sha256 = "ac8f33ecf4e7ee66bb7c428052f853793d426f1fe169805f231412e28aa6404a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/fy-NL/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/fy-NL/firefox-112.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "981ea5abc2c5ff94029b3c01674892f397f8504c1f180a56e3e8620ac370b99f";
+ sha256 = "103cd7396ef8c64df1f84db958d12688fbb90f95e56c0be05590f7d9b8a2348d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ga-IE/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ga-IE/firefox-112.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "5eadd57836438871d6ef96a57e02e60fe6cfddd47e2445703b1d8db80a1d2fc7";
+ sha256 = "9a04c66d62dcb51c573f9b14b48a064a1fd2725ca20f4518af6de2517e7054fc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/gd/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gd/firefox-112.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "41666cb94981dc30cfa0113c42743b3812add4df3686a39a64f9a0f2baacbee0";
+ sha256 = "2a8e057a49f39610ae4ed5c0cec5feacb435680194070b4e0ea5c64ca2328933";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/gl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gl/firefox-112.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "820b660761a9a265618be1061544243d24b82cfcd63a5e1fc8d8525ded22c1d5";
+ sha256 = "a354febd40bbdc0dfa8d03306336f43a919f8e393fc984edc2a8a32fd7e06500";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/gn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gn/firefox-112.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "9ac4fb8d505a53226f36a9dc002ba42246a5c509d7652a2fec05584a34d6d47c";
+ sha256 = "fdcb1f427ad40ff9559090dad581f5039e768627dbbad1fda99624d4bb51d8d1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/gu-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/gu-IN/firefox-112.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "ddfe903790c3adf8f809e06a4e2790aa0ae876cfc291c4fdb22984376a8df3c4";
+ sha256 = "c8b946ba9cf2c56d6dca6d9c10a67602f4fad80969858a7c7b906bdda7fdf6f0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/he/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/he/firefox-112.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "3e61787c63867631ed76be4c6a9cd9b9853348c912b9c23af06692bdce29315b";
+ sha256 = "9990a04b86f765d79e00890780c7fcf2ec3fd61573ef7f341f156c1c48cd467f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/hi-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hi-IN/firefox-112.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "4b179b9e9286daffaf2aef9bfccb896475fa2576c92a289f1e4eb0edcb055688";
+ sha256 = "f3a2c58f7192abbd4690711255035186498b1a8c499afbc9c2dcceaa61fc0b2b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/hr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hr/firefox-112.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "275cf0e84b2589e70e753d4c98e2c3925b14b603ed224da201878fc8442cc7a7";
+ sha256 = "26dded9c117143aafdf502896a11197b028ca978701830f1c84acf258ab307c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/hsb/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hsb/firefox-112.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "c56f94b46d96923eb9c4e75339af0b42a15f3c57e8e39118485bc79636ebfa32";
+ sha256 = "caf295576ac3d579a1b88cae94e46934cd4c83ff89658b5876e7af217ee31681";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/hu/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hu/firefox-112.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "1a5b9a4307deff20db53df233864a503befc25ccedb204f7d88ca6bd867e00a8";
+ sha256 = "89e89b13c7dd676ca4cc739ddceab1184c68e70f12292795d91142813058e279";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/hy-AM/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/hy-AM/firefox-112.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "076f4159bf40e38ad730622decef57eff48fbe8e5988f78a5e2fb556a9f6a2e9";
+ sha256 = "6c3819149739a866dd231707daaf6819da49e26d5941f556b24f0cf29be8c35c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ia/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ia/firefox-112.0.2.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "7bcf54767dd38d42d93d0b96ec5135213a29b5d78352d262d9335cd1576fd704";
+ sha256 = "10965794c2075e5a9e5cac21eb9a6dd4e12e1cc55d2bae846a5c7ce2de9159d2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/id/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/id/firefox-112.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "dde4e712171c26b64e2b14d725ba93336b9e766bcc7f53fb2093d7fb0a8b057b";
+ sha256 = "a91f75dee13ca425fc7abde7696c26ebfdf0db98b339015ad2a5db8d2254742f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/is/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/is/firefox-112.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "680e69de93ff6c96d9f3debe05392d98bb926e6072e04375e2d61e7387c18ee1";
+ sha256 = "365946180b375dea606db48a6929264a2e151f53d413ffc0ecf8e3845c0d962f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/it/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/it/firefox-112.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "3f35ab7843b58d218c6f4e92552549b6b095d71dc1d7d35bdb28f1ef7458d442";
+ sha256 = "57feb62a6d3e9b5be052988109724c870d8a7e0f5dc88f08a57dc853b1c42a9f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ja/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ja/firefox-112.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "3afd18750cf2555fb73d57a753222572fec08e49e7325b16427ecaa1249b51ab";
+ sha256 = "b5a47f6a9995789049b717b45ef489da1ddd19532d69d69b887b7a33a9b582dd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ka/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ka/firefox-112.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "8bd98c293361382940ad26ed0d654bc70390f66eacda19a7aa3d8bba717bb69a";
+ sha256 = "8cee5bfe910d8297aba0c41ebf82f0df957a4bbf2add068fdf39dbfd91abd480";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/kab/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kab/firefox-112.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "47dd2bab2c7b5e8046fa0499e48717c3cbcc6a633fab2a74d0a37c58cee80cc4";
+ sha256 = "c6045ff1ccf44319be689de1564b27d4986ae97e944d54d730551adef6124ced";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/kk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kk/firefox-112.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "50068256add6746481c5102dfd35ce87ee2cfbdb23432cf8d3306ed5e2ce6095";
+ sha256 = "5f18181e89268c4556d3d2d299aed3283fa82edec3ebfcab40df3baa494b1697";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/km/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/km/firefox-112.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "85045900caa1a361bd79af5058765a3ae7e9a300b1f90975f6f3bc1c07481471";
+ sha256 = "3909f25efcfac4a4663c93a95f1590f55cee54681f8f4110647040f911b6cdba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/kn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/kn/firefox-112.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "796ffb0a8130931555e23a21977e8e4f9ab8ea6a9fee54ff4410b48a1e56d553";
+ sha256 = "b6a5512beb535eba8a3a58c3807ab1c02af73850f030bf013cc08df07649cdee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ko/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ko/firefox-112.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "d937b25cc45b3189fce933ef0ba627fd79a79b3a90464eddb0dbb8a366f288c6";
+ sha256 = "f8235d477c82154ef6bfabfd172b5a13451b3970e4beec8cc6500184ada1af60";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/lij/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lij/firefox-112.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "58aab71db6df9d5d277b46d31f8c0197c9d01908adddcd1adf6954118165aa11";
+ sha256 = "169d029ae526ea51e5812e116f7266ce51fc4c622c693b976e2a874ea4ef857a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/lt/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lt/firefox-112.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "d02bbab7d236ff9b7ada25949337895cfa4c2224470b9ad0f96b25fc34fac870";
+ sha256 = "6e65530f552c9c267f5b3cc31f301118d5474aa539b33f46bbaff27f62b9f016";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/lv/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/lv/firefox-112.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "3621f49e44c2cc7dc99303cb454ef330f91a5b19b19c12ba0a1781b908a386e4";
+ sha256 = "46325094def40a1d9589c7fa49484bacac27277cdf754b7cacaae203b5940bcb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/mk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/mk/firefox-112.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "5be36bd63a6c05b445e27c10aeee9dc16e30b08481af4710aab3ceb9327d226f";
+ sha256 = "033756b122d219ce79b667f405d54fe1c0eccd1532f43d42bde1c8b928d3ddb1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/mr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/mr/firefox-112.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "a05c77825c7adf0413649f8f580353d086c63b4daa3da0ad408577061819e9a3";
+ sha256 = "71f23b05b692eb12c834ef356a868e455bdfdb3bf6ed641eb4b6565b4d2fdcc6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ms/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ms/firefox-112.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "05d77b0eeaccef202b1a712bdbc3a4297658646b55e680ec1360980960e5a2ae";
+ sha256 = "0e224bb6d7341a17656c57bce4c8f753708deee18fa0f31877938702c3a2d61d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/my/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/my/firefox-112.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "f7703567dbe5ebc9cbb12c45361400009e9ea360ccb03585139834b8958b1e85";
+ sha256 = "9eb954ee63bf6e4c8b6ef3fe1eaf8e91eeaa546b78ea4b1e518a1400865d94bd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/nb-NO/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nb-NO/firefox-112.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "183e9b9ec131621e457f62ede092506189c83f12a2e9a95b6f226478e2b7b445";
+ sha256 = "ca2368edf9441d1fdb4d580926b7af8f1330f99bff62f0d2ce8cc669cd10e85e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ne-NP/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ne-NP/firefox-112.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "cc71c856d696f0314ecd7b1d0727c169e92be7989a7f6c520abec02623ed97bf";
+ sha256 = "324ec07ac0a4694388b392e051e60d4fbed9df5b5a4e16e8b5362f3d35aae2fd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/nl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nl/firefox-112.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "f69b8000257b28471a93946ba474dbf8669955c175e5411d848e0aabc2aca3bd";
+ sha256 = "1abafd5ed255a8c73ef9c1ec1bdd52f4f5d7f1fc305e55bff279d681d48f9266";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/nn-NO/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/nn-NO/firefox-112.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "7088ab439789484fca1f97e7500f9096cdef308d3d2b5c003813ef4a0a8873d2";
+ sha256 = "1d821b71811a9ff6359ecd91695d92ddf4c84c7480e70ddc5a5bcb9b4e038d74";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/oc/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/oc/firefox-112.0.2.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "7093dea0249eae06d00fd45e185a404d166d8822850b98d68628152be8ca3d37";
+ sha256 = "f249b854be5e54abd6218be95110aa94694054adaddd31b6c932d29b51cd9681";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/pa-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pa-IN/firefox-112.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "d2f742748239eb6076024b3c02e557961590a453b17697099ce9c2d8ca3cdf19";
+ sha256 = "8575d4e60c478e6129be7e56ad537eced9ca5f50b22fcad976a6574486cdc67e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/pl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pl/firefox-112.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "3a543d4a021bf5d7ae434ab97be6c4966b6b101d57731dcd685d05657d4583bb";
+ sha256 = "6d822d6de184aa269dcf6c6d868fcffde563081321e861285a48ab471fb9759d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/pt-BR/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pt-BR/firefox-112.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "ab6e127faf64aa4cf54a00ae5462ea05082a8ebd474cd7c193045c3023cf2b7e";
+ sha256 = "1856751bbc497a734508db1717ca7ee82c67af3e6adfdbfe7dfc44e80f0536e8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/pt-PT/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/pt-PT/firefox-112.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "9f42addf0e2c23daf53a46637aa3fd4fe98269889fb83debe762b50707d29dfd";
+ sha256 = "b98aa8e3a2b3cf760723228406c21d9407a13be5f5e5785c7271aa3952261f94";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/rm/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/rm/firefox-112.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "b473c7d80372257d2dbd193ee4582a24f98f0c03cab53c5272bf27c94919cb63";
+ sha256 = "8a5ae33a54647c02c18e01acd5b1a15076d8f9afbc324643f985912f7e724f7f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ro/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ro/firefox-112.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "c9c64e814b2b12f16b8d3033fbd3c146faaa2a3c4b5777161f64252d5d63e998";
+ sha256 = "8396ac479024eef5631a54e58807118e0fa9cedb863303876c67d16a126a80c0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ru/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ru/firefox-112.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "f8cf8f416b9a82a1b03d9989e512ede25cfb3aa1b58ddffcda0d17b3ae173ff0";
+ sha256 = "ffbf56b7677b5a2f8d3d712eb029aa92e196201157634ad45f7eee32329df4e4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sc/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sc/firefox-112.0.2.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "6c1a40a2bb9db2b0d6afe63a3c76a774ef888f60f0a23814c2db5d08c77d43d8";
+ sha256 = "16beacb5eecedcf911bb4a7b70d47f396e68b495842f60e7cb90a7581499f05b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sco/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sco/firefox-112.0.2.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "0529f55e7b0b6ccc2a3ec92cd0dbdac0210e4c45bbd00d350d08e2d12ece818a";
+ sha256 = "41349269d84c88543f343c9ffcc003d89650584e7e01a618a38e7aa7455162ff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/si/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/si/firefox-112.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "891a18f8f7049997a62e997a17b8254a454335c65c5edcac45f441e931fd8049";
+ sha256 = "4e1d451b9e1dfe6e9a3783dbbab627da7337da28b419fb20b4530f8ab667e01b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sk/firefox-112.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "5eca1dfd6ed1b75957d6b4d1a7c0aaea2a140b85e10043e72260dea5938e928d";
+ sha256 = "474535436e42a5e0db7c4ff066a066633e9d27f912018a7d297fb2155b271e17";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sl/firefox-112.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "26f9946afc6b6b8c7b42f359049bb0b9586d961f9ff45a1490bf6e3a13330fc3";
+ sha256 = "e9470ab915fec42daec4a790d9c6c6dba5bb3c322bd4dd86d3275b875a1076bd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/son/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/son/firefox-112.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "df183627ea5817d7e2741bee238a24674a1cad312d72a412fbb7660c3574f173";
+ sha256 = "d46566118297c0699de1809dfda3a322ff64fa966218aa0e869b81a473a94fc9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sq/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sq/firefox-112.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "7dca7529a949bef4d7ea32bef0b4dec8be74ec70b28e3467f3e55ce7e559fbe1";
+ sha256 = "84c87224e4fbda73e953b88a37607722daaf47a8330d2fedaa08bf55a5a4f7c7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sr/firefox-112.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "38fcf34bc58bb6cfabebcfd5968c6b6183b7188f4f93ce88b195501a43842dfd";
+ sha256 = "aacceca53b7a5bf79be03992741ce67b8a902a2684e9354452d4f56618a51f2f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/sv-SE/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/sv-SE/firefox-112.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "5ca84fc079c62a62714e22eac1b9b93e9fae9948694995313d98961147aa390e";
+ sha256 = "76142e5423922ae3b75946dce3b2a902f3fab70339c07d9a4815d668e23a9821";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/szl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/szl/firefox-112.0.2.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "aba9805904c45d03ea4ab091c5c15bba4e4ee7392b91ce23a4adc57581c1dd22";
+ sha256 = "dbd0a963fa7a674f3aa3fc2f22bf35c3f2d9a9efab49800ef259cb914b82b819";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ta/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ta/firefox-112.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "fbb368a2b49211242273c93f3930824adf41fa06c69f9b84b3dea4f44a80e2f2";
+ sha256 = "08a6f42e20932a906e7eb365b75c8536536fdff50db5ad702ff687345401a7a7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/te/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/te/firefox-112.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "c3e524c50b92f4df65c733eb57957893b840dbe959ccc94fb70af31eb93cfc01";
+ sha256 = "c82225dc13a4dd9feceda5552677cf80734785e04b5281140bb0245f3df47784";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/th/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/th/firefox-112.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "eb077d3503427f54497bf6b23cb8a6f20106bbb3f0a42426d3d68ee8b4570c68";
+ sha256 = "42c8282d65f1aa74b3c1508040650a0c5a5890d378e35d4bc5c301843569e02f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/tl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/tl/firefox-112.0.2.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "ad7b565d757eea9f9332fe58846bdfcb1811a88ce378482f1fee33182cf819b0";
+ sha256 = "3c877d0a2fb95e25361d2936096a7c47b56062f05db8505b2848d8f4d6be3795";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/tr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/tr/firefox-112.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "1b44f97c0dc636ad87c24b5f4881dfc058b1cac9ab5702b8500080509d078656";
+ sha256 = "c8f105b999bdb235c6f90d5cdcba94d615f03c0fbab08d850043b8e38677af65";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/trs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/trs/firefox-112.0.2.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "185e15f0863c6686580e55114513ff77420353d6280b8bab925d3c7cac969723";
+ sha256 = "01f0f20141d982dbc6db2c49c3456cba85bdec92e967c9e22b467320a927463c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/uk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/uk/firefox-112.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "4b60d02bd16d187445c8c33f1ad89fedf60f8d5d0b8c00fa9fc9da61cc3245a3";
+ sha256 = "99a1fbbd80e2b74004ea492f6bc8fcff2c11fe3a393dfec69644f6f2d7a6eb09";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/ur/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/ur/firefox-112.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "9d5a717414b66bcfd11e2c1f75ff5056ef1189a371a2c13f568a61adcf4fd9d4";
+ sha256 = "5f6a004c96b55842566a37c9b7bb63e7b384ec8da9d4032fc02f61eb7995a717";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/uz/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/uz/firefox-112.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "e7981e8eb720aa9fc241e808d521f0ad6c0222c219e8a6356fdf4331ca628721";
+ sha256 = "6681c59607a6dcdf51e95d802c68cd2eee3cee8935b7a0b493fddd3c32205e16";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/vi/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/vi/firefox-112.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "7aef5cf761451e7bbd6569e28af2981b65709d3265bb96ed934d43915a3fcb17";
+ sha256 = "457590c34d1b207414192f8a1f2b54884dac2c5cfe8999aaf135ac58eb0dc731";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/xh/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/xh/firefox-112.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "d12eab3c301a28871c298f351efa84a1aa2613014029e40d8bb46c073fb7224e";
+ sha256 = "d2fafd74b04ba3cdf2de360f9f6d7e19da576d81139010fe3d80a19055a3a326";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/zh-CN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/zh-CN/firefox-112.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "92d3ab06e3a09be0691c84ffd48c4f897197253f66e6a178e5272a3d8caadf65";
+ sha256 = "30062a56f9b7cce01adc683896d921a568ced738a7bc089f679df85820d62441";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-x86_64/zh-TW/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-x86_64/zh-TW/firefox-112.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "db6dc1a6ed43970404d643cd4f6d1917e9202070719695aa9b4268756278c22c";
+ sha256 = "ac6ff13f68590aff1d7ec0e88c147ba86bd2074d98ba6586dd4f2a3a448ff38f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ach/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ach/firefox-112.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "7de9c82fe6edbe0876021f730128344d3fc1ef275191093387d662d58599cbd6";
+ sha256 = "8e5894479c8c2670ca2ca8aa2067f319e7609d2d15eb19ab6c47eedc3af02ebf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/af/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/af/firefox-112.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "c5632e4c7f4d313bfe63720855bb5ea02aa3559d96199aacdacd11de34a5d55b";
+ sha256 = "4be87cd20eae2e2e0481fee449a56db8d22fb4ebe356a7ca04db2911b025d152";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/an/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/an/firefox-112.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "34b0826655c65ac70be63308d2f6339046a859a5fe4d7e64f7969e54bd689f5f";
+ sha256 = "34c8db9bca3f337a6f081c99299fd6b07c3d69352e1032882922d380531fcc49";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ar/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ar/firefox-112.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "ab1b031a4783a3ab87199801104df777b5d46fd6034b47b2f4af29ddd031739f";
+ sha256 = "0441a66c9e246804cded5f6db9456e5d31dee3984c59b2b4b01540f92713dcf8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ast/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ast/firefox-112.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "e6e0195900e50612d58cc3f8e7cf2f74868509ce6378402484fcfa6b3611eaa8";
+ sha256 = "32089836ebcb905c17a10c7f9b02a209064c4db693c29d962bc0067ada617b1c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/az/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/az/firefox-112.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "3aa1eee51d132f20f8ceee9e391e86befad71ce9fbca64e1171af053503492f3";
+ sha256 = "50b29941e2185e0793587952009571b067e8e60a298388b7024fc4648e5d03aa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/be/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/be/firefox-112.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "77a6ea4c1d9657e4566288156479a878cd6c572770aca97aa7a94daf12ba9255";
+ sha256 = "c4848f7e1a5f50a6814d57f17a5834bc7b1286e988cc52196182291ab9aa2d7b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/bg/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bg/firefox-112.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "4d282c790d8ed4abbb7ad10de56672e8bef57347760d551b32f28a71b64de5b8";
+ sha256 = "0ae7bbb8b682b363878577ef92d146f36b48884b2deaedcbf6bc57da434758ee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/bn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bn/firefox-112.0.2.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "797b570f75c5cd4cab0fbc5abc4992eb83e1cd109c5ba2588df784827cc29762";
+ sha256 = "e5e0640cd37e4e9d115e7f67d0a90b08e34a0146356bfcd67214cb7dcfae3c9c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/br/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/br/firefox-112.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "3e4ad574d26492e53a84385a558d75b280952abf066be26771f4193e00c6b328";
+ sha256 = "f5e5149cd30fce3dd992ab09157f3975eb4823bb9f0b7a0662cbde28c64baecf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/bs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/bs/firefox-112.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "a4b862924d1c20aba4ab2fa0774b5c65509cb6f80902faeb0cac86f691f8887d";
+ sha256 = "29f609bcba5ef2fde4bd796eeae9155b9ced42da97203f527ebfa1ea038e8d81";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ca-valencia/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ca-valencia/firefox-112.0.2.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "9c2a188bc5188b79ca89ea90f4cd300f4a680fec945a1b6e663569f1f6f2e19e";
+ sha256 = "9b732ef026044892b33f5e4059e4b86ae670ed202b31735b8a26b7c86d935f80";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ca/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ca/firefox-112.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "f6031d641da6e828ea6160aa2ac1a3d9ec31efcbfa69373f33dbcfd1d6282ac0";
+ sha256 = "5e8b8ce7f063212e92bd1a23ac22a9e74642e6c69c51f2e123ba1b0756f1b95c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/cak/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cak/firefox-112.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "9a6553004abc3c548559373a2185405a1a6887898fd2236c4556948fc6faae0f";
+ sha256 = "596c1aea0b6a6634be8de4e334a2186111b6a3370cf428b6ab24c6707a588442";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/cs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cs/firefox-112.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "322f49bd3775410206107645aa1e049cf2ab58f251baf991aa65f0be8bcd867e";
+ sha256 = "fa53d85a8a7ca5af00fedbb527de4c0c4386b4c62ed7c7f3a76f9c189123954b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/cy/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/cy/firefox-112.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "ab47eaab21c51e37af812e2453f4b1685c98489a15b3bb3ed0582c8284ee4bfc";
+ sha256 = "18ee47aa148012d2d5528db5829feebbec941568221731c38f191485ca57ec0a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/da/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/da/firefox-112.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "188aeb36e3443037cb5bdb84f37db67f238c0a238b71a1ae7cf8ad9fbb49fcc4";
+ sha256 = "0c17d62a5edbddbff5bdb5ec7efd2ea32fc0e19ba7767500d0f21d15d6aa3d14";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/de/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/de/firefox-112.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "5a13dbeca2b4cd0161f5a92df210a6642e7bb6167882f42db8627ceb31d30ec8";
+ sha256 = "cb9b72b06c83a0eedf83704ff01aa6a7ae8b15a39118cdec4c6abeca6b59fc8e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/dsb/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/dsb/firefox-112.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "e1e212072872a75e17c1c082a1efdecf8fc2288d88aa44a6a349f35811b27ed8";
+ sha256 = "ece81a97a047b520aa912db9ca372a8e9550cbd1f0c8996cdf3f686068edcdf3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/el/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/el/firefox-112.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "12b61693075bf6037c3333149b77a93a09572e133f43a66b7ffbfaa6984808e3";
+ sha256 = "35076bd574b638a871f3a0a70a87b7a0b6f56b3eea8653d2888cdb4fa1fc52df";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/en-CA/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-CA/firefox-112.0.2.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "3da37342412a77622c221ca48ea80877d8597b5403b69d11c898ce12aa13fea4";
+ sha256 = "38ed101fbb4a68915c6e11eed1576c0312fcb1ec7c45264fb929f5019fa30340";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/en-GB/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-GB/firefox-112.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "80ea9f86cf37d64dfd4db5206284eae9807058596e4befa057d19985709cdb89";
+ sha256 = "06f5012d8e6ede5eeab23dfdf8eb06e20410514e13e7872ffe6b77c5bd6cf25d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/en-US/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/en-US/firefox-112.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "69a2a692718bdcd031cfe31535b2c993567d8bf6bc8d6814c43a4304e8fa470d";
+ sha256 = "b3b6537de3f8c2606d6cd119a4158c1e30ad21cd0936e9887fffe398cfa264cc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/eo/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/eo/firefox-112.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "9bc2f1ae29f742fdaafedbc6f4626456dabd276a1bfcc8569affeca3252a3311";
+ sha256 = "8eec80b82de6279eda4d1a4b740c7be1eb4c3278efd9d1ddb35235775527ac72";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/es-AR/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-AR/firefox-112.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "a964125f1c65bd031bd3bd76f79993ea4c44273adbeb95ed36de6ffaf9ad7900";
+ sha256 = "226a16beaea00f60292f4ca1275967aa266f30b0f9afd7fc7f8ef20b28db409d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/es-CL/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-CL/firefox-112.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "19ca07a13d4a2218fed1addb3d9297978b00e7e469a37294f8c3cf0aaf4f8998";
+ sha256 = "e08c2d0452fb24aa7ebff8bb937df400d18a84f6cb19e80884fc1fa5daf41590";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/es-ES/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-ES/firefox-112.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "81ba2970c01d0c1d1465b1f601c2e753b0448d307df09ae49e2ca2257b3ff593";
+ sha256 = "eefb4f5342e102b90b6350d3dc091c6286459aa69938a0e9d57b1e4624beb41b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/es-MX/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/es-MX/firefox-112.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "02605c8bdc81077a491791ffc289c6071943e5e8a7983432a96937224d91a324";
+ sha256 = "bd7424bd23b4dedfc007e15c13e250030194b4b4efee75f52ed87ef0b7059b6e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/et/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/et/firefox-112.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "6e83c5ad5eadd62122ebb3d39f6c03239e333a42616f105204ba83482c68b4fc";
+ sha256 = "66d1f747f3545aacc89e26f062052dafd48ad3bec8e8285f86764198ee325fe8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/eu/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/eu/firefox-112.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "64fa6814864a6189bfbccedc191cb9810519e196a2ddf34725a35446595f5eaf";
+ sha256 = "0cc51370fd7640ee7b9b319b5a6ea211b6fe1b5a8aa8dc36e75f7da25e8c4b98";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/fa/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fa/firefox-112.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "23c05ec2684597172470581c9369bec389709dd93b780bc888cc8ed3421e8b9f";
+ sha256 = "550cccf8b9ab72e9d9d0a37edd836c9c0c6a397c54a58bc23aacca2567055d01";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ff/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ff/firefox-112.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "ec3e121e10423b0141e94f9bc9fe16cc46c6e284c140acf24add74a3ef6fcb10";
+ sha256 = "402e4bdff0865524ceb5c295c157d7387f22682a29ac16718239af485f1f0384";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/fi/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fi/firefox-112.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "728d0c84b6d4c9deb81a8d08e3609bbecc8201649a3dac0af4dd13bbc0ac0cfd";
+ sha256 = "9f49648a46043fbbd22ec1b73b73452bdac23bb046c1bd4951f17b847c403ee9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/fr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fr/firefox-112.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "742f0ad5974032275c54fae54691061153075045f07ad71d47b93adea1d7b61a";
+ sha256 = "ab17b387391556820d9ebdf4dc28bbc90e3e644d5364ab48faf49e0b378c1b5c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/fur/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fur/firefox-112.0.2.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "225f63643a67fac0eb2db946e819afb730ed32a364a61546d80d192cfd89e530";
+ sha256 = "b1420357530394c326a85f06c0b66cf1a7f1f92aed13b7e04fcf49f9e492033a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/fy-NL/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/fy-NL/firefox-112.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "24ef6ed559bfb5811a482883bd33cbc3a9412141a3f487121a1aa1f5e5893b2a";
+ sha256 = "1758f2ce57166b97182c02904970eedc00cb8c5195f7872f7edbc63f0443d184";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ga-IE/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ga-IE/firefox-112.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "a8bef67521297b9b6a089cd7c1b5c2c19d5d2a1845bb73b97beb70b1eb046f80";
+ sha256 = "05f0ce176ef1ed1df62e56e57ca78c2da4181769213c62a84dfd1486bd6c0291";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/gd/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gd/firefox-112.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "4edfd3f269213dddabc6682893a27c24fc69614160cd19e3da3ca24906a571a8";
+ sha256 = "c71cf775a36b2e40512fbb514d18f7d1e5734bb2bf9ce3753fa992178c71cc84";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/gl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gl/firefox-112.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "4cfb046bbd7e70029ad697abcb40536f34e8d6c22228ea4cc79f4dd36a48d5c2";
+ sha256 = "527a3b3175a70e4309194ed8ec12d2735dfa51c6830a62f7ca202553f85038ff";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/gn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gn/firefox-112.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "001c3206f38b9c7053e3ae6b068fb245bcde6ace31be322f7bfd5c2c9f4c5f67";
+ sha256 = "125222a06c0b25f0187907cc66d04a15638d8f162544dfa53af3bc85a0922396";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/gu-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/gu-IN/firefox-112.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "1af0d38f6be210f9f5aa62752982ee95e115d3eade6e10bfbd9b45e699d3c876";
+ sha256 = "49a051e5a95b0738c7f5e97ddd3679ad062c83d80395d71fd7e5a9988577db16";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/he/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/he/firefox-112.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "32d34998b4cb5f30d7f21695bb7c50511c9810f652b387b87566315bd51a6688";
+ sha256 = "f0e992f6b27a99f67a252fbd67fbe1511230467c3b2ede7b0d3395c4bebe040b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/hi-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hi-IN/firefox-112.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "8acdf419e6a3dd191f7e8d10c1d33eac02ef8ec93ea6486278b1ed3182c93536";
+ sha256 = "d4639508f927056cace33d0d1adbdbad13852f05b00ff5b439bbd956c7cb5f67";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/hr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hr/firefox-112.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "ebac36e1550d70237306d3f69db9a029333c2e7cdcd0321fc4f0da8dee3c8e9f";
+ sha256 = "29cd33f9d173a416e9e8a825ec1b6b7656eb429475befb3debed0f9319c4f9ae";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/hsb/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hsb/firefox-112.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "6b5eea0bccf7a82484e7a0dab090716ebdb82a79151abc9d77aec1d5032356d3";
+ sha256 = "da044123db5f309920f49075d6b2c2d379423094f79cd82ff857cb8e55a80634";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/hu/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hu/firefox-112.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "3abded26ade27554c48c6d0903d6cc5c5f1576766979542c80746c955cdbc9f4";
+ sha256 = "4212ff43a627d29a081effc62cd8a44db79f266c1f2a9f64fb610cea7930b7d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/hy-AM/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/hy-AM/firefox-112.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "50188c1333f393e7bb77d50d2adef4b52950bfa86fca993594f8db01a02f4a48";
+ sha256 = "fefa97627dfd5e368057ad40be7ac15a397e2915f82f4dbaafccfcbacf0d96f5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ia/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ia/firefox-112.0.2.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "cd2d66e303293cc7e81d2f571a5ad76f85bacaa59191ec31dff62ea31d4b0ccb";
+ sha256 = "4fd80715413cb0eeb63c615764b287ca126f2cc09014f4dfd213f2f7be81b64e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/id/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/id/firefox-112.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "f2ebdc1585a49b2b489c8ac95240d0f8aa51473d0b78fdaeac234b6020696083";
+ sha256 = "e43da18d58eeb275888988471307004ea7efbf6ccd88c6e03dc16e5bfa548e08";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/is/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/is/firefox-112.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "095d254ff1e7fa05ac0723adf48c532e38fc5f7bb6cec81dc10139e0e070049f";
+ sha256 = "a2ba240444cbc96d56b6d4a851da6f80b783f9fd74ab0b89a672f88173b33a0f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/it/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/it/firefox-112.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "0b731f69e7a08e6d022f0225b9992812e4d63216195f6519ce7b99ab9d3c368a";
+ sha256 = "4f908a9c9386c214301ea3cd6e8298d7aea9ef94ec8c92062bcf6a98ff7d5c7d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ja/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ja/firefox-112.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "f3c84a776baef1a7b5ba7e232ebec5df71d06bf9317bcdd2cb6ab6ff72ef1691";
+ sha256 = "c69b6cf1fde3d7a76f258732f9aaa558e1315ec0dd83bd3f2a6af02c88d05bef";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ka/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ka/firefox-112.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "cddc9cb826352cc94f42e600068f586c1e74c53d77df6c4cebe4f3008e3a9e90";
+ sha256 = "6c1fb4069bece39160c3d8de030c8d8d8e7f698784199aeff9b86cb5d6af3803";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/kab/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kab/firefox-112.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "dbc1b443083dda4bcf9b6fe76a6d4a032c4628d02555f0eda291b1ad99d597c3";
+ sha256 = "e14bbc22e6f922714109db165cec4f8dcd9c4a3672b37519e3df7e0e9fedcfe5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/kk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kk/firefox-112.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "5e8b8d68697fb75cbfd48e6b78a76bbbd0a972cffc3ae43f8b192696c77c72ed";
+ sha256 = "92c694a35a19cede811364ad0bad3cdb33a62de8a6effe742a5c57ba865ac5be";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/km/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/km/firefox-112.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "737db59818e7ce5fef6cdb9cf2d5bae9ed5205aef2f4924839fd2428fa70d965";
+ sha256 = "2e4f6f21b44e8a2812961bd2e625bfd8b070816ea3640cee163d177dfe090498";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/kn/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/kn/firefox-112.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "80a4833c598ae80f7a3dfc8b357041eac8c9061dc2c6dba8c88bea71f9dbd937";
+ sha256 = "ec99d9517002fa62cdc210c57fd9ef3a38faf35fd3ce34c24910b42673b67133";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ko/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ko/firefox-112.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "2000ff98bbaeab440941b366b2e311d3d73d2d0cdf6aca9873a9fc5016ad7b7b";
+ sha256 = "3fb1d5ba4c8f6b3824c72c561e45834054113f70ccd8087ff8c9a957ee9dce4f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/lij/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lij/firefox-112.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "186699b7517b5d8659a76627127533b204642dc417374a3fccef4914fdc13a24";
+ sha256 = "d8225a7dfb4f93faff92f853fef3001c737a83328ea51618aaa4f8aab44fb902";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/lt/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lt/firefox-112.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "98ad4e67f3ff82c39b83bdc671c9ea91327a5aef0bb1a7c6ca9ea3e5c6ff2879";
+ sha256 = "631230b71052285b7d58b272839fdfb6b86457690c3036094faa50f11cad0ae4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/lv/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/lv/firefox-112.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "2cbe7f2765dada8f7c1ff1af7b17f6b51be2ec5257822d76f585ac487645e047";
+ sha256 = "31a76eed0cddd4bb7ba24c063d0936d4f0e36e3efc18f8f0e504bd1bc3542f99";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/mk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/mk/firefox-112.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "567fcd3722b4664f68952fafe13fb0ab0e04fe858c2b3f6021d2726030a6a483";
+ sha256 = "d2987264002bb665866507da3e6df5a04d72834c98f89a996cd24ab968b0a4a3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/mr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/mr/firefox-112.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "0ab08deea333ea66b5081a4fc418bdecff8179e2e9a73487de32ef45c59771b0";
+ sha256 = "d39f7668e6548de3e5a33265ea5ee6b99d801a97aff7e2cc12f054ac6042655f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ms/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ms/firefox-112.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "0f23f6fd9d3bbe137eb8f321b6de1f22b5fe16a4199dc037e870aa276aa14c0c";
+ sha256 = "1d9d5aef69d76136d0b02313277bc79069f7ad778ff700430fc91481dfb9a2ca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/my/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/my/firefox-112.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "9d08dc125ec7d2984459bcee7496ad931812dcdd18fbef19631c6bd0ea336c68";
+ sha256 = "5ce8128deacde8fcd65f0dc40919cc1a47f2699258be3b19c3cddc6766df8185";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/nb-NO/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nb-NO/firefox-112.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "1ee31e45e279ba448336d7aa9701b310db153b0ac8ac2fd1d6fc5120488b4e82";
+ sha256 = "b6ab5e4dc4566b9e7a2147b487cbe6cac2661168d2d2a9af19fdb8054d3fea6b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ne-NP/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ne-NP/firefox-112.0.2.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "3b6e001e3982c881106c9f64cfd614f1f8d998ce464bf2205d5826fc88fa49d3";
+ sha256 = "0b738935a8b514fa94137713a64b3343747af647f92c89a8650300e74fe06c3f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/nl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nl/firefox-112.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "ace49029f77f96ca0f94ba9fc6c2fa3cdd53201b75899cfc3cb9579a6cace0b1";
+ sha256 = "43bea3aaf6394e346d5a7a94fa9b6d272eadbd24ca4c905e5ec19d24070f5763";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/nn-NO/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/nn-NO/firefox-112.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "f3d2305b291234eb655050a384190f4510d0f9dba85aeef019106cc0911061eb";
+ sha256 = "21bbb6ea695b81932168ce7ed16b14a3204b5cbd8cd4963544dedf02d1aab10e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/oc/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/oc/firefox-112.0.2.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "0595e5220ac48389ef027f6ec2f03ff8ba3e888e54d48b35973ef45b0b9f60fd";
+ sha256 = "91bbc293db4e4397c0502d38fcb9c5fbadeb7834ffab87e337bd33b96afe9911";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/pa-IN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pa-IN/firefox-112.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "92170c855af452f272443c1f58d32013161b15a442ebd7153e8df238a44c1a08";
+ sha256 = "03b9d04b28df436bdab3d792f15e5a59f30073c50f9f1697d0062c6defcd0f4c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/pl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pl/firefox-112.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "a04ea9e555b7b07c24768bda598e027a21d2264556d0b04ed86c66d72deab303";
+ sha256 = "84b532132fcc5e832d71a97de46f14fb2ae8a0855bcb88b98b77c73a22a9d742";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/pt-BR/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pt-BR/firefox-112.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "bb233d788561988839b7f598e7e518c5e91812e899741fe70b9937458d3cdf93";
+ sha256 = "346524c9dd078c68227e681afd0344b1574623a88abb025dbadd7ecfad4759c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/pt-PT/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/pt-PT/firefox-112.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "397a54320e2a0d5e48fed911e42f4257b746a9997a158f55674a5e99c16e776b";
+ sha256 = "e14516096e990defff67deb73aaae9448b4a14ce660829aa7c392d9a45b3891f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/rm/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/rm/firefox-112.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "2d01ae50894853b752001f9157f3c7281dcb14cc09209ec6d7a2113094ba30b3";
+ sha256 = "7c6e7381e963eb9d7100c1d380df759107d5baf4f4862177986adb2068844ac5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ro/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ro/firefox-112.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "e388080e9eef604cd54aaadd25a8815d52e8fbfaac6479a4198532b9c000be0d";
+ sha256 = "6b9d0dd1256f50088706d1c695d08d92a970f5b1ad6e536647e4b917ed3758d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ru/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ru/firefox-112.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "bec635e4903cecd80828a935381f66638a3be49ab820989976f527fd3484c5f0";
+ sha256 = "52e4449fac2a97b5db5ca525edc664e0fb25519df4472e8f820b4233c33411ae";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sc/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sc/firefox-112.0.2.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "373801a06d137c0c7d729e995ed899586aabb23c93d3c141079ed3e6fb0c8c78";
+ sha256 = "3b011a7316737f53219e942cdb62938d961826e284246294097a4505e8ebeb71";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sco/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sco/firefox-112.0.2.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "98fa91e108fd6ddd6d05d03015250a7a8a6cfdef407cf0e06b4b693a5f783536";
+ sha256 = "37d7f80776a35165ec071e8dff8d390db5a11e5f8f11814b9c7c0fc3d18fbb24";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/si/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/si/firefox-112.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "d48c658c156b90cae5605db1ae65ff0ef413f036b07ed761fcd10b8812ac0f66";
+ sha256 = "3acf9722a50c1baa35bafd323876882999b353c9b3b39a38ea8085d44cc27694";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sk/firefox-112.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "a4905df616bb512f764179d2a7befad120fcfefaae922e653ef7f1efecca283b";
+ sha256 = "c2571e8d25564675ee4c11126e3a8dee278b11ba4be1f333c4a0feb83d78f3a6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sl/firefox-112.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "b23a531371d80f79a3698cca1e4eaba2326da9318fce7df3dafc3bde62a446a3";
+ sha256 = "d12738c69e586a45bb45339b4c5e4dbe9812eb161517479d5e09c1d84ac8e6b8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/son/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/son/firefox-112.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "89c998c5ee99267e4d001a0be5a99eea34f75cb4d3e2c6af1db72a74a57291b0";
+ sha256 = "dbde4f4fb12d2c76ec6ebb478f23e23914af66f417960ee1459ad7d5af85a306";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sq/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sq/firefox-112.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "c353caca756e36a6e1e9434b9992bafd7fc379dcd0408a2f64d5434d99fbe022";
+ sha256 = "a588d5a5328794397d4b2b85800343f86f5e7219f1419e9c9cfc1102e686cec0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sr/firefox-112.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "d8f2caed8388230b2d37d4228ab53bd3b7dde0fd597d7ff16d303e1506f40c1e";
+ sha256 = "bb2539149ab918bb256946dbb1c229b161ace148c6bcf1882329460f5c37b62d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/sv-SE/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/sv-SE/firefox-112.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "e82906e6f4d3cf49d644a54d840ad6f1de0c58c9820c07e158193eb659467bb6";
+ sha256 = "af57326935c3b392d80ee6148d02caf3c371adb0e1feb509c992e38394a0285c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/szl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/szl/firefox-112.0.2.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "84c74dc9358f2ba4db8b37c751b1b694396f66d6c6005dd314506ca16f0868b6";
+ sha256 = "79a565f7d7954385f0bd2d24004a9915611c23659bf6da928817cb876b1b2130";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ta/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ta/firefox-112.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "439900ed3e9fb7f3c18fd67ae16e6b42294957bf11c049326e02bced4b88da9d";
+ sha256 = "92c515d9e7686579833c211662022fc81b9342f3b69672454ca7f88ae40912c5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/te/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/te/firefox-112.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "493b1a2e2644689920b506115e15b3153fc492ffd0a0e2287947335f0e3aea6c";
+ sha256 = "3e1e2280e586ec818d21213e83ef09cff59d85802b40d297d24937312c9b0f36";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/th/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/th/firefox-112.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "febec24221a8cb6004931ae115ee881f8a342a999cd3ba90c06090eb7d65595d";
+ sha256 = "c5f564feeca7ee1ed94749cbc5864bc1ed2905a995d11f3551c7ec8d2be82d16";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/tl/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/tl/firefox-112.0.2.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "dbacf21e7efd9ada61654027738d5bc1b87862afbcfef951332bd3b80f73ef9b";
+ sha256 = "32ccb86053d91355cb937af203297051cf32ef09085199924ac62374f3b5a43c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/tr/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/tr/firefox-112.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "7fc6816c28abe9db2477b3b96729096e770fca7bf044c38fdfbb21590945536d";
+ sha256 = "0b97e08b5852bf2ed2ed19098e850fc7670772a797c21bec561ff2bed55b3679";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/trs/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/trs/firefox-112.0.2.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "10d9a48645a7c4eabbc9ffc62855fd998e0dba2b2fa566c83a14a5f5395eb0d8";
+ sha256 = "01a7242176bfd92ca3aad41305f5eac96d191c6cc8790981e4dbf4f0ad0792ce";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/uk/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/uk/firefox-112.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "e33d93724003d8b55f76e9565192bb2797997aa66f2d35c12dc7086f200c191a";
+ sha256 = "4b4a9642cf069bca7c5f01d76c2c8503530f37810cc09fe72ad73f213c96e78b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/ur/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/ur/firefox-112.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "aa0cca88be261d10dea5f8449e211c0d7fe72824eb971f46de154be76d5a2df1";
+ sha256 = "47a4e99ec6dd1d262b21e432485c2bef3ef112971fdecbb01cab5715a868bccb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/uz/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/uz/firefox-112.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "08877588e0d027deb9cd9db2fe45e1169f74dd074f7c886df5d6502343e14c11";
+ sha256 = "4ea75c2774cb552b962df7aa851bf7ae102dfb1de72637143784ba52e21e8d08";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/vi/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/vi/firefox-112.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "74971ee5d592f65872f71fd2049ce73ce4ed65bbc513b36844e1ae45aa44c807";
+ sha256 = "6fba17093fa1146955e614e49faa9aba235a1b9cc071e2622e6fd2f089049fd6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/xh/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/xh/firefox-112.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "9b8579e0c3361e7008aa2e4757645fda1254c63450dc2e63a79a20b032923b31";
+ sha256 = "bf02cdb2d591dec4fb86b548fc17d6e7d1a7e147b4a8aec0eb5282227f82b575";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/zh-CN/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/zh-CN/firefox-112.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "d2f878182fc94d4630343fe367221a202945d8ef5731a3f790b101193ac0d4d3";
+ sha256 = "2dd64475a0ea10963d04be835e1ce45a7f89a3dbd9f838b7913dd64a93197629";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/112.0/linux-i686/zh-TW/firefox-112.0.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/112.0.2/linux-i686/zh-TW/firefox-112.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "8e76787f20c6b2b9cf2796e35dcc9b5ab4f335dd441f34627f1ffc505759c0c6";
+ sha256 = "a72f3dd7664de9f976e5f3c7fc8ab5d1ae4a3a9fa1e2d548d2059e76d3a8d53d";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index ee07ee23e8..8cac0d6fe1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -30,6 +30,7 @@
, cargo
, dump_syms
, makeWrapper
+, mimalloc
, nodejs
, perl
, pkg-config
@@ -88,7 +89,7 @@
, ffmpegSupport ? true
, gssSupport ? true, libkrb5
, jackSupport ? stdenv.isLinux, libjack2
-, jemallocSupport ? true, jemalloc
+, jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages
, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run
, pipewireSupport ? waylandSupport && webrtcSupport
@@ -103,7 +104,7 @@
# WARNING: NEVER set any of the options below to `true` by default.
# Set to `!privacySupport` or `false`.
-, crashreporterSupport ? !privacySupport && !stdenv.hostPlatform.isRiscV, curl
+, crashreporterSupport ? !privacySupport && !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isMusl, curl
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, mlsAPISupport ? geolocationSupport
@@ -221,12 +222,20 @@ buildStdenv.mkDerivation ({
"profilingPhase"
];
- patches = lib.optionals (lib.versionOlder version "102.6.0") [
+ patches = lib.optionals (lib.versionAtLeast version "112.0" && lib.versionOlder version "113.0") [
(fetchpatch {
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
- name = "rust-cbindgen-0.24.2-compat.patch";
- url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch";
- hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
+ # Crash when desktop scaling does not divide window scale on Wayland
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1803016
+ name = "mozbz1803016.patch";
+ url = "https://hg.mozilla.org/mozilla-central/raw-rev/1068e0955cfb";
+ hash = "sha256-iPqmofsmgvlFNm+mqVPbdgMKmP68ANuzYu+PzfCpoNA=";
+ })
+ ] ++ lib.optionals (lib.versionOlder version "114.0") [
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1830040
+ # https://hg.mozilla.org/mozilla-central/rev/cddb250a28d8
+ (fetchpatch {
+ url = "https://git.alpinelinux.org/aports/plain/community/firefox/avoid-redefinition.patch?id=2f620d205ed0f9072bbd7714b5ec1b7bf6911c12";
+ hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A=";
})
]
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch
@@ -299,25 +308,37 @@ buildStdenv.mkDerivation ({
# RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
- '' + lib.optionalString pgoSupport ''
- if [ -e "$TMPDIR/merged.profdata" ]; then
- echo "Configuring with profiling data"
- for i in "''${!configureFlagsArray[@]}"; do
- if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
- unset 'configureFlagsArray[i]'
- fi
- done
- configureFlagsArray+=(
- "--enable-profile-use=cross"
- "--with-pgo-profile-path="$TMPDIR/merged.profdata""
- "--with-pgo-jarlog="$TMPDIR/jarlog""
- )
- else
- echo "Configuring to generate profiling data"
- configureFlagsArray+=(
- "--enable-profile-generate=cross"
- )
- fi
+ '' + lib.optionalString pgoSupport ''
+ if [ -e "$TMPDIR/merged.profdata" ]; then
+ echo "Configuring with profiling data"
+ for i in "''${!configureFlagsArray[@]}"; do
+ if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then
+ unset 'configureFlagsArray[i]'
+ fi
+ done
+ configureFlagsArray+=(
+ "--enable-profile-use=cross"
+ "--with-pgo-profile-path="$TMPDIR/merged.profdata""
+ "--with-pgo-jarlog="$TMPDIR/jarlog""
+ )
+ ${lib.optionalString stdenv.hostPlatform.isMusl ''
+ LDFLAGS="$OLD_LDFLAGS"
+ unset OLD_LDFLAGS
+ ''}
+ else
+ echo "Configuring to generate profiling data"
+ configureFlagsArray+=(
+ "--enable-profile-generate=cross"
+ )
+ ${lib.optionalString stdenv.hostPlatform.isMusl
+ # Set the rpath appropriately for the profiling run
+ # During the profiling run, loading libraries from $out would fail,
+ # since the profiling build has not been installed to $out
+ ''
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}"
+ ''}
+ fi
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
@@ -334,6 +355,9 @@ buildStdenv.mkDerivation ({
configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key")
'' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) ''
export MOZILLA_OFFICIAL=1
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator
+ export LD_PRELOAD=${mimalloc}/lib/libmimalloc.so
'';
# firefox has a different definition of configurePlatforms from nixpkgs, see configureFlags
@@ -473,6 +497,12 @@ buildStdenv.mkDerivation ({
makeFlags = extraMakeFlags;
separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true;
+ env = lib.optionalAttrs stdenv.hostPlatform.isMusl {
+ # Firefox relies on nonstandard behavior of the glibc dynamic linker. It re-uses
+ # previously loaded libraries even though they are not in the rpath of the newly loaded binary.
+ # On musl we have to explicity set the rpath to include these libraries.
+ LDFLAGS = "-Wl,-rpath,${placeholder "out"}/lib/${binaryName}";
+ };
# tests were disabled in configureFlags
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index a7c89c1546..1619f23016 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
- version = "112.0";
+ version = "112.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39";
+ sha512 = "2cd7adeb6c9a39ad4c5366982e0e58382d7f205e6f2cee02b8ec2867034d1c0c884eeeb870a35db35cba60fa9c84aea73f8c77cfd9f36b5146dde06464aaabd1";
};
meta = {
@@ -29,11 +29,11 @@ rec {
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
- version = "112.0b9";
+ version = "113.0b9";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "95d17d5c7415d98b24d41b4419c76adb757f552957a69126c0031cb1c8f16a55b765f66b2e7a45531a643d5c713dea883bde4d436b82cb6661b44f113e890127";
+ sha512 = "de052b3df75a0d0e00ff6548dc5a47ca543855e819187a5d630d7352548ae5082ddc29c68c36f8effc421fae13fdb7e67c9b0fb63470af4e31fc360bc319b7df";
};
meta = {
@@ -56,12 +56,12 @@ rec {
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
- version = "112.0b9";
+ version = "113.0b9";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "d798803dca258007d355a181263b803365a13385a1bc09bdada07336add019bd36db197cdfa3749240f563641167a9d9e5c0539e58ecd369f575a219a4064b74";
+ sha512 = "193b4b96dd3dfe9d95dc11ddc089a433a6fa4aff5d55d8294ff638dccacdd141b0977f9d87b7cb6c4f4f64af22166a517f2e751fee7059cd7e77ddb8ea977466";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 1e8240d680..6b08a891ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -5,7 +5,7 @@
## various stuff that can be plugged in
, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
, gnome/*.gnome-shell*/
-, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire
+, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, web-eid-app, pipewire
, tridactyl-native
, fx_cast_bridge
, udev
@@ -65,6 +65,7 @@ let
[ ]
++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
++ lib.optional (cfg.enableBukubrow or false) bukubrow
+ ++ lib.optional (cfg.enableEUWebID or false) web-eid-app
++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
index c4e16d4326..1af17ad7aa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation {
# https://github.com/SerenityOS/serenity/issues/17062
substituteInPlace main.cpp \
--replace "./SQLServer/SQLServer" "$out/bin/SQLServer"
+ # https://github.com/SerenityOS/serenity/issues/10055
+ substituteInPlace ../Meta/Lagom/CMakeLists.txt \
+ --replace "@rpath" "$out/lib"
'';
nativeBuildInputs = [
@@ -49,13 +52,7 @@ stdenv.mkDerivation {
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
];
- env.NIX_CFLAGS_COMPILE = toString ([
- "-Wno-error"
- ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") [
- # error: use of undeclared identifier 'aligned_alloc'
- "-include mm_malloc.h"
- "-Daligned_alloc=_mm_malloc"
- ]);
+ env.NIX_CFLAGS_COMPILE = "-Wno-error";
# https://github.com/SerenityOS/serenity/issues/10055
postInstall = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix
index b4068d5acf..4dde2d57d7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/default.nix
@@ -29,7 +29,6 @@ in
}).override {
crashreporterSupport = false;
enableOfficialBranding = false;
- pgoSupport = false; # Profiling gets stuck and doesn't terminate.
}).overrideAttrs (prev: {
MOZ_REQUIRE_SIGNING = "";
})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
index 6b32c4d802..a84b2a038a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "112.0-1",
+ "packageVersion": "112.0.1-2",
"source": {
- "rev": "112.0-1",
- "sha256": "1qjckchx20bf20z05g8m7hqm68v4hpn20fbs52l19z87irglmmfk"
+ "rev": "112.0.1-2",
+ "sha256": "1pm4ilc2zx6qx3qqjl7ypl51mcfwq22abi850kq7l3pznb2z0ljw"
},
"firefox": {
- "version": "112.0",
- "sha512": "6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39"
+ "version": "112.0.1",
+ "sha512": "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
index d1631feb87..1bb3fbc97d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.28";
+ version = "2.29";
pname = "links2";
src = fetchurl {
url = "${meta.homepage}/download/links-${version}.tar.bz2";
- sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ=";
+ sha256 = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg=";
};
buildInputs = with lib;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix
new file mode 100644
index 0000000000..627056795c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix
@@ -0,0 +1,235 @@
+{ lib
+, stdenv
+, fetchurl
+, makeDesktopItem
+, copyDesktopItems
+, makeWrapper
+, writeText
+
+# Common run-time dependencies
+, zlib
+
+# libxul run-time dependencies
+, atk
+, cairo
+, dbus
+, dbus-glib
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gtk3
+, libxcb
+, libX11
+, libXext
+, libXrender
+, libXt
+, libXtst
+, mesa
+, pango
+, pciutils
+
+, libnotifySupport ? stdenv.isLinux
+, libnotify
+
+, audioSupport ? mediaSupport
+, pulseaudioSupport ? mediaSupport
+, libpulseaudio
+, apulse
+, alsa-lib
+
+# Media support (implies audio support)
+, mediaSupport ? true
+, ffmpeg
+
+# Extra preferences
+, extraPrefs ? ""
+}:
+
+let
+ libPath = lib.makeLibraryPath (
+ [
+ alsa-lib
+ atk
+ cairo
+ dbus
+ dbus-glib
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ gtk3
+ libxcb
+ libX11
+ libXext
+ libXrender
+ libXt
+ libXtst
+ mesa # for libgbm
+ pango
+ pciutils
+ stdenv.cc.cc
+ stdenv.cc.libc
+ zlib
+ ] ++ lib.optionals libnotifySupport [ libnotify ]
+ ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+ ++ lib.optionals mediaSupport [ ffmpeg ]
+ );
+
+ tag = "mullvad-browser-102.9.0esr-12.0-2-build1";
+ version = "12.0.4";
+ lang = "ALL";
+
+ srcs = {
+ x86_64-linux = fetchurl {
+ url = "https://github.com/mullvad/mullvad-browser/releases/download/${tag}/mullvad-browser-linux64-${version}_${lang}.tar.xz";
+ hash = "sha256-q4dTKNQkcqaRwiF25iVOQSvwVLA3tJRlQ4DzC3tuG5A=";
+ };
+ };
+
+ distributionIni = writeText "distribution.ini" (lib.generators.toINI {} {
+ # Some light branding indicating this build uses our distro preferences
+ Global = {
+ id = "nixos";
+ version = "1.0";
+ about = "Mullvad Browser for NixOS";
+ };
+ });
+
+ policiesJson = writeText "policies.json" (builtins.toJSON {
+ policies.DisableAppUpdate = true;
+ });
+in
+stdenv.mkDerivation rec {
+ pname = "mullvad-browser";
+ inherit version;
+
+ src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+ nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+
+ desktopItems = [(makeDesktopItem {
+ name = "mullvadbrowser";
+ exec = "mullvad-browser %U";
+ icon = "mullvad-browser";
+ desktopName = "Mullvad Browser";
+ genericName = "Web Browser";
+ comment = meta.description;
+ categories = [ "Network" "WebBrowser" "Security" ];
+ })];
+
+ buildPhase = ''
+ runHook preBuild
+
+ # For convenience ...
+ MB_IN_STORE=$out/share/mullvad-browser
+
+ # Unpack & enter
+ mkdir -p "$MB_IN_STORE"
+ tar xf "$src" -C "$MB_IN_STORE" --strip-components=2
+ pushd "$MB_IN_STORE"
+
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "mullvadbrowser.real"
+
+ # mullvadbrowser is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
+ mv mullvadbrowser.real mullvadbrowser
+
+ # store state at `~/.mullvad` instead of relative to executable
+ touch "$MB_IN_STORE/system-install"
+
+ # Add bundled libraries to libPath.
+ libPath=${libPath}:$MB_IN_STORE
+
+ # apulse uses a non-standard library path. For now special-case it.
+ ${lib.optionalString (audioSupport && !pulseaudioSupport) ''
+ libPath=${apulse}/lib/apulse:$libPath
+ ''}
+
+ # Prepare for autoconfig.
+ #
+ # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+ cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts,$MB_IN_STORE/fonts,"
+
+ mkdir -p $out/bin
+
+ makeWrapper "$MB_IN_STORE/mullvadbrowser" "$out/bin/mullvad-browser" \
+ --prefix LD_LIBRARY_PATH : "$libPath" \
+ --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
+ --set-default MOZ_ENABLE_WAYLAND 1
+
+ # Easier access to docs
+ mkdir -p $out/share/doc
+ ln -s $MB_IN_STORE/Data/Docs $out/share/doc/mullvad-browser
+
+ # Install icons
+ for i in 16 32 48 64 128; do
+ mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
+ ln -s $out/share/mullvad-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/mullvad-browser.png
+ done
+
+ # Check installed apps
+ echo "Checking mullvad-browser wrapper ..."
+ $out/bin/mullvad-browser --version >/dev/null
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ # Install distribution customizations
+ install -Dvm644 ${distributionIni} $out/share/mullvad-browser/distribution/distribution.ini
+ install -Dvm644 ${policiesJson} $out/share/mullvad-browser/distribution/policies.json
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
+ homepage = "https://www.mullvad.net/en/browser";
+ changelog = "https://github.com/mullvad/mullvad-browser/releases/tag/${tag}";
+ platforms = attrNames srcs;
+ maintainers = with maintainers; [ felschr ];
+ # MPL2.0+, GPL+, &c. While it's not entirely clear whether
+ # the compound is "libre" in a strict sense (some components place certain
+ # restrictions on redistribution), it's free enough for our purposes.
+ license = with licenses; [ mpl20 lgpl21Plus lgpl3Plus free ];
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
index 99ec447b6d..6eb2b6f1b5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix
@@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
- version = "97.0.4719.43";
+ version = "98.0.4759.6";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
- hash = "sha256-VZVR7oE2GJwVo1M2oHFWuzzyTphJARpeJX/tbAPvwEg=";
+ hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ=";
};
unpackPhase = "dpkg-deb -x $src .";
@@ -137,5 +137,6 @@ stdenv.mkDerivation rec {
platforms = [ "x86_64-linux" ];
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ maintainers = with maintainers; [ kindrowboat ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
index c361fbd07e..74150b75fa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -45,7 +45,7 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
- version = "32.1.0";
+ version = "32.1.1";
src = fetchFromGitea {
domain = "repo.palemoon.org";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
- sha256 = "sha256-yfXcHoPdTknryYFV8mBWHvzs68oELqsJjTC/nT4SMB8=";
+ sha256 = "sha256-Z9dBYO5AGDYRLlnEfHUu6thgc2a8OK/tPuRzwp0j9J8=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 13e0c8b817..b6e06da987 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -38,7 +38,7 @@
buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication;
pname = "qutebrowser";
- version = if isQt6 then "unstable-2023-03-19" else "2.5.3";
+ version = if isQt6 then "unstable-2023-04-18" else "2.5.3";
in
assert withMediaPlayback -> gst_all_1 != null;
@@ -54,8 +54,8 @@ buildPythonApplication {
fetchFromGitHub {
owner = "qutebrowser";
repo = "qutebrowser";
- rev = "294e73660c1f3d1aff50843c25e2f8f7574c4332";
- sha256 = "sha256-vXMME9vqB4C4MScT9j7lOz4Bvu5R8nHFKi+uz9mbqtg=";
+ rev = "d4cafc0019a4a5574caa11966fc40ede89076d26";
+ hash = "sha256-Ma79EPvnwmQkeXEG9aSnD/Vt1DGhK2JX9dib7uARH8M=";
}
# the release tarballs are different from the git checkout!
else fetchurl {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index cfb06eba69..4af2f0286d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, fetchurl
, makeDesktopItem
+, writeText
# Common run-time dependencies
, zlib
@@ -87,7 +88,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "12.0.4";
+ version = "12.0.5";
lang = "ALL";
@@ -99,7 +100,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- hash = "sha256-VT0bD4v8SBq0emFYsxELreY4o+u+FQfyBEnSMzmRd7Y=";
+ hash = "sha256-V4BUs30h0+AKNuNsHuRriDXJ0ZzrIsg2SYn4GPZS6Hs=";
};
i686-linux = fetchurl {
@@ -109,9 +110,22 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- hash = "sha256-mi8btxI6de5iQ8HzNpvuFdJHjzi03zZJT65dsWEiDHA=";
+ hash = "sha256-TUfS31EjAi/hgVjCKT/T5Jx8iCYXB/3EXPVm1KSqXLk=";
};
};
+
+ distributionIni = writeText "distribution.ini" (lib.generators.toINI {} {
+ # Some light branding indicating this build uses our distro preferences
+ Global = {
+ id = "nixos";
+ version = "1.0";
+ about = "Tor Browser for NixOS";
+ };
+ });
+
+ policiesJson = writeText "policies.json" (builtins.toJSON {
+ policies.DisableAppUpdate = true;
+ });
in
stdenv.mkDerivation rec {
pname = "tor-browser-bundle-bin";
@@ -132,7 +146,9 @@ stdenv.mkDerivation rec {
categories = [ "Network" "WebBrowser" "Security" ];
};
- buildCommand = ''
+ buildPhase = ''
+ runHook preBuild
+
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
interp=$(< $NIX_CC/nix-support/dynamic-linker)
@@ -209,7 +225,7 @@ stdenv.mkDerivation rec {
// Insist on using IPC for communicating with Tor
//
- // Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
+ // Defaults to creating \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
@@ -275,7 +291,7 @@ stdenv.mkDerivation rec {
export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
# Enter local state directory.
- REAL_HOME=\$HOME
+ REAL_HOME=\''${HOME%/}
TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
HOME=\$TBB_HOME
@@ -331,6 +347,7 @@ stdenv.mkDerivation rec {
echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");"
echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");"
echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");"
+ echo "user_pref(\"network.proxy.socks\", \"file://\$XDG_RUNTIME_DIR/Tor/socks.socket\");"
} >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js"
# Lift-off
@@ -416,6 +433,18 @@ stdenv.mkDerivation rec {
echo "Checking tor-browser wrapper ..."
TBB_HOME=$(mktemp -d) \
$out/bin/tor-browser --version >/dev/null
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ # Install distribution customizations
+ install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
+ install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index c4dddf8713..b01b12764b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -23,7 +23,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "5.7.2921.63";
+ version = "6.0.2979.15";
suffix = {
aarch64-linux = "arm64";
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
- aarch64-linux = "sha256-Os2A3kbeuMIn9TFp8Ze+TwHDYLkVvECJF3UDMsQq5yU=";
- x86_64-linux = "sha256-t9CYf3I+IrKjOD96tBZQGR3xwzPrZvnD1JvPMgTjz0M=";
+ aarch64-linux = "sha256-6rETxeExtHxWrKFO0MHzjLgnaHUeREVqsOB9264jZr8=";
+ x86_64-linux = "sha256-vvN0AxrKotphYIpkyOKHBgEOQtF4LvYBV1cB591ICbc=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
index d9374cf65d..828fbd5949 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/yandex-browser/default.nix
@@ -46,15 +46,16 @@
, systemd
, at-spi2-atk
, at-spi2-core
+, libqt5pas
}:
stdenv.mkDerivation rec {
pname = "yandex-browser";
- version = "22.9.1.1110-1";
+ version = "23.3.1.906-1";
src = fetchurl {
url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";
- sha256 = "sha256-u6pY7AmXgnkSVuko+PUyhDqY72i+UHv7qmePbu2wAf0=";
+ sha256 = "sha256-hQwAHtPUcGSDKD7SmWa8H1f/T4Imu9061tIvenw0KWQ=";
};
nativeBuildInputs = [
@@ -106,6 +107,7 @@ stdenv.mkDerivation rec {
nss
pango
stdenv.cc.cc.lib
+ libqt5pas
];
unpackPhase = ''
@@ -118,6 +120,7 @@ stdenv.mkDerivation rec {
cp $TMP/ya/{usr/share,opt} $out/ -R
substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/
ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser
+ ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta
'';
runtimeDependencies = map lib.getLib [
@@ -131,7 +134,7 @@ stdenv.mkDerivation rec {
homepage = "https://browser.yandex.ru/";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- maintainers = with maintainers; [ dan4ik605743 ];
+ maintainers = with maintainers; [ dan4ik605743 ionutnechita ];
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix
index 413ed86619..620e742043 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/7.nix
@@ -1,6 +1,6 @@
{ stdenv
, lib
-, buildFHSUserEnvBubblewrap
+, buildFHSEnv
, copyDesktopItems
, dpkg
, lndir
@@ -40,7 +40,7 @@ let
mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
};
- fhs = buildFHSUserEnvBubblewrap {
+ fhs = buildFHSEnv {
name = "packettracer7";
runScript = "${ptFiles}/bin/packettracer7";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix
index 4d4f65c306..207e563667 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cisco-packet-tracer/8.nix
@@ -2,7 +2,7 @@
, lib
, alsa-lib
, autoPatchelfHook
-, buildFHSUserEnvBubblewrap
+, buildFHSEnv
, copyDesktopItems
, dbus
, dpkg
@@ -97,7 +97,7 @@ let
mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
};
- fhs = buildFHSUserEnvBubblewrap {
+ fhs = buildFHSEnv {
name = "packettracer8";
runScript = "${ptFiles}/bin/packettracer";
targetPkgs = pkgs: [ libudev0-shim ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix
index cb1474bfeb..84bdefc5f6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "clash-verge";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
- hash = "sha256-HaBr1QHU3SZix3NFEkTmMrGuk/J1dfP3Lhst79rkUl0=";
+ hash = "sha256-AEOFMKxrkPditf5ks++tII6zeuH72Fxw/TVtZeXS3v4=";
};
unpackPhase = "dpkg-deb -x $src .";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
index a386004c82..cf963c5040 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2023.3.0";
+ version = "2023.4.1";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = "refs/tags/${version}";
- hash = "sha256-LEK809MswDVwPJ6CuC13Fxb7fvliugixS/NOKBajqKM=";
+ hash = "sha256-PG2+rEn3X1EdMUDbfrtfEjYclErMGAGTcP2g7Jz+s1A=";
};
- vendorSha256 = null;
+ vendorHash = null;
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/aiac/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/aiac/default.nix
new file mode 100644
index 0000000000..578eb0bca0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/aiac/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "aiac";
+ version = "2.2.0";
+ excludedPackages = [".ci"];
+
+ src = fetchFromGitHub {
+ owner = "gofireflyio";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Ju2LoCDY4lQaiJ3OSkt01SaOqVLrDGiTAwxxRnbnz/0=";
+ };
+
+ vendorHash = "sha256-UaC3Ez/i+kPQGOJYtCRtaD2pn3kVZPTaoCcNG7LiFbY=";
+ ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ];
+
+ meta = with lib; {
+ description = ''Artificial Intelligence Infrastructure-as-Code Generator.'';
+ homepage = "https://github.com/gofireflyio/aiac/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ qjoly ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
index fb9b6a1d11..f4e9d5c1cf 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix
@@ -35,16 +35,16 @@ let
in
buildGoModule rec {
pname = "argo";
- version = "3.4.5";
+ version = "3.4.7";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "refs/tags/v${version}";
- hash = "sha256-qNSnO+wtAKyUJwjIMZaiBUfgaoDFVttp04kTxr4H6po=";
+ hash = "sha256-jvrt8CwYkeZky5xg9a2U/CuenoBe86yX31x2iCb/7EY=";
};
- vendorHash = "sha256-75l4YCYC38uX63Uv/MA7HciQ+wumWhTuimL+ctizBCs=";
+ vendorHash = "sha256-6vHZxBcmhu6s3qQSX0iNIAR0hvXQB/bbpTA1/R08pj0=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix
index 5976fa6187..bf5f9b35a4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "arkade";
- version = "0.9.6";
+ version = "0.9.13";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
- sha256 = "sha256-EkpoXmaJ679B0sATDP/asJaywY4RFN7NNYc+7uyMQEA=";
+ sha256 = "sha256-j7fqLkVRAH4EN90IQ/9y/uKfFsdXXTW6R/WFRhuKPGQ=";
};
CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
- vendorHash = "sha256-BGUaU8p0C6kN8l3b27WQjfWP1e2LWD1KLWNsJdyEuRc=";
+ vendorHash = "sha256-/NJ5Y0uN9gAeYvuPWFSFuL83vOS9S8WJeCSZUkOLFMU=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix
index 36666b901d..587304f97d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix
@@ -8,15 +8,15 @@
buildGoModule rec {
pname = "bosh-cli";
- version = "7.1.0";
+ version = "7.2.2";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-wsCVeCAgZ2RPT6cle1YHB5CZdcPmKOVuUQlA5d3H7iI=";
+ sha256 = "sha256-cSix1muhmPrL7fDGznkFAOAoArZoDvptli7uRo71Dlk=";
};
- vendorSha256 = null;
+ vendorHash = null;
postPatch = ''
substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}'
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix
index e43ff3cad0..dbc6f7a77d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
- version = "0.13.2";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-K/RUEr9WJU1tocESvBF48F890vMgCRANM0lqn644eeg=";
+ sha256 = "sha256-E/14YYX4EFakzBsaUxy1SZAaBCIKmgpWlY/9EazWWFI=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix
index a1335641e3..ee249bcc37 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "civo";
- version = "1.0.48";
+ version = "1.0.49";
src = fetchFromGitHub {
owner = "civo";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-KoW+XKEFoe2QNJPu97MYYZnxbU0Wat8slJjQm/vtmew=";
+ sha256 = "sha256-j9fnOM7OLnu42LM/LaO/Sw9TJtPFHjAC+QzqywbxKKo=";
};
- vendorHash = "sha256-QzTu6/iFK+CS8UXoXSVq3OTuwk/xcHnAX4UpCU/Scpk=";
+ vendorHash = "sha256-7I4V4DVdHSvr/1ic/YT+Vttreg0tFasRNT/aFe4/0OY=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
index 2d76e0a26c..79dae1d134 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/click/default.nix
@@ -1,8 +1,6 @@
{ darwin, fetchFromGitHub, rustPlatform, lib, stdenv }:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
pname = "click";
version = "0.4.2";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix
index f17904911e..9f313f3ae1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cmctl";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
- rev = "2a0ef53b06e183356d922cd58af2510d8885bef5";
- sha256 = "0cvsmc06gg8w5j2k1zj4i8qpqlvpjfa6d7wn24v0hs1a1qk8c7a8";
+ rev = "e3a2a803e8ed7f8a88d5f535d6e9a061c1571194";
+ sha256 = "0484dh520plgmrv39lbih44z1dz0r3sf115kqvcpfmg13b0328d0";
};
- vendorSha256 = "sha256-aLEQoNt/5ikMw+wExSUITey/68Gk4+dsRbSydsiEiEg=";
+ vendorSha256 = "sha256-tKvvqYGwLEoSfGzBRLx8xC/0Kz1uLmHYQ+gcHOW+550=";
subPackages = [ "cmd/ctl" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix
index 1497876c38..29ada04281 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
- version = "0.41.2";
- sha256 = "0c4in6k6l9kjskcapi6gap9jkbrrfd106z6nbs48afr30cv2wp24";
- manifestsSha256 = "0kc9s5289s5b1slk2w3sr28yk9hg3lmrpy00mw3im3k6aqgrk9j0";
+ version = "2.0.0-rc.1";
+ sha256 = "0hy8jphb6pd24qifnjgzm2jwz93c5rsk08p8k9kl1fzlz7bivg9g";
+ manifestsSha256 = "0v6skn065hqk0pq5k7c48g68pnpj5har8cfhgbc8xjzg149a22wa";
manifests = fetchzip {
url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
- vendorSha256 = "sha256-ez4yaFZ5JROdu9boN5wI/XGMqLo8OKW6b0FZsJeFw4w=";
+ vendorSha256 = "sha256-ifzzNEFXq2VzidaxCTdz7VZOCoA0zPcK6uL0CyBNrE4=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
index 601f2412a0..7083a8b10c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fn";
- version = "0.6.23";
+ version = "0.6.24";
src = fetchFromGitHub {
owner = "fnproject";
repo = "cli";
rev = version;
- hash = "sha256-3g8S3cJ3RC06rvPMyQSKf8L4DkDTZ0Oe+6eh+rwyqg8=";
+ hash = "sha256-em9Bfrk7jJdmg3N+zH0VTpCdKPEOBK8vc297V5vmKzM=";
};
- vendorSha256 = null;
+ vendorHash = null;
subPackages = ["."];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix
index 3edf48b932..51c5446516 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "gatekeeper";
- version = "3.10.0";
+ version = "3.12.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
- sha256 = "sha256-4U03gdOls1uPpTqxmjLo1ruE4eeuUlGxphOgS9e5C1A=";
+ sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U=";
};
- vendorSha256 = null;
+ vendorHash = null;
nativeBuildInputs = [
installShellFiles
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
index 3cf79268f7..ee5c8957a7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "glooctl";
- version = "1.13.11";
+ version = "1.13.14";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
- hash = "sha256-K3tk55YPgBSF0YrxSw8zypnzgwEiyEPAAbiGyuKId9o=";
+ hash = "sha256-zqwehcLiBj75+oeNJJXw1ateA1aukCUo+rNxFe59iGc=";
};
subPackages = [ "projects/gloo/cli/cmd" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
index 5c8b9be54b..15b0a443c9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
- version = "3.11.2";
+ version = "3.11.3";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "sha256-aUzVICPCxAUoPvnE7pqz+bscfukbEwB+iGmXAYuQ/eE=";
+ sha256 = "sha256-BIjbSHs0sOLYB+26EHy9f3YJtUYnzgdADIXB4n45Rv0=";
};
- vendorSha256 = "sha256-Hf4ElC3H5sJkzKFELeDygTmfuqBHLqRhaHG1bfnqigM=";
+ vendorHash = "sha256-uz3ZqCcT+rmhNCO+y3PuCXWjTxUx8u3XDgcJxt7A37g=";
subPackages = [ "cmd/helm" ];
ldflags = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index 39a03eceac..22a993a017 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "helm-secrets";
- version = "4.2.2";
+ version = "4.4.2";
src = fetchFromGitHub {
owner = "jkroepke";
repo = pname;
rev = "v${version}";
- hash = "sha256-aqRgny1vU+dxpZpzwL4aSbYfTGrZbRffQy81mMBvnJk=";
+ hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index b80c9c81d5..65699cda85 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.151.0";
+ version = "0.152.0";
src = fetchFromGitHub {
owner = "helmfile";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-hzsxuvHzdjNRqTk4yEBZhT/j1fVCAk+843kY4MsN0AM=";
+ sha256 = "sha256-y7IM9YMbJvDmCwzR4Iz5losKberxtGkMfyxpyuBEb+o=";
};
- vendorHash = "sha256-f0K3/xF+nJvlhtLAyLOah2RaZbaEqD8C28cPCLyaCXI=";
+ vendorHash = "sha256-GRTtpZ4du3FNGpD+LArmNkJFeHs72jkYKYbvp73I/5s=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix
index a78950dde0..812cc6561a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hubble";
- version = "0.10.0";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-L8sRvIA89RiXjrG0WcH72iYKlNTFvmQrveA9k5EBRKo=";
+ sha256 = "sha256-UshnNwpCGjAvEZY4+oIjSS8bqcmEcIrnm4e0IhH/8xM=";
};
- vendorSha256 = null;
+ vendorHash = null;
ldflags = [
"-s" "-w"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
index a45002e34b..37e0e6de17 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
- version = "1.17.1";
+ version = "1.17.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
- sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig=";
+ sha256 = "sha256-YEkvY+Z+zM+9t+vnVk0gXJRTJd0u/Ryk3hYkbSHwP8M=";
};
- vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY=";
+ vendorHash = "sha256-LMmWhKwuy+HfqkLabTjlTd0f/6DYCGbEzpItQvckE9g=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix
index 558e800ced..f7dbe7e683 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/default.nix
@@ -47,10 +47,10 @@
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
- k3sVersion = "1.26.3+k3s1"; # k3s git tag
- k3sCommit = "01ea3ff27be0b04f945179171cec5a8e11a14f7b"; # k3s git commit at the above version
- k3sRepoSha256 = "1wpciikmr4l2nw92i3wlz301vxjiyz8rlzkn8jhzcaiifykc565s";
- k3sVendorSha256 = "sha256-1HFLj3zSHV7RvA0fsQ/dPzwnkSRqE9TXXDA4m8OhwZE=";
+ k3sVersion = "1.26.4+k3s1"; # k3s git tag
+ k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; # k3s git commit at the above version
+ k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs";
+ k3sVendorSha256 = "sha256-JXTsZYtTspu/pWMRSS2BcegktawBJ6BK7YEKbz1J/ao=";
# nix generated by update.sh
# Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix
index a34c8634e1..923d07af1b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kaniko";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "GoogleContainerTools";
repo = "kaniko";
rev = "v${version}";
- hash = "sha256-sPICsDgkijQ7PyeTWQgT553toc4/rWPPo7SY3ptX82U=";
+ hash = "sha256-dXQ0/o1qISv+sjNVIpfF85bkbM9sGOGwqVbWZpMWfMY=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
index 1290d94009..0e4bcc8b6c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kn";
- version = "1.7.0";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
- sha256 = "sha256-rcjAdujiK6urn14eG27Lnq/6g+O0n2KmrL7k8A5ONjg=";
+ sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0=";
};
- vendorSha256 = null;
+ vendorHash = null;
subPackages = [ "cmd/kn" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock
index 98ed810a21..cf5832b24d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock
@@ -1,19 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.0.4)
+ activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- addressable (2.8.1)
+ addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
colorize (0.8.1)
- concurrent-ruby (1.1.10)
+ concurrent-ruby (1.2.2)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ejson (1.3.1)
- faraday (2.7.1)
+ faraday (2.7.4)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
@@ -21,30 +21,28 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
- googleauth (1.3.0)
+ googleauth (1.5.2)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
- http (4.4.1)
- addressable (~> 2.3)
+ http (5.1.1)
+ addressable (~> 2.8)
http-cookie (~> 1.0)
http-form_data (~> 2.2)
- http-parser (~> 1.2.0)
+ llhttp-ffi (~> 0.4.0)
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
- http-parser (1.2.3)
- ffi-compiler (>= 1.0, < 2.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
jsonpath (1.1.2)
multi_json
- jwt (2.5.0)
- krane (3.0.1)
+ jwt (2.7.0)
+ krane (3.1.0)
activesupport (>= 5.0)
colorize (~> 0.8)
concurrent-ruby (~> 1.1)
@@ -55,21 +53,24 @@ GEM
oj (~> 3.0)
statsd-instrument (>= 2.8, < 4)
thor (>= 1.0, < 2.0)
- kubeclient (4.10.1)
- http (>= 3.0, < 5.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)
+ llhttp-ffi (0.4.0)
+ ffi-compiler (~> 1.0)
+ rake (~> 13.0)
memoist (0.16.2)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
- mime-types-data (3.2022.0105)
- minitest (5.16.3)
+ mime-types-data (3.2023.0218.1)
+ minitest (5.18.0)
multi_json (1.15.0)
netrc (0.11.0)
- oj (3.13.23)
+ oj (3.14.3)
os (1.1.4)
- public_suffix (5.0.0)
+ public_suffix (5.0.1)
rake (13.0.6)
recursive-open-struct (1.1.3)
rest-client (2.1.0)
@@ -83,9 +84,9 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
- statsd-instrument (3.5.0)
+ statsd-instrument (3.5.7)
thor (1.2.1)
- tzinfo (2.0.5)
+ tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
@@ -98,4 +99,4 @@ DEPENDENCIES
krane
BUNDLED WITH
- 2.3.24
+ 2.4.10
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix
index b99238db86..37fad59268 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
+ sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
type = "gem";
};
- version = "7.0.4";
+ version = "7.0.4.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
+ sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
type = "gem";
};
- version = "2.8.1";
+ version = "2.8.4";
};
colorize = {
groups = ["default"];
@@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+ sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
- version = "1.1.10";
+ version = "1.2.2";
};
domain_name = {
dependencies = ["unf"];
@@ -68,10 +68,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590";
+ sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj";
type = "gem";
};
- version = "2.7.1";
+ version = "2.7.4";
};
faraday-net_http = {
groups = ["default"];
@@ -110,21 +110,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
+ sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
type = "gem";
};
- version = "1.3.0";
+ version = "1.5.2";
};
http = {
- dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"];
+ dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y";
+ sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw";
type = "gem";
};
- version = "4.4.1";
+ version = "5.1.1";
};
http-accept = {
groups = ["default"];
@@ -157,17 +157,6 @@
};
version = "2.3.0";
};
- http-parser = {
- dependencies = ["ffi-compiler"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1";
- type = "gem";
- };
- version = "1.2.3";
- };
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
@@ -195,10 +184,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq";
+ sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
type = "gem";
};
- version = "2.5.0";
+ version = "2.7.0";
};
krane = {
dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"];
@@ -206,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j3hy00vqk58vf7djip7vhqqczb84pjqlp34h1w4jgbw05vfcbqx";
+ sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70";
type = "gem";
};
- version = "3.0.1";
+ version = "3.1.0";
};
kubeclient = {
dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"];
@@ -217,10 +206,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10rg2l15xmv4sy3cjvw3r9rxkylf36p416fhlhpic9zlq8ang6c4";
+ sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9";
type = "gem";
};
- version = "4.10.1";
+ version = "4.11.0";
+ };
+ llhttp-ffi = {
+ dependencies = ["ffi-compiler" "rake"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5";
+ type = "gem";
+ };
+ version = "0.4.0";
};
memoist = {
groups = ["default"];
@@ -248,20 +248,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
+ sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
type = "gem";
};
- version = "3.2022.0105";
+ version = "3.2023.0218.1";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30";
+ sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
type = "gem";
};
- version = "5.16.3";
+ version = "5.18.0";
};
multi_json = {
groups = ["default"];
@@ -288,10 +288,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90";
+ sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy";
type = "gem";
};
- version = "3.13.23";
+ version = "3.14.3";
};
os = {
groups = ["default"];
@@ -308,10 +308,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
+ sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
type = "gem";
};
- version = "5.0.0";
+ version = "5.0.1";
};
rake = {
groups = ["default"];
@@ -370,10 +370,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gl2n26hb8g12n3alh1yg5qg7cjrp9f9fyc25crmaccm5m17v0sa";
+ sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz";
type = "gem";
};
- version = "3.5.0";
+ version = "3.5.7";
};
thor = {
groups = ["default"];
@@ -391,10 +391,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
+ sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
type = "gem";
};
- version = "2.0.5";
+ version = "2.0.6";
};
unf = {
dependencies = ["unf_ext"];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktop/default.nix
new file mode 100644
index 0000000000..58fca5221c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktop/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "ktop";
+ version = "0.3.5";
+ excludedPackages = [".ci"];
+
+ src = fetchFromGitHub {
+ owner = "vladimirvivien";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I=";
+ };
+
+ vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE=";
+ ldflags = [ "-s" "-w" "-X github.com/vladimirvivien/ktop/buildinfo.Version=v${version}" ];
+
+ postInstall = ''
+ rm $out/bin/hack
+ '';
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A top-like tool for your Kubernetes cluster";
+ longDescription = ''
+ Following the tradition of Unix/Linux top tools, ktop is a tool that displays useful metrics information about nodes, pods, and other workload resources running in a Kubernetes cluster.
+ '';
+ homepage = "https://github.com/vladimirvivien/ktop/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ qjoly ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix
index 368532dbef..449301c060 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub }:
let
- version = "1.4.8";
+ version = "1.5.2";
in
buildGoModule {
pname = "ktunnel";
@@ -10,14 +10,14 @@ buildGoModule {
owner = "omrikiei";
repo = "ktunnel";
rev = "v${version}";
- sha256 = "sha256-Iw7Z4iuKxmRrS51KP3k/ouXW4xssdNgxDDzNQR2Zygg=";
+ sha256 = "sha256-QZL3TSvxSPuBjjATAqoAOZNBSB6NCGfHHG2dq8C4Wwk=";
};
ldflags = [
"-s" "-w"
];
- vendorSha256 = "sha256-p9AYZWNO2oqLich0qzZYuAk55HqB6ttS66ORuNZ4rJg=";
+ vendorHash = "sha256-Q8t/NWGeUB1IpxdsxvyvbYh/adtcA4p+7bcCy9YFjsw=";
preCheck = "export HOME=$(mktemp -d)";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix
index 0b38759af9..0b5d1446a7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "kubebuilder";
- version = "3.9.1";
+ version = "3.10.0";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kubebuilder";
rev = "v${version}";
- hash = "sha256-sX+MYMZTRJ3udCtW3yeGBlYpJV35UDQwtcgi7/pXhek=";
+ hash = "sha256-W1FjmhZWBt/ThkSHHGAR4p1Vxal4WOCutlsHIDZeRZM=";
};
- vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic=";
+ vendorHash = "sha256-/Kvn3KwSB/mxgBKM+383QHCnVTOt06ZP3gt7FGqA5aM=";
subPackages = ["cmd"];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
index 46747974dd..9fd3fc41ce 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kubecfg";
- version = "0.29.1";
+ version = "0.29.2";
src = fetchFromGitHub {
owner = "kubecfg";
repo = "kubecfg";
rev = "v${version}";
- hash = "sha256-lHpXmJPOjyzlNl7fLQH6Ufj20YRzeGz4NGxd3Bgr3mA=";
+ hash = "sha256-toB0rRkqRTjf51g+BcMZiHjlG/slMyzA5OfO4DbTCH8=";
};
- vendorHash = "sha256-VGLGa1/8sdVC3H4hxpvF/t2YgbRlbeNTJMJb5zwknPw=";
+ vendorHash = "sha256-sntlF8VCOtIB6kFJZaDs2Uu8zWZwMLcnHWuZy2D30Zg=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix
new file mode 100644
index 0000000000..279ac3f032
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecm/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubecm";
+ version = "0.22.1";
+
+ src = fetchFromGitHub {
+ owner = "sunny0826";
+ repo = "kubecm";
+ rev = "v${version}";
+ hash = "sha256-0oQOuBYCDNnOODM2ZSqTgOI+jHWuHTtsk2NfGIPMy5A=";
+ };
+
+ vendorHash = "sha256-fVPiEDB6WFu2x5EY7NjmJEEq297QxP10593cXxxv8iI=";
+ ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Manage your kubeconfig more easily";
+ homepage = "https://github.com/sunny0826/kubecm/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ qjoly ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
index a46e89ecca..47c6451238 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeconform";
- version = "0.5.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "yannh";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-YLPF8tR50gtiA608TLctKX54a7qf8LXjbkMr/GPJBSc=";
+ sha256 = "sha256-98wSFntt5ERbQ7URMlRz3iMTuL1beuX2nXbdWe+6Quw=";
};
- vendorSha256 = null;
+ vendorHash = null;
meta = with lib; {
description = "A FAST Kubernetes manifests validator, with support for Custom Resources!";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix
index d3ae297128..88176dd599 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kubeone";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "kubermatic";
repo = "kubeone";
rev = "v${version}";
- hash = "sha256-bFkJXnz4Nm1XfQMaBWSHfCxaTbGQQwKXRd1ktZKs7hY=";
+ hash = "sha256-dLpe3C1gMnEyajJFPawDlTchYKA8cAy2QUAae6+7QBQ=";
};
- vendorHash = "sha256-ZpTUhJyM+9e8b2EZzv4hsnV5G3HVPo6ga0pF3Ab53+A=";
+ vendorHash = "sha256-aCRrf/E4UVL6PwUPRRzLjD+MzL8gcNJrc2IgKKyIIHI=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
index da77a82bd8..dd71b53584 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
buildGoModule rec {
pname = "kubernetes";
- version = "1.26.3";
+ version = "1.27.0";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- hash = "sha256-dJMfnd82JIPxyVisr5o9s/bC3ZDiolF841pmV4c9LN8=";
+ hash = "sha256-9xRsC6QghmoH/+K6Gs8k4BFHQ8ltCtG8TZpAJGRC2e4=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
index b6abda6fb7..86ef3ddf69 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeseal";
- version = "0.20.2";
+ version = "0.20.5";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
- sha256 = "sha256-dzrxOZ8gsLm3cw54id7edhqsqZfuOG90P3aAdf/b66M=";
+ sha256 = "sha256-G7v5hRSUtO7AwotQ/2eftfs31+IbyzGHydT/IR1bhOY=";
};
- vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY=";
+ vendorHash = "sha256-fndK1PO4CfTGQV1f9PJ+ju5VUW/RIE5i8IBARJn0g6g=";
subPackages = [ "cmd/kubeseal" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
index 8f1b953321..22a4bde4c3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubeshark";
- version = "39.5";
+ version = "40.0";
src = fetchFromGitHub {
owner = "kubeshark";
repo = "kubeshark";
rev = version;
- sha256 = "sha256-1SmIL4kA65VlsHw7YUTxklUtXTwMkb12SCpm3Ja24KA=";
+ sha256 = "sha256-Tmk9xbAqEsJ8nffRX6qw3RKKoBbSO2gmVT5Ff4Cn9DA=";
};
- vendorHash = "sha256-cMX9OYErnnnkvmXgau5xLBSv+wo0VTqgo/rYCBmXYZ4=";
+ vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU=";
ldflags = let t = "github.com/kubeshark/kubeshark"; in [
"-s" "-w"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubexit/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubexit/default.nix
new file mode 100644
index 0000000000..bf086de6d7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubexit/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubexit";
+ version = "0.3.2";
+
+ src = fetchFromGitHub {
+ owner = "karlkfi";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-Kzom+/Xad6SI9czw4xvmTbJ+bNB9mF2oSq37IFn384U=";
+ };
+
+ vendorHash = "sha256-RA3+S5Pad+4mNUgcZ2Z0K0FKA3Za5o1ko049GM4yQQ8=";
+ ldflags = [ "-s" "-w" ];
+ meta = with lib; {
+ description = "Command supervisor for coordinated Kubernetes pod container termination.";
+ homepage = "https://github.com/karlkfi/kubexit/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ qjoly ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
index 7ac3f68b35..ee6fc0a117 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "stable";
- version = "2.12.4";
- sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd";
- vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M=";
+ version = "2.13.2";
+ sha256 = "0pcb4f8s8l156y0zd9g9f0pyydvp52n02krjy2giajp00gaqx3s3";
+ vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
index e4f59a8d12..a03c2a2768 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
- version = "23.3.4";
- sha256 = "19i0g1vbfyjc2nlqh1iml0siqb3zi91ky8lf83ng40r49p1b1c6h";
- vendorSha256 = "sha256-f77s+WzLhHGbFdJfNRuhdx/DLFB/JyD5hG8ApCZ+h/s=";
+ version = "23.4.2";
+ sha256 = "1g7ghvxrk906sz6kgclyk078jlbxjm0idx5mbj6ll6q756ncnzyl";
+ vendorSha256 = "sha256-B0vqZBycn2IYxjy0kMOtN3KnQA8ARiKDaH6mT6dtXTo=";
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
index e05e7847cf..99b9b94219 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix
@@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
- version = "1.29.0";
+ version = "1.30.1";
- vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M=";
+ vendorHash = "sha256-616T47H+8FdXU37MDvAHRyM59JXurU45uz8c/TNxkkc=";
doCheck = false;
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI=";
+ sha256 = "sha256-dw+aFckp5Q9i6bNKPetw2WlslrpKAgEzXI+aGAwDurU=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
index 3244bb79a1..c42fb1b2a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
- hash = "sha256-mobPl1T33yhoIjFmxZn6D96ZdU4fwwPLn8cBsYSF/Fw=";
+ hash = "sha256-1wqPMT8JJ29K0BcooPj7jaXMKIVlN6YvFwneYnqaeDk=";
};
- vendorHash = "sha256-5SaYGRCgl8f5XeKbhT1autW6Kdy+HDwsWXUWTFeAMio=";
+ vendorHash = "sha256-ix18Mi4a1kW7C6rcwwFc6TDwzs3vYxNz3M3d5pD8l6c=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
index 42a35e5c7f..f88340f2c7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "node-problem-detector";
- version = "0.8.12";
+ version = "0.8.13";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw=";
+ sha256 = "sha256-nNi4YahrO4zwqwR90tIpQCAydGdQbfy5PXCifpP/T7Q=";
};
- vendorSha256 = null;
+ vendorHash = null;
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
index eba9a8375d..2804604e2b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nomad-driver-podman";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-miarvcV+b/6kbjHru7MpBIBU/v9ldHJGeXh2ATQ3BQ0=";
+ sha256 = "sha256-qHhdjWc9bxUpHYUFUrupjtxxIVQDP43OeKKsCDa+4/M=";
};
- vendorSha256 = "sha256-AtgxHAkNzzjMQoSqROpuNoSDum/6JR+mLpcHLFL9EIY=";
+ vendorHash = "sha256-UIUavFdBuSiaUsNaibPjRMURMLLK5UjNHVoyNSIRNQ4=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
new file mode 100644
index 0000000000..feabe332a1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "nova";
+ version = "3.6.2";
+
+ src = fetchFromGitHub {
+ owner = "FairwindsOps";
+ repo = pname;
+ rev = version;
+ hash = "sha256-l2HBjM5DyeWkdAwQGzPp+A3UuXXc0OTizInsVL0k/0I=";
+ };
+
+ vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
+
+ ldflags = [ "-X main.version=${version}" "-s" "-w" ];
+
+ meta = with lib; {
+ description = "Find outdated or deprecated Helm charts running in your cluster";
+ longDescription = ''
+ Nova scans your cluster for installed Helm charts, then
+ cross-checks them against all known Helm repositories. If it
+ finds an updated version of the chart you're using, or notices
+ your current version is deprecated, it will let you know.
+ '';
+ homepage = "https://nova.docs.fairwinds.com/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ qjoly ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix
index ba982fd83b..8f5bd153c7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "odo";
- version = "3.4.0";
+ version = "3.9.0";
src = fetchFromGitHub {
owner = "redhat-developer";
repo = "odo";
rev = "v${version}";
- sha256 = "sha256-UXeSerVtskEloH60vNom8H6/gEy7adUnBsc/5q7wrDM=";
+ sha256 = "sha256-7GkDxcin4hsqyjjUvI813Z7wHr9D9ZwSDodIts2RpzU=";
};
- vendorSha256 = null;
+ vendorHash = null;
buildPhase = ''
make bin
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix
index 42d3aab634..4e75338da2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openlens/default.nix
@@ -2,11 +2,11 @@
let
pname = "openlens";
- version = "6.4.5";
+ version = "6.4.15";
src = fetchurl {
url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage";
- sha256 = "sha256-Lwl4unhXSyYCEImiPncAnmIQt26CD4horsREMyi6nuA=";
+ sha256 = "sha256-Q7Vh+/SKbnQ7HbDlx1XqBXg1U2DaIvY139VrIIdOX5E=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
index 74c92ecda8..6cf37bb9c2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pachyderm";
- version = "2.5.2";
+ version = "2.5.4";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
- hash = "sha256-COtOYR1toSr+oiRZ5Hfbgfy2InF9jFThT0ozwrcSVio=";
+ hash = "sha256-VYHSExQDIyK86kCz3gzIR+Q5iYrhkAPx56vST73vPOo=";
};
vendorHash = "sha256-XmIPifozTYd1rV2wm0dU0GPvg/+HFoSLGHB6DDrkzVc=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix
index 10c9c6be68..78d7d95a4f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec{
pname = "pinniped";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "pinniped";
rev = "v${version}";
- sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo=";
+ sha256 = "sha256-noWNklLRYW0l7fGBnsTQk8v5t+mwKheh0egHxL+YxAE=";
};
subPackages = "cmd/pinniped";
- vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU=";
+ vendorHash = "sha256-P28L+IHZ+To08Y4gdv/VldAoVcMnCPlZDxy7xe5OP8o=";
ldflags = [ "-s" "-w" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
index 5b75fc6d59..4371331a3f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pluto";
- version = "5.16.0";
+ version = "5.16.1";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
- sha256 = "sha256-M5zTnzuei/sECvRe89Dau72iIUuMtaLJyYTGeEF4GPo=";
+ sha256 = "sha256-UCq+aMUffvDWmPtSSc/PNbrak1LGWQe8Oe340O5q6LM=";
};
- vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U=";
+ vendorHash = "sha256-0VFCZ+U0W21tF35148Valpc7fDXkC9dPpz1O0+4D30U=";
ldflags = [
"-w" "-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
index 2ad528f1f7..dff7d2f88a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rke";
- version = "1.4.3";
+ version = "1.4.5";
src = fetchFromGitHub {
owner = "rancher";
repo = pname;
rev = "v${version}";
- hash = "sha256-UTvDrrveFDrPD0ar87Q3NZSxTyCAe5gpp3e2QPeMMm4=";
+ hash = "sha256-ldN0Fqh0V6JziTy5ml/i/un4/1o8MSeIAvrH5EyOeiw=";
};
- vendorHash = "sha256-zV1lrJhzrUAcEk6jYLCFrHcYw3CZart46qXErCTjZyQ=";
+ vendorHash = "sha256-wuEsG2VKU4F/phSqpzUN3wChD93V4AE7poVLJu6kpF0=";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 0c0b678d98..b57a68b0da 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
index a137fd5c70..fb0482bf2c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
@@ -31,7 +31,7 @@ buildGo120Package rec {
'';
doCheck = true;
- checkFlags = "-skip TestSetSessionHandlers";
+ checkFlags = [ "-skip=TestSetSessionHandlers" ];
preCheck = ''
if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
index ca92df03fd..473377c22e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix
@@ -1,30 +1,27 @@
{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }:
-let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
-in
buildGoModule rec {
pname = "stern";
- version = "1.24.0";
+ version = "1.25.0";
src = fetchFromGitHub {
owner = "stern";
repo = "stern";
rev = "v${version}";
- sha256 = "sha256-jJxrBBs8PkYg9oH9MY1RLJb262REmbKciHXiwWTqoRc=";
+ sha256 = "sha256-E4Hs9FH+6iQ7kv6CmYUHw9HchtJghMq9tnERO2rpL1g=";
};
- vendorHash = "sha256-1MhscgCGSJXkcj5Rt29+xbBX1uGfOS0kmab+DNY/Bt4=";
+ vendorHash = "sha256-+B3cAuV+HllmB1NaPeZitNpX9udWuCKfDFv+mOVHw2Y=";
subPackages = [ "." ];
nativeBuildInputs = [ installShellFiles ];
- ldflags =
- [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ];
+ ldflags = [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ];
- postInstall =
- let stern = if isCrossBuild then buildPackages.stern else "$out";
- in
+ postInstall = let
+ stern = if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else buildPackages.stern;
+ in
''
for shell in bash zsh; do
${stern}/bin/stern --completion $shell > stern.$shell
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
index db0cc56157..77629850e2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "talosctl";
- version = "1.3.7";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${version}";
- hash = "sha256-zJcfx4rHPo8bAN4p0BK0i8Vu1aAaUynj9Aj7bBQoVKU=";
+ hash = "sha256-EJrzq6fChNA1N3TTkwD5/1TdLDso9jGuTgWUG4RwqGA=";
};
- vendorHash = "sha256-m7w6ItXGAtoT/ZqNOXbDackXV6cHtpAMBi4jfVhQa9A=";
+ vendorHash = "sha256-Thkj8Zhj/HXAnRcFxuCEVd94CMrt8Bsq2FHx6siH6Ww=";
ldflags = [ "-s" "-w" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index 1bc55b3db4..aee268f0a7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
- version = "0.28.0";
+ version = "0.30.1";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-8OW0n6aS7bDDbzbrMfJLL8Yvq3vJg47qHQB4zY0xxAw=";
+ sha256 = "sha256-tn7nK5YTdEYJf9UBajOZEc8fQ0cx3qM0X/7UYnDklj8=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
index f7b4a32a38..10cfbbe99d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "temporal";
- version = "1.20.0";
+ version = "1.20.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
- hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE=";
+ hash = "sha256-2xer6W8pSZttjn5m5GgTOpHyXx2rE4qRZsBZzxwWh4o=";
};
- vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8=";
+ vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY=";
excludedPackages = [ "./build" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 23460dc904..d144858ab3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -37,20 +37,20 @@
"vendorHash": "sha256-nF/efMhmrXfBlF9w9tC4npHxjX2/299OfqTpvPapfMo="
},
"akamai": {
- "hash": "sha256-ofwJs9rOi8l9O2g9adFr3LI4M4pjIc1GzZ5TD70Lgto=",
+ "hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=",
"homepage": "https://registry.terraform.io/providers/akamai/akamai",
"owner": "akamai",
"repo": "terraform-provider-akamai",
- "rev": "v3.5.0",
+ "rev": "v3.6.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
},
"alicloud": {
- "hash": "sha256-ZFnVCrC2fK2i5idK2rWCOZQ3W4K3nDSG5ZkEZk2Zg9c=",
+ "hash": "sha256-8jtZ+uhCpktt1e99j2I1C/sE69uOv911qbuaKTjv2DM=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
- "rev": "v1.202.0",
+ "rev": "v1.204.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -73,11 +73,11 @@
"vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M="
},
"argocd": {
- "hash": "sha256-IDPX+j9bxQGoBpG/XpLpsFx48iDLcCUzDso08xAsOf0=",
+ "hash": "sha256-3WhbyMqIlncD7UmmfJBFrb9FmmbC/a4CWesmjo0jzoU=",
"homepage": "https://registry.terraform.io/providers/oboukili/argocd",
"owner": "oboukili",
"repo": "terraform-provider-argocd",
- "rev": "v5.1.0",
+ "rev": "v5.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-mKefDPwWPlUleoAkJpTvJwQeOb7pA80cZQ7fpwir6kk="
},
@@ -101,38 +101,38 @@
"vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw="
},
"aviatrix": {
- "hash": "sha256-dWG5qJtolzEKXgDy0LG68DHaVe02LqePKfBQFS2QoBk=",
+ "hash": "sha256-DjdA4kvOtPO4x1MY+lJjX+KNuQTxSZQvisSfokQk5Sg=",
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
"owner": "AviatrixSystems",
"repo": "terraform-provider-aviatrix",
- "rev": "v3.0.3",
+ "rev": "v3.0.5",
"spdx": "MPL-2.0",
"vendorHash": null
},
"aws": {
- "hash": "sha256-vV1I9hQOil1ume9+GV14fBVo6NaBZlElemhFhnQ7rl4=",
+ "hash": "sha256-cmE7jJO49CuYdiKjrPaHhNCFoMbT0z4uSnFdC7Fnd9g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
"owner": "hashicorp",
"repo": "terraform-provider-aws",
- "rev": "v4.62.0",
+ "rev": "v4.65.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-2OmadSxpr3buMukM25mb/xXnI5rVkIuX0sbbI0zqRYE="
+ "vendorHash": "sha256-UvbuWjxlou7lwvU5D6DaEXuCFvn8ECTbkNvKGrHwsu8="
},
"azuread": {
- "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=",
+ "hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
"owner": "hashicorp",
"repo": "terraform-provider-azuread",
- "rev": "v2.36.0",
+ "rev": "v2.38.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"azurerm": {
- "hash": "sha256-NffjRiJz92MwTo6K0H2nuqcfdvmhj9i8Xre0T7gaPeA=",
+ "hash": "sha256-1K+uM8uRpFigr9scvBL/FDoqc7TKh4ZnppEHnl8i8EA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
- "rev": "v3.51.0",
+ "rev": "v3.54.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -146,49 +146,49 @@
"vendorHash": null
},
"baiducloud": {
- "hash": "sha256-J17jzgCTCG87Cieci/TrMpEUxA4Ynfm1+Cr4fRjDtNY=",
+ "hash": "sha256-cEi/B5vZWQDdne4SlTwoObt+eUsmTdyG8bH6YHPo4IA=",
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
"owner": "baidubce",
"repo": "terraform-provider-baiducloud",
- "rev": "v1.19.6",
+ "rev": "v1.19.7",
"spdx": "MPL-2.0",
"vendorHash": null
},
"bigip": {
- "hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=",
+ "hash": "sha256-SGwCEcPNxWw7Bsa4SQ1uWJ1rH/PZlkAMwvDy/fnXU3w=",
"homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
"owner": "F5Networks",
"repo": "terraform-provider-bigip",
- "rev": "v1.17.0",
+ "rev": "v1.17.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
"bitbucket": {
- "hash": "sha256-2JTJF+zYuf9ZKaEMSOxxjODbmIBXnhpwE8LJUdRIkYY=",
+ "hash": "sha256-lm/BNxfB5ZosyFYihJ6kh8oro+tCP6pRFNnWrvzeKgk=",
"homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
"owner": "DrFaust92",
"repo": "terraform-provider-bitbucket",
- "rev": "v2.31.0",
+ "rev": "v2.32.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-mnG2CZ/ko4p4CTs0YskJP41sQD9lmEz4dRQLiklim34="
},
"brightbox": {
- "hash": "sha256-e4WvQKtf6zVEZ74c+lE3ZkbX24rPazp8MrJCNQDTz2c=",
+ "hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=",
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
"owner": "brightbox",
"repo": "terraform-provider-brightbox",
- "rev": "v3.3.0",
+ "rev": "v3.4.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-dm+2SseBeS49/QoepRwJ1VFwPCtU+6VymvyEH/sLkvI="
+ "vendorHash": "sha256-jOscYbwZ8m4smGiAy2vNhPMTAUnINkpuVRQ8E6LpWVw="
},
"buildkite": {
- "hash": "sha256-4Bbod7IuinZE28AZ2r1BBrexgbS29jEpwtG8aTKj7M8=",
+ "hash": "sha256-/LTUDnE5XB8Gwbs+CroJW+3pM7opNSVQFWvRQWQjFqc=",
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
"owner": "buildkite",
"repo": "terraform-provider-buildkite",
- "rev": "v0.14.0",
+ "rev": "v0.16.0",
"spdx": "MIT",
- "vendorHash": "sha256-dN5oNNO5lf8dUfk9SDUH3f3nA0CNoJyfTqk+Z5lwTz8="
+ "vendorHash": "sha256-ZXjmR1maiiLeWipXGOAGfLEuot9TsrzAX4EPRNQ5Gbo="
},
"checkly": {
"hash": "sha256-tdimESlkfRO/kdA6JOX72vQNXFLJZ9VKwPRxsJo5WFI=",
@@ -218,13 +218,13 @@
"vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs="
},
"cloudflare": {
- "hash": "sha256-dhSjFeTkbiG/Gx/DS1WzW2b31u3apfXX4Safh29e6Fw=",
+ "hash": "sha256-DDoPVceQpRTN23JaQ79uXrEStBgtb7WWrKBIVpIpok4=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
- "rev": "v4.3.0",
+ "rev": "v4.4.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-sgJ1HhhWQpvOGFVEC43pymBKyVcqdn8jLlW5fR21mFE="
+ "vendorHash": "sha256-b7h8CI1NeFAAXGdDsZ4CRXcomceoijon8IGriqP6tko="
},
"cloudfoundry": {
"hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",
@@ -282,13 +282,13 @@
"vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
},
"datadog": {
- "hash": "sha256-rbBLyCxGB1W7VCPs1f/7PQnyvdWo+uhze6p4cucdEG0=",
+ "hash": "sha256-3C+jh9rGw2v2ME3PHLc+TIAY4UWcZVFdmNy4N4WyRM8=",
"homepage": "https://registry.terraform.io/providers/DataDog/datadog",
"owner": "DataDog",
"repo": "terraform-provider-datadog",
- "rev": "v3.23.0",
+ "rev": "v3.24.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-hy4GQKhY+6bYdVAZensLU0EswZXfxZWY2YNyiTA2UaE="
+ "vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U="
},
"dhall": {
"hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
@@ -300,11 +300,11 @@
"vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ="
},
"digitalocean": {
- "hash": "sha256-fnABnzEMDJBzUl6/K1rgWdW4oCqrKZ+3RSXVvT1sHVk=",
+ "hash": "sha256-n3aem1oP5Pzd5J4Xot7HtixNhdXqKBeGRp8k79bEfr4=",
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
"owner": "digitalocean",
"repo": "terraform-provider-digitalocean",
- "rev": "v2.27.1",
+ "rev": "v2.28.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -318,22 +318,22 @@
"vendorHash": null
},
"dns": {
- "hash": "sha256-qLKlnw0vnPvxJluvUiBERu1YdtrRklocVw314/lvQT4=",
+ "hash": "sha256-feMN0Fpq8ct3l0u1Y8Zjgee4iC+e90CwAZmk5VQj2So=",
"homepage": "https://registry.terraform.io/providers/hashicorp/dns",
"owner": "hashicorp",
"repo": "terraform-provider-dns",
- "rev": "v3.2.4",
+ "rev": "v3.3.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk="
+ "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw="
},
"dnsimple": {
- "hash": "sha256-40ueiX2LrtTyiMgCgHRq07hMYrLKh6N+7wfrXr+MC7w=",
+ "hash": "sha256-I5TUhq8OZqcLQs/jr8LB22Uc9s5M/WH9LRzV8EsgRnc=",
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
"owner": "dnsimple",
"repo": "terraform-provider-dnsimple",
- "rev": "v0.17.0",
+ "rev": "v1.1.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-LXRNq5nxoZ6xZdKioT6cjyLaYChRAN28PzKsJ5BRako="
+ "vendorHash": "sha256-2FZWc+i4mSLDo143CULLmsVhjs2otN8bSqcfZROZPTM="
},
"docker": {
"hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=",
@@ -354,20 +354,20 @@
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
},
"equinix": {
- "hash": "sha256-zyRPpAaDgjRafn5RcrzmbVTzO6gGS1HMmvLR8VFdKow=",
+ "hash": "sha256-wuOgnliqwA8huZHmFuegbtuFbpTpe1VgQ53Z+XcgHjw=",
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
"owner": "equinix",
"repo": "terraform-provider-equinix",
- "rev": "v1.13.0",
+ "rev": "v1.14.1",
"spdx": "MIT",
- "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
+ "vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k="
},
"exoscale": {
- "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=",
+ "hash": "sha256-u/2ePkENpx8Q7WcmtNxXR4GIsr2TnIHyOA8CnzTFTnk=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
- "rev": "v0.46.0",
+ "rev": "v0.47.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -381,20 +381,20 @@
"vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
},
"fastly": {
- "hash": "sha256-YKF4aW+K5JffPd5b3Kh540ml0uc9q5WSvcNgj9g6/Bk=",
+ "hash": "sha256-Z38tG5Of+nYuIT3IxY/hxbV0HIgkITBnaXcr3oYIf6Y=",
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
"owner": "fastly",
"repo": "terraform-provider-fastly",
- "rev": "v4.2.0",
+ "rev": "v4.3.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"flexibleengine": {
- "hash": "sha256-0wpyi397+5YAa3epZZII312rK1SnPU5k9a1/iVTbqmU=",
+ "hash": "sha256-TZR/zXgecHUbaD9Yb83HvBwWauDtHDsnEcSZYFmY5y4=",
"homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine",
"owner": "FlexibleEngineCloud",
"repo": "terraform-provider-flexibleengine",
- "rev": "v1.36.1",
+ "rev": "v1.37.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-HcyUGKbgj322fU7keN/lBEn6UJhV3QXScBJHZHJkCII="
},
@@ -419,42 +419,42 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
- "hash": "sha256-GlNOYpIRX+DL7cfBsst83MdW/SXmh16L+MwDSFLzXYo=",
+ "hash": "sha256-iFYYKFPa9+pTpmTddFzqB1yRwBnp8NG281oxQP7V6+U=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
- "rev": "v5.22.0",
+ "rev": "v5.23.0",
"spdx": "MIT",
"vendorHash": null
},
"gitlab": {
- "hash": "sha256-bn02BLLSgdo7/Oh95rNOxVUVvwflSvU43DOsii5LM0E=",
+ "hash": "sha256-im5YyI1x9ys0MowuNm7JcbJvXPCHxcXXWJeRXRrRIr4=",
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
"owner": "gitlabhq",
"repo": "terraform-provider-gitlab",
- "rev": "v15.10.0",
+ "rev": "v15.11.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g="
+ "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ="
},
"google": {
- "hash": "sha256-XSKujqCuBczKXVMJYzuGHzLiEKadRjYVNkk35zxGSdA=",
+ "hash": "sha256-8uRIvFZsuPyisJMRmqL5zNxea6h1VwxZS+lmmvZslfo=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.61.0",
+ "rev": "v4.63.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-ztoWOiqyOrusSo0peigEV9wy2f387gVGfcolkYoJvhw="
+ "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
},
"google-beta": {
- "hash": "sha256-T3SnuZYpwrd+wMv5DzTVW5H5ZP3p9ArLI1OFuIM/+/8=",
+ "hash": "sha256-avE1EnjCItz1NcF0KzsSgUnQABr2D0IC7kLGgIj+j6g=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.61.0",
+ "rev": "v4.63.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-ztoWOiqyOrusSo0peigEV9wy2f387gVGfcolkYoJvhw="
+ "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -466,13 +466,13 @@
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
},
"grafana": {
- "hash": "sha256-2Ig0ZwU9ZzsfAq5XCFMvL1NCmfnhVjoIrgl74hQypGE=",
+ "hash": "sha256-XY3nAaAB3h50IGE0Gp2xsqDppk6fmDIxHVJWstESMkM=",
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
"owner": "grafana",
"repo": "terraform-provider-grafana",
- "rev": "v1.36.1",
+ "rev": "v1.39.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0="
+ "vendorHash": "sha256-+g8Ryb1SgtI074R5vttd2CUneHRv64OvEFgbve+7xL4="
},
"gridscale": {
"hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
@@ -484,13 +484,13 @@
"vendorHash": null
},
"hcloud": {
- "hash": "sha256-FrZdypcyjF3DMWHIb4ijYfbI2VcFeZMu5QJlZt4EMSg=",
+ "hash": "sha256-B6XL9izArnbkI7TWbuB/m/UgGK+YlrpaQEJ+etWQBJk=",
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
"owner": "hetznercloud",
"repo": "terraform-provider-hcloud",
- "rev": "v1.37.0",
+ "rev": "v1.38.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-WDnaUBTf8KTCuTdjKd598azjCg4hPDzrrijRknkVV2g="
+ "vendorHash": "sha256-gz96b+GOE7AgXzEL4odneYA01wZv4oXwz//Yyu9rg3E="
},
"helm": {
"hash": "sha256-X9keFjAmV86F/8ktxiv/VrnkHOazP9e/aOC9aRw1A48=",
@@ -530,20 +530,20 @@
"vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA="
},
"http": {
- "hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=",
+ "hash": "sha256-PNgiyawIMSkuZmC0jXiuqHp3qKNfJ0NgMijEQzTg+ow=",
"homepage": "https://registry.terraform.io/providers/hashicorp/http",
"owner": "hashicorp",
"repo": "terraform-provider-http",
- "rev": "v3.2.1",
+ "rev": "v3.3.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y="
+ "vendorHash": "sha256-73Hpp4OLJyFmbiczVmFzCi++W0te6G9LSb8LhNwSDUg="
},
"huaweicloud": {
- "hash": "sha256-VK/b74pGB8vjaWmUi8Zz4K5utIUYlfeYk18YZF8J1jI=",
+ "hash": "sha256-8ilj+9aCZAlNhQ3OMF6uWFfAAVtISfS6eahywmPAb98=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.47.1",
+ "rev": "v1.48.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -584,31 +584,31 @@
"vendorHash": null
},
"infoblox": {
- "hash": "sha256-bLZK2lZqnpiE5vsJAAiGw4BrBzVWGyg5VZq/Ngr8VlA=",
+ "hash": "sha256-C7j9WvhLePQvZlGvYC51GQRIa5JwgARNDG1nGZwY6FU=",
"homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox",
"owner": "infobloxopen",
"repo": "terraform-provider-infoblox",
- "rev": "v2.2.0",
+ "rev": "v2.3.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"jetstream": {
- "hash": "sha256-XFJo01AK5UCraIzi/KkOoVbZznJwaA8BrRAIomK3U7Q=",
+ "hash": "sha256-CFjgF02JZJ072mAMvRnObaq3t+SPeT2uXqkRvlRrG5c=",
"homepage": "https://registry.terraform.io/providers/nats-io/jetstream",
"owner": "nats-io",
"repo": "terraform-provider-jetstream",
- "rev": "v0.0.34",
+ "rev": "v0.0.35",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-vSIeSEzyJQzh9Aid/FWsF4xDYXMOhbsaLQ31mtfH7/Y="
+ "vendorHash": "sha256-OMDMpL9ox6tI9tkoSU0oVuFzRObmUGgGQy6RtsNbyIg="
},
"kafka": {
- "hash": "sha256-p8KT6K9fcd0OFy+NoZyZzQxG13fIiyMJg2yNPKIWH60=",
+ "hash": "sha256-IG0xgMs0j2jRJBa52Wsx7/r4s9DRnw5b+AfYpZAewxI=",
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
"owner": "Mongey",
"repo": "terraform-provider-kafka",
- "rev": "v0.5.2",
+ "rev": "v0.5.3",
"spdx": "MIT",
- "vendorHash": "sha256-RzC8j+Toub7kiOKW6IppjwyJ0vGEJ0YHb8YXrWFkZW4="
+ "vendorHash": "sha256-Z5APR41/+MsrHAtpTZKnG0qTi1+JSBJbPTVxNpd6f84="
},
"kafka-connect": {
"hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=",
@@ -638,11 +638,11 @@
"vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao="
},
"kubernetes": {
- "hash": "sha256-FV5FoEd0zjXa8x77r/z8Tn/I1lZI1NZ4a8yisAuAhNQ=",
+ "hash": "sha256-B13jQTZqFb5o/GRTf4iQWUbOPhbb4uYKUy35nQrKGLI=",
"homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes",
"owner": "hashicorp",
"repo": "terraform-provider-kubernetes",
- "rev": "v2.19.0",
+ "rev": "v2.20.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -665,13 +665,13 @@
"vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg="
},
"linode": {
- "hash": "sha256-uebz6flGALcmRpBYjEEj+X2YFDkTjuaGLdGGD1jY+ns=",
+ "hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=",
"homepage": "https://registry.terraform.io/providers/linode/linode",
"owner": "linode",
"repo": "terraform-provider-linode",
- "rev": "v1.30.0",
+ "rev": "v2.0.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-DbhHBmFuuyoWtGqZjXKFMpSP3Xlt5GVEhSvUyWerKtM="
+ "vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c="
},
"linuxbox": {
"hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=",
@@ -728,22 +728,22 @@
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
},
"minio": {
- "hash": "sha256-eF3yT3cI+ODGN4nqf9rTy3PUev09KMGgzvaa4znPIm4=",
+ "hash": "sha256-URn6XFqKTE3nXE5ZcaXmRvGl6qLdffLLSoMRq70zh4I=",
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
"owner": "aminueza",
"repo": "terraform-provider-minio",
- "rev": "v1.13.0",
+ "rev": "v1.14.0",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-Tps4SoiSmGwPWZgf2Q1MilpLhKnB/TCFe35Hb4DfwaU="
+ "vendorHash": "sha256-Mdy9uXYb7MH9XHqSNkG0QqTVzjvTy4+/Mr6VHXJBEZE="
},
"mongodbatlas": {
- "hash": "sha256-Ek7dIKWlyyAoEoMMTHx3DOBNuCoOtXP0CJHAsC04xy0=",
+ "hash": "sha256-NvKthj+rVT23v/V1C8w8CMTfOy3yNsMjg2knXECzay4=",
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
"owner": "mongodb",
"repo": "terraform-provider-mongodbatlas",
- "rev": "v1.8.2",
+ "rev": "v1.9.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-Eq5qsGKJnP+NOJKinDjHUeTLoeQc/BnK+e9d/O7ie7U="
+ "vendorHash": "sha256-E/1w1FVLHV5X3We3NxKG7INwQtME9FCgFW1uM/6eE38="
},
"namecheap": {
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
@@ -764,22 +764,22 @@
"vendorHash": null
},
"newrelic": {
- "hash": "sha256-/q1kKXdeVjxliE1HeGiusscLM4pYylgik88nxk5gPcs=",
+ "hash": "sha256-+awQtvyJBLSm+WYH2gp+VM2uNbWeEfIbwqw7VsikQEA=",
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
"owner": "newrelic",
"repo": "terraform-provider-newrelic",
- "rev": "v3.20.2",
+ "rev": "v3.21.3",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-WF4AdTu6lxoNSCsFKLMeQbHgH6j+hM0VNBRsue+azJA="
+ "vendorHash": "sha256-fqO3hlDUPY8/9SSMpNVD81pyaQE12zwNKDLSI54UF3M="
},
"nomad": {
- "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=",
+ "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=",
"homepage": "https://registry.terraform.io/providers/hashicorp/nomad",
"owner": "hashicorp",
"repo": "terraform-provider-nomad",
- "rev": "v1.4.19",
+ "rev": "v1.4.20",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-3t8pUAwuVeZN5cYGs72YsdRvJunudSmKSldFWEFVA/4="
+ "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc="
},
"ns1": {
"hash": "sha256-F7nKtDlVnW7jDPTeszYv9aYMAnHo2/k+MxsXdjghS88=",
@@ -801,29 +801,29 @@
},
"nutanix": {
"deleteVendor": true,
- "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=",
+ "hash": "sha256-szqvEU1cxEIBKIeHmeqT6YAEsXZDvINxfDyp76qswzw=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
- "rev": "v1.8.0",
+ "rev": "v1.8.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
"oci": {
- "hash": "sha256-r+GmKd+kOnx9xwuSORbcCamb1ea1/YZaTvyw59e0nZg=",
+ "hash": "sha256-WtdB5aI5YS5Kc33g3RXh/gneOVXhhhKXq+pW+fm44/I=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
- "rev": "v4.115.0",
+ "rev": "v4.118.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"okta": {
- "hash": "sha256-j4tOWcY3x4FpfCEdB7x5XP7Pqms97tYtEvGDn8Fjst8=",
+ "hash": "sha256-pSGoD4WSfw6lTJTn/Yf8k60CtbPjZeEPJ7mH1c6cRD0=",
"homepage": "https://registry.terraform.io/providers/okta/okta",
"owner": "okta",
"repo": "terraform-provider-okta",
- "rev": "v3.45.0",
+ "rev": "v3.46.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM="
},
@@ -837,11 +837,11 @@
"vendorHash": null
},
"opennebula": {
- "hash": "sha256-Y1rNhXnHgwpKPgN5iZxH0ChHUBOj36K3XnSOkObj10g=",
+ "hash": "sha256-r5evkpYnT2foc9ucHVkalm0qVO8UCoLhoc9ro/TerRI=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
- "rev": "v1.2.0",
+ "rev": "v1.2.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A="
},
@@ -855,13 +855,13 @@
"vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI="
},
"opentelekomcloud": {
- "hash": "sha256-QcpA7FreTgITmnt0fQHUmUK6FZMP0QCeQK2MN2Y9tFQ=",
+ "hash": "sha256-bRvs4IxnUObX/ChPdCn97VUQSxTjV2tfnmBmWmgAXUA=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
- "rev": "v1.34.1",
+ "rev": "v1.34.2",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-4tJe8v31txzLBbruicOI6WUdDk38CqfLniFyc3hWVxg="
+ "vendorHash": "sha256-VEreMBvqvBGUZz5EY5+0jbNDOVbmhYerfLYGa1rl+aw="
},
"opsgenie": {
"hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@@ -882,11 +882,11 @@
"vendorHash": null
},
"pagerduty": {
- "hash": "sha256-MouU1SOCHNf4krqZ3CABS1nCne3I+taHh9tbPGoSM6U=",
+ "hash": "sha256-NWrE6DFyoI1RQnxLThenGeFNGj8AFiVWhXysk8U7RpI=",
"homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
"owner": "PagerDuty",
"repo": "terraform-provider-pagerduty",
- "rev": "v2.12.2",
+ "rev": "v2.14.3",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -936,11 +936,11 @@
"vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y="
},
"random": {
- "hash": "sha256-eZ2K8kmR5QE/ijAzlIbZl5OI7dw1P2GdQBtoXsbGglM=",
+ "hash": "sha256-IsXKdS3B5kWY5LlNKM0fYjp2uM96ngi6vZ9F46MmfcA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/random",
"owner": "hashicorp",
"repo": "terraform-provider-random",
- "rev": "v3.5.0",
+ "rev": "v3.5.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ScY/hAb14SzEGhKLpnJ8HrWOccwc2l0XW6t+f62LyWM="
},
@@ -963,13 +963,13 @@
"vendorHash": null
},
"scaleway": {
- "hash": "sha256-pNiDT5yV+0nnNrwLbgq68csegGyvkqnOOgm9M+WKc0Y=",
+ "hash": "sha256-b0prqlZNPrg0YjvLk3RdJ+4C6eL4Tzdzt7Berp6G32c=",
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
"owner": "scaleway",
"repo": "terraform-provider-scaleway",
- "rev": "v2.16.2",
+ "rev": "v2.17.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-KUbE00fajvs4p8QxmuKV5IoRfCdWtfZTrOftcRAPSws="
+ "vendorHash": "sha256-tnZy6uN/lZaW4d6uo/quVAuEZZrXEX7qLAas0GauRJI="
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@@ -1026,13 +1026,13 @@
"vendorHash": null
},
"snowflake": {
- "hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=",
+ "hash": "sha256-ScGBo04qWjSuYXKHynn/rpd+2iKf+K+musYt/eWJfok=",
"homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
"owner": "Snowflake-Labs",
"repo": "terraform-provider-snowflake",
- "rev": "v0.61.0",
+ "rev": "v0.63.0",
"spdx": "MIT",
- "vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g="
+ "vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE="
},
"sops": {
"hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",
@@ -1044,13 +1044,13 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
- "hash": "sha256-g/kELVG+hsR+RynLfyB0MQkjC7eUeUUVn/h7S/MABXU=",
+ "hash": "sha256-KC7A7BgGF2erEZKW/hTiveZB0GaCAkzpmkbsF21Ihsg=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
- "rev": "v1.110.0",
+ "rev": "v1.115.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-2HApI9Cw63zxzgSP9Xe6xAcqHDx8KSlRiIh+IVSEUfo="
+ "vendorHash": "sha256-6ZxurzzOa/1TXOApQNLFUrY+Ryxc7n+JwZG76JuePGc="
},
"stackpath": {
"hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=",
@@ -1089,38 +1089,38 @@
"vendorHash": "sha256-6UxBnQiogcizff5Rv4eadOeiG5JaXQphUWlfnqELvAI="
},
"talos": {
- "hash": "sha256-/Ml+Vsh50U5CoVdnls69iTPoSPpgAtOpO2hWlcmbyKw=",
+ "hash": "sha256-bYDFtng6kASmBtQN+iewVOh6HPD57GDUuusiQSVfuBs=",
"homepage": "https://registry.terraform.io/providers/siderolabs/talos",
"owner": "siderolabs",
"repo": "terraform-provider-talos",
- "rev": "v0.1.2",
+ "rev": "v0.2.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
+ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
},
"tencentcloud": {
- "hash": "sha256-Wapcnyf1jN75ZKZTFXMixRNianq1FWC8TMddXmFSmj8=",
+ "hash": "sha256-ZwThN4kqScXumJXrw2s3NoWY/ZgCOrb0JAwiZWX3GIQ=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
- "rev": "v1.80.2",
+ "rev": "v1.80.6",
"spdx": "MPL-2.0",
"vendorHash": null
},
"tfe": {
- "hash": "sha256-K0l9oaYkgilz47ErUxio9oJtPHQTWZnKdPpjRZ1SDhg=",
+ "hash": "sha256-GQPp7od9KM8x82qg88JIITnkMMUzTAEDWeVX2VujKfM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
"owner": "hashicorp",
"repo": "terraform-provider-tfe",
- "rev": "v0.43.0",
+ "rev": "v0.44.1",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-plYy3INLi/SeKu7R0lDLY1CvRDU7bmZsQKzFtMc2Wu4="
+ "vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc="
},
"thunder": {
- "hash": "sha256-GmFEgEKpkx+cvztHe2qDTVStMIGYYzmbZM8/QmSwbcA=",
+ "hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=",
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
"owner": "a10networks",
"repo": "terraform-provider-thunder",
- "rev": "v1.2.0",
+ "rev": "v1.2.1",
"spdx": "BSD-2-Clause",
"vendorHash": null
},
@@ -1162,41 +1162,41 @@
"vendorHash": null
},
"ucloud": {
- "hash": "sha256-1gKDd1lLGkDDKfg9a98J8W7kO2RZG1Q0XUM182WCdhU=",
+ "hash": "sha256-onsIA/cROImSgdU9PfnkmXbTtEd6OZ4ka+e+DSzOOlY=",
"homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
"owner": "ucloud",
"repo": "terraform-provider-ucloud",
- "rev": "v1.35.1",
+ "rev": "v1.36.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
"utils": {
- "hash": "sha256-nLi6aczJdADzdYNJaZldUOFFjgf3ujDdRrhSCuphIn8=",
+ "hash": "sha256-vxX8r6bbhp/lGeS2GciqAnwetjG3B5qzCLJnTQIWino=",
"homepage": "https://registry.terraform.io/providers/cloudposse/utils",
"owner": "cloudposse",
"repo": "terraform-provider-utils",
- "rev": "1.7.1",
+ "rev": "1.8.0",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U="
+ "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ="
},
"vault": {
- "hash": "sha256-HI+/vGQPwQWnTYyYZa5a7N1esWf2EQL2lziuZMv8DNE=",
+ "hash": "sha256-oyR9xqEnpt5JoTIe1jgV3aMDxKFdvrDx39UWNc5ECTM=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-vault",
- "rev": "v3.14.0",
+ "rev": "v3.15.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU="
},
"vcd": {
- "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=",
+ "hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=",
"homepage": "https://registry.terraform.io/providers/vmware/vcd",
"owner": "vmware",
"repo": "terraform-provider-vcd",
- "rev": "v3.8.2",
+ "rev": "v3.9.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU="
+ "vendorHash": "sha256-dYFLohH/gU+cAiaLLNluxAjfj7giqnk+zQKGVSR1Kws="
},
"venafi": {
"hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=",
@@ -1235,11 +1235,11 @@
"vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI="
},
"vultr": {
- "hash": "sha256-fEeKvV2t38gD5SLYAgEOJJSPjTcIhCtIYmOYMFiwcYg=",
+ "hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=",
"homepage": "https://registry.terraform.io/providers/vultr/vultr",
"owner": "vultr",
"repo": "terraform-provider-vultr",
- "rev": "v2.13.0",
+ "rev": "v2.14.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
index 0182a4ce50..636570150e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix
@@ -166,9 +166,9 @@ rec {
mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform {
- version = "1.4.4";
- hash = "sha256-Fg9NDV063gWi9Na144jjkK7E8ysE2GR4IYT6qjTgnqw=";
- vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE=";
+ version = "1.4.6";
+ hash = "sha256-V5sI8xmGASBZrPFtsnnfMEHapjz4BH3hvl0+DGjUSxQ=";
+ vendorHash = "sha256-OW/aS6aBoHABxfdjDxMJEdHwLuHHtPR2YVW4l0sHPjE=";
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
index 3708ad4132..7b97af410d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.45.0";
+ version = "0.45.5";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-SyA1DP9xm8NbgDfGOyzNZwaWq6Wn8IOiiL/m516/cLw=";
+ hash = "sha256-Azf9A/ZHb8wFRsd7iv9Y4jr9xs8R7vNUffz9ky07SVk=";
};
- vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y=";
+ vendorHash = "sha256-V7+N+vEOS4DXHglErD5YoUzu6EN4YRljV581kFnjK2M=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
index ebb28798f5..d9900e07cb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix
@@ -5,15 +5,15 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the
source tree, which is not there once build completes. */
- version = "0.31.2";
+ version = "0.32.2";
src = fetchFromGitHub {
owner = "tilt-dev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8=";
+ sha256 = "sha256-YB/stG+7gxIaB+vMx8PwmUm4W32fCNeRnVrOvOXba5k=";
};
- vendorSha256 = null;
+ vendorHash = null;
subPackages = [ "cmd/tilt" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
index 5c95cfb568..dcd1186850 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
- version = "1.2.219";
+ version = "1.2.225";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
- hash = "sha256-yenIGKN6OoDxPRn4aHOQu8Msp1WzjLZzTZkSSKq1zlc=";
+ hash = "sha256-t8IO+x8YXB+5TnO9fglzubNXOhCJQPw1p0E/pkgKGfM=";
};
- vendorHash = "sha256-lif2Vj8HQH8rZeBIky1lz5J6ISdV2yPyR1vQrPcZLuU=";
+ vendorHash = "sha256-GCGfhcm/96w73S/NQc8lBDUHon6pB0i5t5qIvBD8f08=";
proxyVendor = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
index 1366bfa7fd..1acbd96817 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
@@ -6,19 +6,19 @@
buildGoModule rec {
pname = "coreth";
- version = "0.11.9";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
- hash = "sha256-i0mLyTeosGlnTpKvAUS3wDvBRFpgmnfmKXAtCnAGqE0=";
+ hash = "sha256-VZxViKtpdDkEC94DgYPHCjCcqrA3H3Uef/pK/ZqINkU=";
};
# go mod vendor has a bug, see: golang/go#57529
proxyVendor = true;
- vendorHash = "sha256-zX1rQ9RDBkzZIbqCDlFEgseYyKYUHYyGFApZqhOrkGU=";
+ vendorHash = "sha256-+tgDdhrSJb3h3NXhwcdgSWo2+NvYl18HW6dVEUOSpVs=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix
index 9aaf19d75e..f86fd87573 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix
@@ -12,11 +12,11 @@
mkDerivation rec {
pname = "datovka";
- version = "4.22.0";
+ version = "4.22.1";
src = fetchurl {
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
- sha256 = "sha256-MM2fTONdgvCOrVlMlBgpaoaZLbuSMVG/ENOx2egug98=";
+ sha256 = "sha256-R18dBsfrMBcBB3EraC0tIJABwZBROFqi/fhm62IDa2g=";
};
buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
index e3775db084..653f27fcc1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix
@@ -1,19 +1,21 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "dnscontrol";
- version = "3.30.0";
+ version = "3.31.2";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/ULO0ev1ybENaSrzAgblUdnyGp6QfFxO8XSHpH2wGpU=";
+ sha256 = "sha256-vKfbL2a/5rTVsG0rDs/D0t5eXDNWlbwURI2FYzGu9lY=";
};
- vendorHash = "sha256-BtwSn3MLeMkjKBRXhln7hCB3wBVkKASe0zzfqbALQMQ=";
+ vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8=";
- ldflags = [ "-s" "-w" ];
+ subPackages = [ "." ];
+
+ ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
preCheck = ''
# requires network
@@ -23,6 +25,7 @@ buildGoModule rec {
meta = with lib; {
description = "Synchronize your DNS to multiple providers from a simple DSL";
homepage = "https://stackexchange.github.io/dnscontrol/";
+ changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ mmahut SuperSandro2000 ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
index a65110b802..d2924df2ce 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildFHSUserEnv, writeScript, makeDesktopItem }:
+{ stdenv, lib, buildFHSEnv, writeScript, makeDesktopItem }:
let platforms = [ "i686-linux" "x86_64-linux" ]; in
@@ -30,7 +30,7 @@ let
};
in
-buildFHSUserEnv {
+buildFHSEnv {
name = "dropbox";
targetPkgs = pkgs: with pkgs; with xorg; [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index afddb6be87..eb7d1bf5c8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -1,8 +1,6 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
pname = "cfdyndns";
version = "0.0.3";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
index 0bc0fd34fe..fa88705ad2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/expressvpn/default.nix
@@ -1,5 +1,5 @@
{ autoPatchelfHook
-, buildFHSUserEnv
+, buildFHSEnv
, dpkg
, fetchurl
, inotify-tools
@@ -41,7 +41,7 @@ let
'';
};
- expressvpndFHS = buildFHSUserEnv {
+ expressvpndFHS = buildFHSEnv {
name = "expressvpnd";
# When connected, it directly creates/deletes resolv.conf to change the DNS entries.
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
new file mode 100644
index 0000000000..46acbd5d78
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "feed2imap-go";
+ version = "1.6.0";
+
+ src = fetchFromGitHub {
+ owner = "Necoro";
+ repo = "feed2imap-go";
+ rev = "v${version}";
+ sha256 = "sha256-zRp/MfRtCgzYFNKoV4IWbORfCy7vaaDgmRvNQ0cICNQ=";
+ };
+
+ vendorHash = "sha256-py0totvLLw3kahEtdZkES1t7tZsKBAUS6IMTcn847kE=";
+
+ # The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94)
+ postInstall = ''
+ rm -f $out/bin/print-cache
+ '';
+
+ meta = with lib; {
+ description = "Uploads rss feeds as e-mails onto an IMAP server";
+ homepage = "https://github.com/Necoro/feed2imap-go";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ nomeata ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix
index e2ef900ffb..0fd6bbee8b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses
-, asciidoctor, libiconv, Security, Foundation, makeWrapper }:
+, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }:
rustPlatform.buildRustPackage rec {
pname = "newsboat";
@@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec {
done
'';
+ passthru = {
+ updateScript = nix-update-script { };
+ };
+
meta = with lib; {
homepage = "https://newsboat.org/";
changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
index f7c5133018..8d09ee5c77 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.17.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
"gimli",
]
@@ -82,16 +82,56 @@ dependencies = [
]
[[package]]
-name = "anyhow"
-version = "1.0.66"
+name = "anstream"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-wincon",
+ "concolor-override",
+ "concolor-query",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "arc-swap"
-version = "1.5.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164"
+checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "article_scraper"
@@ -115,27 +155,30 @@ dependencies = [
[[package]]
name = "ashpd"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dcc8ed0b5211687437636d8c95f6a608f4281d142101b3b5d314b38bfadd40f"
+checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41"
dependencies = [
+ "async-std",
"enumflags2",
- "futures",
+ "futures-channel",
+ "futures-util",
+ "once_cell",
"rand 0.8.5",
"serde",
"serde_repr",
+ "url",
"zbus",
]
[[package]]
name = "async-broadcast"
-version = "0.4.1"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d26004fe83b2d1cd3a97609b21e39f9a31535822210fe83205d2ce48866ea61"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
dependencies = [
"event-listener",
"futures-core",
- "parking_lot 0.12.1",
]
[[package]]
@@ -165,9 +208,9 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
dependencies = [
"async-lock",
"async-task",
@@ -178,63 +221,121 @@ dependencies = [
]
[[package]]
-name = "async-io"
-version = "1.12.0"
+name = "async-fs"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
dependencies = [
"async-lock",
"autocfg",
+ "blocking",
+ "futures-lite",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock",
+ "autocfg",
+ "cfg-if",
"concurrent-queue",
"futures-lite",
- "libc",
"log",
"parking",
"polling",
+ "rustix",
"slab",
"socket2",
"waker-fn",
- "windows-sys 0.42.0",
]
[[package]]
name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
dependencies = [
"event-listener",
- "futures-lite",
]
[[package]]
name = "async-recursion"
-version = "0.3.2"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
+]
+
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
]
[[package]]
name = "async-task"
-version = "4.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.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.13",
]
+[[package]]
+name = "atomic-waker"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+
[[package]]
name = "atty"
version = "0.2.14"
@@ -254,15 +355,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.66"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
- "miniz_oxide 0.5.4",
+ "miniz_oxide 0.6.2",
"object",
"rustc-demangle",
]
@@ -275,9 +376,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.20.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bigdecimal"
@@ -292,9 +393,9 @@ dependencies = [
[[package]]
name = "bit_field"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
name = "bitflags"
@@ -302,6 +403,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3"
+
[[package]]
name = "block"
version = "0.1.6"
@@ -320,9 +427,9 @@ dependencies = [
[[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",
]
@@ -343,6 +450,21 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
+[[package]]
+name = "blocking"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+dependencies = [
+ "async-channel",
+ "async-lock",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "log",
+]
+
[[package]]
name = "brotli"
version = "3.3.4"
@@ -356,9 +478,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",
@@ -366,15 +488,15 @@ 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 = "bytemuck"
-version = "1.12.3"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
[[package]]
name = "byteorder"
@@ -384,17 +506,17 @@ 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 = "cairo-rs"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "247e1183fa769ac22121f92276dae52f89acaf297f24b1320019f439b6e3b46f"
+checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-sys-rs",
"glib",
"libc",
@@ -404,9 +526,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
+checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e"
dependencies = [
"glib-sys",
"libc",
@@ -415,15 +537,15 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.77"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"
dependencies = [
"smallvec",
]
@@ -436,9 +558,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",
"js-sys",
@@ -460,25 +582,31 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.0.29"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
dependencies = [
- "bitflags",
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
"clap_lex",
- "is-terminal",
"strsim",
- "termcolor",
]
[[package]]
name = "clap_lex"
-version = "0.3.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
[[package]]
name = "codespan-reporting"
@@ -508,22 +636,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
-name = "concurrent-queue"
-version = "2.0.0"
+name = "concolor-override"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b"
+checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+
+[[package]]
+name = "concolor-query"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+dependencies = [
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "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 0.3.17",
+ "time 0.3.20",
"version_check",
]
@@ -539,7 +682,7 @@ dependencies = [
"publicsuffix",
"serde",
"serde_json",
- "time 0.3.17",
+ "time 0.3.20",
"url",
]
@@ -555,15 +698,15 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
dependencies = [
"libc",
]
@@ -588,9 +731,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -598,9 +741,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
@@ -609,22 +752,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.8.0",
"scopeguard",
]
[[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",
]
@@ -646,10 +789,20 @@ dependencies = [
]
[[package]]
-name = "cxx"
-version = "1.0.83"
+name = "ctor"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cxx"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -659,9 +812,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -669,24 +822,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -719,7 +872,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -741,9 +894,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
[[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 = [
"bigdecimal",
"chrono",
@@ -756,20 +909,20 @@ dependencies = [
"num-traits",
"r2d2",
"serde_json",
- "time 0.3.17",
+ "time 0.3.20",
"uuid",
]
[[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]]
@@ -801,7 +954,7 @@ checksum = "b93a2d033d9e1887e8ea6e13a03b9fcf20e66b4891cd0dfb98ef280cff7afaa8"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -819,7 +972,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
"crypto-common",
]
@@ -829,7 +982,16 @@ version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [
- "dirs-sys",
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
+dependencies = [
+ "dirs-sys 0.4.0",
]
[[package]]
@@ -844,16 +1006,27 @@ dependencies = [
]
[[package]]
-name = "either"
-version = "1.8.0"
+name = "dirs-sys"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
+dependencies = [
+ "libc",
+ "redox_users",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[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",
]
@@ -873,14 +1046,14 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "enumflags2"
-version = "0.7.5"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
+checksum = "0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b"
dependencies = [
"enumflags2_derive",
"serde",
@@ -888,24 +1061,24 @@ dependencies = [
[[package]]
name = "enumflags2_derive"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+checksum = "9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -935,17 +1108,18 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "exr"
-version = "1.5.2"
+version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded"
+checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4"
dependencies = [
"bit_field",
"flume",
"half",
"lebe",
"miniz_oxide 0.6.2",
+ "rayon-core",
"smallvec",
- "threadpool",
+ "zune-inflate",
]
[[package]]
@@ -976,24 +1150,24 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"synstructure",
]
[[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 = "feed-rs"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d64de1e04054dfddba4f91535b9b510febc849d77d66e274642a81ff7d90f2a"
+checksum = "9dbec361cb401c1b86aea784fb809073733da06b1a1fd794222e7bf9845db327"
dependencies = [
"chrono",
"lazy_static",
@@ -1009,9 +1183,9 @@ dependencies = [
[[package]]
name = "feedbin_api"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4647c7addccfe78ec9c10cf26ee0cdf8c7e7550195a507a6d7a9077ae6184f6"
+checksum = "e548b6bc1c89c0c92d269bccd154c9052e423c45fb950770077374be1b6b9749"
dependencies = [
"chrono",
"reqwest",
@@ -1056,11 +1230,11 @@ dependencies = [
[[package]]
name = "field-offset"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
dependencies = [
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
"rustc_version",
]
@@ -1084,7 +1258,7 @@ dependencies = [
"futures-sink",
"nanorand",
"pin-project",
- "spin 0.9.4",
+ "spin 0.9.8",
]
[[package]]
@@ -1129,9 +1303,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -1144,9 +1318,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -1154,15 +1328,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -1172,15 +1346,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
"fastrand",
"futures-core",
@@ -1193,32 +1367,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "futures-sink"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -1234,22 +1408,23 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.16.4"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3094f2b8578136d1929cade4e0fff82f573521b579e96cfc24af2458431f176"
+checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gdk-pixbuf-sys",
"gio",
"glib",
"libc",
+ "once_cell",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
+checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b"
dependencies = [
"gio-sys",
"glib-sys",
@@ -1260,11 +1435,11 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272db1bbb9b152ea1fea946f9d464085c86cfe14cafba450d7defa433caff8ec"
+checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
@@ -1276,9 +1451,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b571f36b889ab529b2e173248dafe83d75c703f5685b9845e490c7994ae309"
+checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1293,9 +1468,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -1314,9 +1489,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if",
"js-sys",
@@ -1356,18 +1531,28 @@ dependencies = [
]
[[package]]
-name = "gimli"
-version = "0.26.2"
+name = "gif"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
[[package]]
name = "gio"
-version = "0.16.6"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fac6c15256cdf84beb9a4948f786f9605799ad69675ea1b8932753f3aa94cf"
+checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
@@ -1383,9 +1568,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
+checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1396,11 +1581,11 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.16.6"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89359c8c338310b46300502814fc5a0350bb731ddfea03d0ec725d32163244b7"
+checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-executor",
@@ -1411,6 +1596,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
+ "memchr",
"once_cell",
"smallvec",
"thiserror",
@@ -1418,9 +1604,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.16.3"
+version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf"
+checksum = "bc4cf346122086f196260783aa58987190dbd5f43bfab01946d2bf9786e8d9ef"
dependencies = [
"anyhow",
"heck",
@@ -1428,24 +1614,36 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
+checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5"
dependencies = [
"libc",
"system-deps",
]
[[package]]
-name = "gobject-sys"
-version = "0.16.3"
+name = "gloo-timers"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gobject-sys"
+version = "0.17.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0"
dependencies = [
"glib-sys",
"libc",
@@ -1454,9 +1652,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.16.3"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
+checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256"
dependencies = [
"glib",
"graphene-sys",
@@ -1465,9 +1663,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
+checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9"
dependencies = [
"glib-sys",
"libc",
@@ -1477,9 +1675,9 @@ dependencies = [
[[package]]
name = "greader_api"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "208f898cf146309359b9315f54a077047038b34a2ed799da4abad04c580ab2d6"
+checksum = "2f83b96865d8645f89a0353148d8c8a466e877f5f62ceef5342b6b8891d5ca23"
dependencies = [
"chrono",
"log",
@@ -1487,16 +1685,17 @@ dependencies = [
"serde",
"serde_json",
"thiserror",
+ "tokio",
"url",
]
[[package]]
name = "gsk4"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4053293b79099bdfecd9ab0d811d118a0eafce613dfe0b26075419d955f1f652"
+checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"gdk4",
"glib",
@@ -1508,9 +1707,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08e0642edffdb35028d7d67b830678da98844216b6442e11eee52c91ad2a6dc2"
+checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -1524,11 +1723,11 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.5.4"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8954da3659ff1cb35aa95110021b33fadcd8e306e8fe41f32146ffa009665a79"
+checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"field-offset",
"futures-channel",
@@ -1547,23 +1746,23 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.5.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58138cd3c595e04f82df050390aa7d2bd093795ce569e5f1d49eb496ef67fe7b"
+checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef29e09e055b2f2550eb1882caa6961a1ae3c971a70bcb25cb9d5ab6cbd63821"
+checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1580,9 +1779,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",
@@ -1599,18 +1798,18 @@ dependencies = [
[[package]]
name = "half"
-version = "2.1.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554"
+checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
dependencies = [
"crunchy",
]
[[package]]
name = "hard-xml"
-version = "1.19.0"
+version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e3ff76e6693f92da6552e69982ca998b3decf0d23c7fc7faddaf44943f90a7"
+checksum = "2e352818f3837f84861450edf5d274ff601663a38a4488e96c42f08cc112f797"
dependencies = [
"hard-xml-derive",
"jetscii",
@@ -1621,14 +1820,14 @@ dependencies = [
[[package]]
name = "hard-xml-derive"
-version = "1.19.0"
+version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9b3cb8c4955880e37382c34a279fb0900fc9248c1edaf3247c576098981989"
+checksum = "52e644596eb580f65e712e6e0957f1eaa642197ea865011ca540376ae6a21881"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1639,9 +1838,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[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"
@@ -1661,6 +1860,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -1705,14 +1910,14 @@ dependencies = [
"markup5ever",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[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",
@@ -1750,9 +1955,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[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",
@@ -1800,16 +2005,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows",
]
[[package]]
@@ -1852,7 +2057,7 @@ dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "gif",
+ "gif 0.11.4",
"jpeg-decoder 0.1.22",
"num-iter",
"num-rational 0.3.2",
@@ -1864,20 +2069,20 @@ dependencies = [
[[package]]
name = "image"
-version = "0.24.5"
+version = "0.24.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
"exr",
- "gif",
+ "gif 0.12.0",
"jpeg-decoder 0.3.0",
"num-rational 0.4.1",
"num-traits",
"png 0.17.7",
- "scoped_threadpool",
+ "qoi",
"tiff 0.8.1",
]
@@ -1889,9 +2094,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[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",
@@ -1908,12 +2113,13 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
+ "hermit-abi 0.3.1",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1930,9 +2136,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.7.0"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "ipnetwork"
@@ -1945,14 +2151,14 @@ dependencies = [
[[package]]
name = "is-terminal"
-version = "0.4.1"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1966,26 +2172,26 @@ dependencies = [
[[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 = "javascriptcore5-rs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8313cebdffad7932ac262fd452ce12a8489dfdad6b642cd96c730a8fcaf011"
+name = "javascriptcore6"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"glib",
- "javascriptcore5-rs-sys",
+ "javascriptcore6-sys",
+ "libc",
+ "once_cell",
]
[[package]]
-name = "javascriptcore5-rs-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1ce89ec7de6265cfa2783e934bf3628c06ecaed029b90c0509b0b792811dbe0"
+name = "javascriptcore6-sys"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -2019,13 +2225,22 @@ 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 = "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"
@@ -2040,11 +2255,11 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libadwaita"
-version = "0.2.1"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
+checksum = "e82776542b73ac5691b2bddf3e2aaf0157d34f35193fb522de2fc258006c1785"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"gdk-pixbuf",
"gdk4",
@@ -2059,9 +2274,9 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.2.1"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
+checksum = "91be74a61f26efa6946c02dad76eb4cd3021addb0ff85dde445c1cd41d2eca2d"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -2075,9 +2290,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.138"
+version = "0.2.141"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]]
name = "libsqlite3-sys"
@@ -2102,9 +2317,9 @@ dependencies = [
[[package]]
name = "libxml"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687f5a78939052c5d02865c0fe3ea2ce2acdca875f7f81db82f7aef256dd97ac"
+checksum = "ca310e4db05e9b7386ad0734975fabc912b66f6bc50a98f525e690822da1ee0e"
dependencies = [
"libc",
"pkg-config",
@@ -2113,9 +2328,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",
]
@@ -2137,9 +2352,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "locale_config"
@@ -2172,6 +2387,7 @@ checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
"serde",
+ "value-bag",
]
[[package]]
@@ -2287,9 +2503,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
[[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 = "md-5"
@@ -2316,18 +2532,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
dependencies = [
"autocfg",
]
[[package]]
name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg",
]
@@ -2339,7 +2555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc"
dependencies = [
"serde",
- "toml",
+ "toml 0.5.11",
]
[[package]]
@@ -2355,9 +2571,9 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
@@ -2404,15 +2620,6 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.6.2"
@@ -2424,14 +2631,14 @@ 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]]
@@ -2440,7 +2647,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
]
[[package]]
@@ -2470,12 +2677,12 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
[[package]]
name = "news-flash"
version = "2.2.2"
-source = "git+https://gitlab.com/news-flash/news_flash.git#deb6cd2a2633739bb342e048440f3c2c78fcc635"
+source = "git+https://gitlab.com/news-flash/news_flash.git#6242fc25cc3ee5e9c02a07ffb491b2d153958ce6"
dependencies = [
"article_scraper",
"async-trait",
- "base64 0.20.0",
- "bitflags",
+ "base64 0.21.0",
+ "bitflags 2.1.0",
"bytes",
"chrono",
"diesel",
@@ -2488,9 +2695,8 @@ dependencies = [
"futures",
"greader_api",
"hex",
- "image 0.24.5",
- "itertools",
- "libxml 0.3.1",
+ "image 0.24.6",
+ "libxml 0.3.2",
"log",
"magic-crypt",
"mime",
@@ -2507,7 +2713,7 @@ dependencies = [
"regex",
"reqwest",
"rust-embed",
- "semver 1.0.14",
+ "semver",
"serde",
"serde_json",
"thiserror",
@@ -2523,7 +2729,7 @@ dependencies = [
"clap",
"color-backtrace",
"diffus",
- "dirs",
+ "dirs 5.0.0",
"eyre",
"feedly_api",
"futures",
@@ -2535,7 +2741,7 @@ dependencies = [
"gsk4",
"gtk4",
"html2pango",
- "javascriptcore5-rs",
+ "javascriptcore6",
"libadwaita",
"log",
"log4rs",
@@ -2554,14 +2760,14 @@ dependencies = [
"thiserror",
"tokio",
"url",
- "webkit2gtk5",
+ "webkit6",
"xmltree",
]
[[package]]
name = "newsblur_api"
version = "0.2.0"
-source = "git+https://gitlab.com/news-flash/newsblur_api.git#e19bc15db9b428717dd33f8fd91e7c5ade876816"
+source = "git+https://gitlab.com/news-flash/newsblur_api.git#de359af9cfaea40cb603efd6f939a162f2973500"
dependencies = [
"reqwest",
"serde",
@@ -2572,11 +2778,11 @@ dependencies = [
[[package]]
name = "nextcloud_news_api"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f170c0d62b750186b712ff628ca759a0e55b91c90a2ee5c9ac0456ed2be9b790"
+checksum = "488e5fb51484deb6bc5bc22f0b0db4902ae7e391d075f8d1a1b9a9674ea326d3"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
"log",
"reqwest",
"serde",
@@ -2589,15 +2795,16 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.23.2"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "bitflags",
- "cc",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
- "memoffset 0.6.5",
+ "memoffset 0.7.1",
+ "pin-utils",
+ "static_assertions",
]
[[package]]
@@ -2665,19 +2872,19 @@ 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 0.1.19",
+ "hermit-abi 0.2.6",
"libc",
]
[[package]]
name = "obfstr"
-version = "0.4.1"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a32982fced7de6834f4583fde19da2db188afbb4ba57bea6f024f7bf40c542"
+checksum = "e3ba2979b86cc910a6d13837ef97fef0c6b68fa807c5e014d622449db18351dc"
[[package]]
name = "objc"
@@ -2710,18 +2917,18 @@ dependencies = [
[[package]]
name = "object"
-version = "0.29.0"
+version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "opaque-debug"
@@ -2731,11 +2938,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.44"
+version = "0.10.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
+checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
@@ -2746,13 +2953,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
@@ -2763,11 +2970,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.79"
+version = "0.9.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
+checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -2796,27 +3002,21 @@ dependencies = [
[[package]]
name = "ordered-stream"
-version = "0.0.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
dependencies = [
"futures-core",
"pin-project-lite",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
[[package]]
name = "pango"
-version = "0.16.5"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
+checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gio",
"glib",
"libc",
@@ -2826,9 +3026,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
+checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -2838,9 +3038,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "parking_lot"
@@ -2860,7 +3060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.5",
+ "parking_lot_core 0.9.7",
]
[[package]]
@@ -2872,22 +3072,22 @@ dependencies = [
"cfg-if",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"winapi",
]
[[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",
+ "redox_syscall 0.2.16",
"smallvec",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -2896,16 +3096,6 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-[[package]]
-name = "pest"
-version = "2.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
[[package]]
name = "phf"
version = "0.10.1"
@@ -2961,7 +3151,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2988,7 +3178,7 @@ version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crc32fast",
"deflate",
"miniz_oxide 0.3.7",
@@ -3000,7 +3190,7 @@ version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crc32fast",
"flate2",
"miniz_oxide 0.6.2",
@@ -3008,16 +3198,18 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.5.2"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa"
dependencies = [
"autocfg",
+ "bitflags 1.3.2",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3034,13 +3226,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]]
name = "proc-macro-crate"
-version = "1.2.1"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
"once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
]
[[package]]
@@ -3052,7 +3243,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -3067,17 +3258,11 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@@ -3098,6 +3283,15 @@ dependencies = [
"psl-types",
]
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
[[package]]
name = "quick-error"
version = "1.2.3"
@@ -3106,9 +3300,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quick-xml"
-version = "0.25.0"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e21a144a0ffb5fad7b464babcdab934a325ad69b7c0373bcfef5cbd9799ca9"
+checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41"
dependencies = [
"encoding_rs",
"memchr",
@@ -3116,9 +3310,9 @@ dependencies = [
[[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",
]
@@ -3194,7 +3388,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
]
[[package]]
@@ -3226,9 +3420,9 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
@@ -3236,9 +3430,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.10.1"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -3258,7 +3452,16 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
@@ -3267,16 +3470,16 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.9",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.7.0"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
@@ -3285,27 +3488,18 @@ 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.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
dependencies = [
"async-compression",
- "base64 0.13.1",
+ "base64 0.21.0",
"bytes",
"cookie",
"cookie_store",
@@ -3327,7 +3521,6 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
- "proc-macro-hack",
"rustls",
"rustls-pemfile",
"serde",
@@ -3375,9 +3568,9 @@ dependencies = [
[[package]]
name = "rust-embed"
-version = "6.4.2"
+version = "6.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "283ffe2f866869428c92e0d61c2f35dfb4355293cdfdc48f49e895c15f1333d1"
+checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
@@ -3386,23 +3579,23 @@ dependencies = [
[[package]]
name = "rust-embed-impl"
-version = "6.3.1"
+version = "6.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ab23d42d71fb9be1b643fe6765d292c5e14d46912d13f3ae2815ca048ea04d"
+checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7"
dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"shellexpand",
- "syn",
+ "syn 1.0.109",
"walkdir",
]
[[package]]
name = "rust-embed-utils"
-version = "7.3.0"
+version = "7.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054"
+checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731"
dependencies = [
"sha2 0.10.6",
"walkdir",
@@ -3410,38 +3603,38 @@ 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_version"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 0.11.0",
+ "semver",
]
[[package]]
name = "rustix"
-version = "0.36.5"
+version = "0.37.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.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",
@@ -3451,18 +3644,18 @@ 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 0.13.1",
+ "base64 0.21.0",
]
[[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"
@@ -3475,19 +3668,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 0.12.1",
]
@@ -3506,9 +3698,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"
@@ -3522,11 +3714,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",
@@ -3535,9 +3727,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",
@@ -3545,33 +3737,15 @@ dependencies = [
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
-version = "1.0.150"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
dependencies = [
"serde_derive",
]
@@ -3588,20 +3762,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.150"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[package]]
name = "serde_json"
-version = "1.0.89"
+version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
dependencies = [
"itoa",
"ryu",
@@ -3610,13 +3784,22 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.9"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
]
[[package]]
@@ -3645,19 +3828,15 @@ dependencies = [
[[package]]
name = "sha1"
-version = "0.6.1"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
- "sha1_smol",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
]
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
[[package]]
name = "sha2"
version = "0.9.9"
@@ -3688,9 +3867,15 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
dependencies = [
- "dirs",
+ "dirs 4.0.0",
]
+[[package]]
+name = "simd-adler32"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+
[[package]]
name = "siphasher"
version = "0.3.10"
@@ -3699,9 +3884,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",
]
@@ -3714,19 +3899,34 @@ 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",
]
[[package]]
-name = "soup3-sys"
-version = "0.3.1"
+name = "soup3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "014bbeb1c4cdb30739dc181e8d98b7908f124d9555843afa89b5570aaf4ec62b"
+checksum = "5efe3b0d8335955d6433720767503233dc50ef4fb7fb72cd66634dbf764bb019"
+dependencies = [
+ "bitflags 1.3.2",
+ "futures-channel",
+ "gio",
+ "glib",
+ "libc",
+ "once_cell",
+ "soup3-sys",
+]
+
+[[package]]
+name = "soup3-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "468c7c093ce5665bd19d19a871faf7b92f257788d1311ac874ab157b18867648"
dependencies = [
"gio-sys",
"glib-sys",
@@ -3743,9 +3943,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
-version = "0.9.4"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
dependencies = [
"lock_api",
]
@@ -3758,9 +3958,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "string_cache"
-version = "0.8.4"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
@@ -3790,9 +3990,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[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.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
dependencies = [
"proc-macro2",
"quote",
@@ -3807,20 +4018,20 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"unicode-xid",
]
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"
dependencies = [
"cfg-expr",
"heck",
"pkg-config",
- "toml",
+ "toml 0.7.3",
"version-compare",
]
@@ -3832,16 +4043,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -3857,31 +4067,31 @@ dependencies = [
[[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.13",
]
[[package]]
@@ -3891,19 +4101,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f"
dependencies = [
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"winapi",
]
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
[[package]]
name = "tiff"
version = "0.6.1"
@@ -3950,9 +4151,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",
"serde",
@@ -3968,9 +4169,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",
]
@@ -3986,44 +4187,43 @@ 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.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.13",
]
[[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",
@@ -4054,9 +4254,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",
@@ -4068,13 +4268,47 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.9"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
+[[package]]
+name = "toml"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
[[package]]
name = "tower-service"
version = "0.3.2"
@@ -4101,7 +4335,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4160,9 +4394,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 = "typemap-ors"
@@ -4179,12 +4413,6 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "uds_windows"
version = "1.0.2"
@@ -4206,15 +4434,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"
@@ -4261,6 +4489,7 @@ dependencies = [
"form_urlencoded",
"idna 0.3.0",
"percent-encoding",
+ "serde",
]
[[package]]
@@ -4270,12 +4499,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
-name = "uuid"
-version = "1.2.2"
+name = "utf8parse"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "uuid"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
+]
+
+[[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]]
@@ -4304,12 +4549,11 @@ 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",
]
@@ -4343,9 +4587,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",
@@ -4353,24 +4597,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",
@@ -4380,9 +4624,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",
@@ -4390,67 +4634,62 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.83"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.83"
+version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "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",
]
[[package]]
-name = "webkit2gtk5"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42da6fb3081c4344993f93df84b735920ddb0db4679b423e32599c067d0ffaaf"
+name = "webkit6"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473"
dependencies = [
- "bitflags",
- "cairo-rs",
+ "bitflags 1.3.2",
"gdk4",
"gio",
"glib",
"gtk4",
- "javascriptcore5-rs",
+ "javascriptcore6",
"libc",
"once_cell",
- "webkit2gtk5-sys",
+ "soup3",
+ "webkit6-sys",
]
[[package]]
-name = "webkit2gtk5-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab365bcade4be14fb779de0a8ca99958f2e54a93087caa32b413d3a233b209c8"
+name = "webkit6-sys"
+version = "0.1.0"
+source = "git+https://gitlab.gnome.org/JanGernert/webkit6-rs.git?branch=crates-io#eeb540d62cf41d216493e7837008571826d50473"
dependencies = [
- "bitflags",
- "cairo-sys-rs",
"gdk4-sys",
"gio-sys",
"glib-sys",
"gobject-sys",
"gtk4-sys",
- "javascriptcore5-rs-sys",
+ "javascriptcore6-sys",
"libc",
- "pkg-config",
"soup3-sys",
"system-deps",
]
@@ -4480,15 +4719,6 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "widestring"
version = "0.5.1"
@@ -4527,16 +4757,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
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 0.48.0",
]
[[package]]
@@ -4545,86 +4771,155 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[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 = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[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"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+dependencies = [
+ "memchr",
+]
[[package]]
name = "winreg"
@@ -4678,13 +4973,13 @@ dependencies = [
[[package]]
name = "zbus"
-version = "2.3.2"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d8f1a037b2c4a67d9654dc7bdfa8ff2e80555bbefdd3c1833c1d1b27c963a6b"
+checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848"
dependencies = [
"async-broadcast",
- "async-channel",
"async-executor",
+ "async-fs",
"async-io",
"async-lock",
"async-recursion",
@@ -4692,14 +4987,13 @@ dependencies = [
"async-trait",
"byteorder",
"derivative",
- "dirs",
+ "dirs 4.0.0",
"enumflags2",
"event-listener",
"futures-core",
"futures-sink",
"futures-util",
"hex",
- "lazy_static",
"nix",
"once_cell",
"ordered-stream",
@@ -4718,22 +5012,23 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "2.3.2"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8fb5186d1c87ae88cf234974c240671238b4a679158ad3b94ec465237349a6"
+checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"regex",
- "syn",
+ "syn 1.0.109",
+ "zvariant_utils",
]
[[package]]
name = "zbus_names"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c737644108627748a660d038974160e0cbb62605536091bdfa28fd7f64d43c8"
+checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3"
dependencies = [
"serde",
"static_assertions",
@@ -4741,27 +5036,49 @@ dependencies = [
]
[[package]]
-name = "zvariant"
-version = "3.9.0"
+name = "zune-inflate"
+version = "0.2.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f8c89c183461e11867ded456db252eae90874bc6769b7adbea464caa777e51"
+checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "zvariant"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8"
dependencies = [
"byteorder",
"enumflags2",
"libc",
"serde",
"static_assertions",
+ "url",
"zvariant_derive",
]
[[package]]
name = "zvariant_derive"
-version = "3.9.0"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "155247a5d1ab55e335421c104ccd95d64f17cebbd02f50cdbc1c33385f9c4d81"
+checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 51c15f5569..d1dba70e90 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -22,20 +22,21 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newsflash";
- version = "2.2.4";
+ version = "unstable-2023-04-11";
src = fetchFromGitLab {
owner = "news-flash";
repo = "news_flash_gtk";
- rev = "refs/tags/v.${finalAttrs.version}";
- sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA=";
+ rev = "a7bc8bfdf5e58bd78f0f36516e00be8e1296bc12";
+ sha256 = "sha256-VYIHbOcYopzGTVG+fGyPBS5di7aBayhk+jj9FZh5Tms=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "news-flash-2.2.2" = "sha256-LN5VhJk+NGTR0fohI0LmfeLDS9IkfVE7IFIzmSPF4u0=";
- "newsblur_api-0.2.0" = "sha256-+3AobEX+RtBRgX1TIr4rRX0ngJvNVp1oXzkbhppi73M=";
+ "javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic=";
+ "news-flash-2.2.2" = "sha256-LXKhVsmkdTk1MSB0T5MDOgTJF/MXbNZ6T5cC2iZxsPs=";
+ "newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
index eb306ff2c9..72e3c0e6d8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rssguard";
- version = "4.3.3";
+ version = "4.3.4";
src = fetchFromGitHub {
owner = "martinrotter";
repo = pname;
rev = version;
- sha256 = "sha256-dSnPQbCPXREMOeqyn17BEi29soeVfrThnDBqdti5BiA=";
+ sha256 = "sha256-1xoMymsx5Z8oZzZtPzLWaOs0zy/E0pIsLpHgZlVdgSw=";
};
buildInputs = [ qtwebengine qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
index b11c3d60c9..188c45e8d9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
@@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation rec {
pname = "firewalld";
- version = "1.3.0";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "firewalld";
repo = "firewalld";
rev = "v${version}";
- sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q=";
+ sha256 = "sha256-xQQRhrbO1m80cgtO3JD4Nq42lh4HGA+a+yZvFYvbyaQ=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
index 1509fbe9da..0dd7ab182d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix
@@ -19,7 +19,7 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "flexget";
- version = "3.6.0";
+ version = "3.6.3";
format = "pyproject";
# Fetch from GitHub in order to use `requirements.in`
@@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-VsXiWsvEjRhWckwqHcUPx2B9mwOUmRLLHIM5ALoW9GI=";
+ hash = "sha256-Z1tiIs4NHHsWa7agAl1dnwliQbgFEl/SPT6QLQkqTVA=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
index 42ff691275..df6f1e2d79 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/hydroxide/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hydroxide";
- version = "0.2.25";
+ version = "0.2.26";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-YBaimsHRmmh5d98c9x56JIyOOnkZsypxdqlSCG6pVJ4=";
+ sha256 = "sha256-UCS49P83dGTD/Wx95Mslstm2C6hKgJB/1tJTZmmwLDg=";
};
vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
index e10c87e683..f1131cd7e3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix
@@ -34,11 +34,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
- version = "6.0.10";
+ version = "6.0.11";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
- sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc=";
+ sha256 = "sha256-TaXk6R5JmSYzpgJM4Qr+ZEElWyd1qPIPHvGIvREprGY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix
index 6926035588..34e2dd2928 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix
@@ -39,7 +39,7 @@
stdenv.mkDerivation rec {
pname = "armcord";
- version = "3.1.6";
+ version = "3.1.7";
src =
let
@@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
- sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M=";
+ sha256 = "sha256-c0ejSivQbxpPUQ6P0YUya3q1EJ1yF4RFGur11BMwz3o=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
- sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc=";
+ sha256 = "sha256-4yqe4eIO4AxsZNYCn99KTBqjQURB+G+gpT0Q17pcEvU=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix
index c86efd9c10..61fb4b43a0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -13,7 +13,7 @@
buildGoPackage rec {
pname = "coyim";
- version = "0.4";
+ version = "0.4.1";
goPackagePath = "github.com/coyim/coyim";
@@ -21,7 +21,7 @@ buildGoPackage rec {
owner = "coyim";
repo = "coyim";
rev = "v${version}";
- sha256 = "sha256-dpTU5Tx1pfUGZMt9QNEYDytgArhhvEvh1Yvj6IAjgeI=";
+ sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock
index 5d9f4fa9c2..56a68e36d3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock
@@ -189,12 +189,12 @@ dependencies = [
[[package]]
name = "async-imap"
-version = "0.6.0"
-source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
dependencies = [
"async-channel",
- "async-native-tls 0.4.0",
- "base64 0.13.1",
+ "base64 0.21.0",
"byte-pool",
"chrono",
"futures",
@@ -218,18 +218,6 @@ dependencies = [
"event-listener",
]
-[[package]]
-name = "async-native-tls"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
-dependencies = [
- "native-tls",
- "thiserror",
- "tokio",
- "url",
-]
-
[[package]]
name = "async-native-tls"
version = "0.5.0"
@@ -494,9 +482,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byte-pool"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca"
+checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158"
dependencies = [
"crossbeam-queue",
"stable_deref_trait",
@@ -836,9 +824,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -1061,13 +1049,13 @@ dependencies = [
[[package]]
name = "deltachat"
-version = "1.112.6"
+version = "1.112.8"
dependencies = [
"ansi_term",
"anyhow",
"async-channel",
"async-imap",
- "async-native-tls 0.5.0",
+ "async-native-tls",
"async-smtp",
"async_zip",
"backtrace",
@@ -1092,6 +1080,7 @@ dependencies = [
"libc",
"log",
"mailparse",
+ "mime",
"num-derive",
"num-traits",
"num_cpus",
@@ -1135,7 +1124,7 @@ dependencies = [
[[package]]
name = "deltachat-jsonrpc"
-version = "1.112.6"
+version = "1.112.8"
dependencies = [
"anyhow",
"async-channel",
@@ -1158,7 +1147,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
-version = "1.112.6"
+version = "1.112.8"
dependencies = [
"ansi_term",
"anyhow",
@@ -1173,7 +1162,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
-version = "1.112.6"
+version = "1.112.8"
dependencies = [
"anyhow",
"deltachat",
@@ -1197,7 +1186,7 @@ dependencies = [
[[package]]
name = "deltachat_ffi"
-version = "1.112.6"
+version = "1.112.8"
dependencies = [
"anyhow",
"deltachat",
@@ -2603,9 +2592,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"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index bcacfe6fe6..ed3849ffac 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -21,17 +21,16 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
- version = "1.112.6";
+ version = "1.112.8";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
- rev = version;
- hash = "sha256-xadf6N5x3zdefwsKUFaVs71HmLMpJoUq5LL7IENsvC0=";
+ rev = "v${version}";
+ hash = "sha256-bvXZtgFZx94Sw9Tst620HAhi9kmG8PjtWnghdw2ZF84=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "async-imap-0.6.0" = "sha256-q6ZDm+4i+EtiMgkW/8LQ/TkDO/sj0p7KJhpYE76zAjo=";
"email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
"encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
"lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
@@ -53,16 +52,16 @@ let
};
in buildNpmPackage rec {
pname = "deltachat-desktop";
- version = "1.36.1";
+ version = "1.36.4";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
- hash = "sha256-dfDgUDGRYcJKi7X30jaYx0kqlSkDjfo83yaZ16Mrklk=";
+ hash = "sha256-nJF8DPauhEoKC7mibpMJCGsgt9HnwkZp/jiWEEhShBs=";
};
- npmDepsHash = "sha256-IQod8femD9yhM4c9mDfbpjmXdpLoWzOU0g3Z9g5DLQM=";
+ npmDepsHash = "sha256-cTvNU4LO74pcw4Ybo9iftEis2yDA2SqGtrs4v+xAi5c=";
nativeBuildInputs = [
makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index 349c2e10cb..205bc0d0f9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,8 +2,8 @@
let
versions = if stdenv.isLinux then {
stable = "0.0.26";
- ptb = "0.0.41";
- canary = "0.0.150";
+ ptb = "0.0.42";
+ canary = "0.0.151";
} else {
stable = "0.0.273";
ptb = "0.0.59";
@@ -18,11 +18,11 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
- sha256 = "AhiZXgkXG/lroG7XAgcvJ7r5PSvzMFhamsxB1cXJOak=";
+ sha256 = "ZAMyAqyFEBJeTUqQzr5wK+BOFGURqhoHL8w2hJvL0vI=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "sha256-8huDp1u0t9/kZbeB7bPqQUw8+HQ6rIyzKYUVN02gQfo=";
+ sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U=";
};
};
x86_64-darwin = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 10fb303fdd..43a0ff082b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -6,9 +6,10 @@
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
, libunity
+, speechd
, wayland
, branch
-, common-updater-scripts, withOpenASAR ? false }:
+, common-updater-scripts, withOpenASAR ? false, withTTS ? false }:
let
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
@@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
- libPath = lib.makeLibraryPath [
+ libPath = lib.makeLibraryPath ([
libcxx
systemd
libpulseaudio
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
libappindicator-gtk3
libdbusmenu
wayland
- ];
+ ] ++ lib.optional withTTS speechd);
installPhase = ''
runHook preInstall
@@ -102,6 +103,7 @@ stdenv.mkDerivation rec {
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
"''${gappsWrapperArgs[@]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \
+ ${lib.strings.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
--run "${lib.getExe disableBreakingUpdates}"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix
index 39370085ca..c8ffd9d130 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
{
- "version" = "1.11.28";
+ "version" = "1.11.30";
"hashes" = {
- "desktopSrcHash" = "u8w9rk5N6N4ppyG4tTbtj6YoHWwNnJW+N84cwpadtJk=";
- "desktopYarnHash" = "0sgc0na93h9qa7n88g2wfd48hw19ydkv20mj6gpkj1dkp8ibfl0b";
- "webSrcHash" = "CSOkDktlKBen8t1LN2hvadAAJ28YEwRhts0DjxeRCx8=";
- "webYarnHash" = "1crz34ln5879amqgnjlwc7f1wj5is02hzp46lq8pqd3yvjmidx4c";
+ "desktopSrcHash" = "WICzS+KARX+Z4vfBqBd13wtNB7m18rsXJsFey/MnST0=";
+ "desktopYarnHash" = "0rm0rghd2piaxhf7jvxs6rd6yykgdm8d2a7rxqc9m9xjklxdf6nj";
+ "webSrcHash" = "5o1DEVtkx4PYYRXYdyjVOlkvbQSc9/an5DshARTJTR4=";
+ "webYarnHash" = "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix
index 813e1973e5..0ff76e4188 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -1,16 +1,22 @@
-{ lib, mkFranzDerivation, fetchurl, xorg }:
+{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script }:
mkFranzDerivation rec {
pname = "ferdium";
name = "Ferdium";
- version = "6.2.4";
+ version = "6.2.6";
src = fetchurl {
url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb";
- sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo=";
+ sha256 = "sha256-jG3NdolWqQzj/62jYwnqJHz5uT6QIuOkrpL/FcLl56k=";
};
extraBuildInputs = [ xorg.libxshmfence ];
+ passthru = {
+ updateScript = nix-update-script {
+ extraArgs = [ "--override-filename" ./default.nix ];
+ };
+ };
+
meta = with lib; {
description = "All your services in one place built by the community";
homepage = "https://ferdium.org/";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
index 7064a32365..a29a5364ce 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix
@@ -13,15 +13,16 @@
}:
let
+ version = "1.10.0";
# map of nix platform -> expected url platform
platformMap = {
x86_64-linux = "linux-x86";
aarch64-linux = "linux-arm64";
};
in
-stdenv.mkDerivation rec {
- version = "1.10.0";
- name = "fluffychat";
+stdenv.mkDerivation {
+ inherit version;
+ pname = "fluffychat";
src = fetchzip {
url = "https://gitlab.com/api/v4/projects/16112282/packages/generic/fluffychat/${version}/fluffychat-${platformMap.${stdenv.hostPlatform.system}}.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
index 44546aabe2..b48acec1d3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -28,9 +28,10 @@
# Helper function for building a derivation for Franz and forks.
-{ pname, name, version, src, meta, extraBuildInputs ? [] }:
-
-stdenv.mkDerivation rec {
+{ pname, name, version, src, meta, extraBuildInputs ? [], ... } @ args:
+let
+ cleanedArgs = builtins.removeAttrs args [ "pname" "name" "version" "src" "meta" "extraBuildInputs" ];
+in stdenv.mkDerivation (rec {
inherit pname version src meta;
# Don't remove runtime deps.
@@ -91,4 +92,4 @@ stdenv.mkDerivation rec {
--suffix PATH : ${xdg-utils}/bin \
"''${gappsWrapperArgs[@]}"
'';
-}
+} // cleanedArgs)
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix
index edcac90628..e71d5c020f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix
@@ -5,21 +5,20 @@
, glib
, gobject-introspection
, pkg-config
-, go
}:
buildGoModule rec {
pname = "gotktrix";
- version = "unstable-2022-09-29";
+ version = "unstable-2023-04-05";
src = fetchFromGitHub {
owner = "diamondburned";
repo = pname;
- rev = "3d9e8ac4810f7cb9d9ead7b4b13ffa6f5da8927f"; # compound
- sha256 = "sha256-VIV4vSntu3oCIE23f5fiYj8cxcKY1n4M4Xkf0MGhvxI=";
+ rev = "a8f876a383cc34dac18edddbe22be2dd494b8d0c"; # compound
+ hash = "sha256-BuiA9UajdMhSrEfaXdu5DZlVhC4GVUdUpQDLMvKGrEk=";
};
- vendorSha256 = "sha256-R55tfTJL/bgNWTgmuBFRxIQleKS9zeDqvfez2VyzqjI=";
+ vendorHash = "sha256-oo/j6i7slXILqyvj/EHojsyCZzJMGd10PTZaLvI1xoc=";
buildInputs = [
gtk4
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix
new file mode 100644
index 0000000000..9e9101d27d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/iamb/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, darwin
+, stdenv
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "iamb";
+ version = "0.0.7";
+
+ src = fetchFromGitHub {
+ owner = "ulyssa";
+ repo = "iamb";
+ rev = "v${version}";
+ hash = "sha256-KKr7dfFSffkFgqcREy/3RIIn5c5IxhFR7CjFJqCmqdM=";
+ };
+
+ cargoHash = "sha256-/OBGRE9zualLnMh9Ikh9s9IE9b8mEmAC/H5KUids8a8=";
+
+ buildInputs = lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.AppKit
+ ];
+
+ meta = with lib; {
+ description = "A Matrix client for Vim addicts";
+ homepage = "https://github.com/ulyssa/iamb";
+ changelog = "https://github.com/ulyssa/iamb/releases/tag/${src.rev}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ meain ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch
new file mode 100644
index 0000000000..5420b77c89
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch
@@ -0,0 +1,52 @@
+From f60e38b394c55e709cba2c0839c1fbba2fd8a1d2 Mon Sep 17 00:00:00 2001
+From: Nick Cao
+Date: Sun, 16 Apr 2023 21:56:06 +0800
+Subject: [PATCH] fix annotations in bin/dbus/cx.ring.Ring.CallManager.xml
+
+---
+ bin/dbus/cx.ring.Ring.CallManager.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/dbus/cx.ring.Ring.CallManager.xml b/bin/dbus/cx.ring.Ring.CallManager.xml
+index 8c5732f30..4228fcad2 100644
+--- a/bin/dbus/cx.ring.Ring.CallManager.xml
++++ b/bin/dbus/cx.ring.Ring.CallManager.xml
+@@ -87,7 +87,7 @@
+
+ Once enabled using the startSmartInfo method, this signal is emitted every refreshTimeMS
+
+-
++
+
+
+
+@@ -761,7 +761,7 @@
+ The caller phone number.
+
+
+-
++
+
+
+ The list of media offered in the incoming call.
+@@ -791,7 +791,7 @@
+ Call ID of the incoming call.
+
+
+-
++
+
+
+ The list of media offered in the incoming call.
+@@ -807,7 +807,7 @@
+
+
+
+-
++
+
+
+
+--
+2.39.2
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix
index 9aa5f539bd..d7b0a675bb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -5,7 +5,7 @@
, gitUpdater
, ffmpeg_5
-# for daemon
+ # for daemon
, autoreconfHook
, perl # for pod2man
, alsa-lib
@@ -33,7 +33,7 @@
, webrtc-audio-processing
, zlib
-# for client
+ # for client
, cmake
, networkmanager # for libnm
, python3
@@ -46,16 +46,17 @@
, qrencode
, qtmultimedia
, qtnetworkauth
+, qtpositioning
, qtsvg
, qtwebengine
, qtwebchannel
, withWebengine ? true
-# for pjsip
+ # for pjsip
, fetchFromGitHub
, pjsip
-# for opendht
+ # for opendht
, opendht
}:
@@ -64,14 +65,14 @@ let
in
stdenv.mkDerivation rec {
pname = "jami";
- version = "20230313.0";
+ version = "20230323.0";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "jami-client-qt";
rev = "stable/${version}";
- hash = "sha256-3kZ4nn6x1xsXWybyuaY9W07tEM6LFvLL4QtDRPRmob4=";
+ hash = "sha256-X8iIT8UtI2Vq0Ne5e2ahSPN4g7QLZGnq3SZV/NY+1pY=";
fetchSubmodules = true;
};
@@ -105,6 +106,8 @@ stdenv.mkDerivation rec {
inherit src version meta;
sourceRoot = "source/daemon";
+ patches = [ ./0001-fix-annotations-in-bin-dbus-cx.ring.Ring.CallManager.patch ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -167,6 +170,7 @@ stdenv.mkDerivation rec {
qtnetworkauth
qtdeclarative
qtmultimedia
+ qtpositioning
qtsvg
qtwebchannel
] ++ lib.optionals withWebengine [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
index c1eafe304a..f9be0da6d5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
index f2b02ebdec..35510badf4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
@@ -6,13 +6,13 @@
postInstall = ''
mkdir "$out/bin"
echo '#!/bin/sh' >> "$out/bin/matrix-recorder"
- echo "'${pkgs.nodejs-14_x}/bin/node'" \
+ echo "'${pkgs.nodejs_14}/bin/node'" \
"'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \
'"$@"' >> "$out/bin/matrix-recorder"
echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html"
echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html"
echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html"
- echo "'${pkgs.nodejs-14_x}/bin/node'" \
+ echo "'${pkgs.nodejs_14}/bin/node'" \
"'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \
'.' >> "$out/bin/matrix-recorder-to-html"
chmod a+x "$out/bin/matrix-recorder"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix
index 32d34787d6..9f037845de 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix
@@ -6,6 +6,7 @@
, glib
, gtk3
, lib
+, libappindicator
, libdrm
, libgcrypt
, libkrb5
@@ -14,6 +15,7 @@
, xorg
, systemd
, stdenv
+, vips
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
@@ -49,18 +51,20 @@ stdenv.mkDerivation {
alsa-lib
at-spi2-core
cups
- gtk3
glib
+ gtk3
libdrm
libgcrypt
libkrb5
mesa
nss
+ vips
xorg.libXdamage
];
- runtimeDependencies = [
- (lib.getLib systemd)
+ runtimeDependencies = map lib.getLib [
+ libappindicator
+ systemd
];
installPhase = ''
@@ -74,9 +78,16 @@ stdenv.mkDerivation {
--replace "/usr/share" "$out/share"
ln -s $out/opt/QQ/qq $out/bin/qq
+ # Remove bundled libraries
+ rm -r $out/opt/QQ/resources/app/sharp-lib
+
runHook postInstall
'';
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ gjs ]}")
+ '';
+
meta = with lib; {
homepage = "https://im.qq.com/linuxqq/";
description = "Messaging app";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
new file mode 100644
index 0000000000..e070fee1c3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/revolt-desktop/default.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, lib
+, fetchurl
+, appimageTools
+, makeWrapper
+, electron
+}:
+
+stdenv.mkDerivation rec {
+ pname = "revolt-desktop";
+ version = "1.0.6";
+
+ src = fetchurl {
+ url = "https://github.com/revoltchat/desktop/releases/download/v${version}/Revolt-linux.AppImage";
+ sha256 = "sha256-Wsm6ef2Reenq3/aKGaP2yzlOuLKaxKtRHCLLMxvWUUY=";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ name = "${pname}-${version}";
+ inherit src;
+ };
+
+ dontUnpack = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/{applications,revolt-desktop}
+
+ cp -a ${appimageContents}/{locales,resources} $out/share/${pname}
+ cp -a ${appimageContents}/revolt-desktop.desktop $out/share/applications/${pname}.desktop
+ cp -a ${appimageContents}/usr/share/icons $out/share/icons
+
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+ --add-flags $out/share/${pname}/resources/app.asar
+ '';
+
+ meta = with lib; {
+ description = "An open source user-first chat platform";
+ homepage = "https://revolt.chat/";
+ changelog = "https://github.com/revoltchat/desktop/releases/tag/v${version}";
+ license = licenses.agpl3Only;
+ maintainers = with maintainers; [ heyimnova ];
+ platforms = platforms.linux;
+ sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+ mainProgram = "revolt-desktop";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
index 3cf6b2e1c4..464fc65cfb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
@@ -8,12 +8,12 @@
}:
let
- version = "1.10.4";
+ version = "1.10.8";
pname = "session-desktop";
src = fetchurl {
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
- sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo=";
+ sha256 = "sha256-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index baca7bd394..cfe014b902 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
- version = "0.11.7";
+ version = "0.11.9.1";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
- hash = "sha256-oN80HQkPpJfhM4WBaRm4ytmhLjSokjEpfMhP6/XnQXs=";
+ hash = "sha256-LhTv3ycJXr2vt0vyXfCd1ABro4q7CfBma63Zd1osBhA=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index be06dbf386..8d2a74f641 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
- version = "6.10.1";
- hash = "sha256-uWwRgP9iYirZU9x3QtS5lRGI7vLOOtX4B4fgVuYxkho=";
+ version = "6.16.0";
+ hash = "sha256-q7z7TS16RORPbEMJBEmF3m2q4IdD3dM1xqv1DfgM9Zs=";
};
signal-desktop-beta = {
dir = "Signal Beta";
- version = "6.11.0-beta.2";
- hash = "sha256-tw8VsPC0shKIN13ICD0PVKhKxA7rdj16r2lP2UEJGsY=";
+ version = "6.17.0-beta.1";
+ hash = "sha256-8Ae+IrwDRxcF5JhrDqEhimQqyCtDYWm/pOrcpKgAo2w=";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
index 48220b18a3..9f9f3798ab 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
- version = "20230404";
+ version = "20230426";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
- hash = "sha256-uDQeXEG3xTIXdzj9LaI+p5cLYy9nR2w7QTiZIJlZyQw=";
+ hash = "sha256-RpPn3QWsCOW1RIucBp5oqR/zwnfIwG+McqAPwo0f5lM=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index 705f1ffe66..aa71039e9f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -12,17 +12,18 @@
, libpulseaudio
, pipewire
, alsa-utils
+, which
}:
stdenv.mkDerivation rec {
pname = "teams-for-linux";
- version = "1.0.53";
+ version = "1.0.65";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg=";
+ sha256 = "sha256-Rj6A1h5R4w8zacoTV0WKTbTD67qwsw4zHP+KQ6h7/gs=";
};
offlineCache = fetchYarnDeps {
@@ -30,6 +31,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
};
+ patches = [
+ # Can be removed once Electron upstream resolves https://github.com/electron/electron/issues/36660
+ ./screensharing-wayland-hack-fix.patch
+ ];
+
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
configurePhase = ''
@@ -71,7 +77,7 @@ stdenv.mkDerivation rec {
# Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing
makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
${lib.optionalString stdenv.isLinux ''
- --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \
+ --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \
''} \
--add-flags "$out/share/teams-for-linux/app.asar" \
@@ -89,6 +95,8 @@ stdenv.mkDerivation rec {
categories = [ "Network" "InstantMessaging" "Chat" ];
})];
+ passthru.updateScript = ./update.sh;
+
meta = with lib; {
description = "Unofficial Microsoft Teams client for Linux";
homepage = "https://github.com/IsmaelMartinez/teams-for-linux";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch
new file mode 100644
index 0000000000..3e5d993e86
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/app/index.js b/app/index.js
+index 20ccf43..b251f62 100644
+--- a/app/index.js
++++ b/app/index.js
+@@ -1,4 +1,4 @@
+-const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron');
++const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron');
+ const path = require('path');
+ const { LucidLog } = require('lucid-log');
+ const isDev = require('electron-is-dev');
+@@ -93,7 +93,16 @@ if (!gotTheLock) {
+ ipcMain.handle('getSystemIdleState', handleGetSystemIdleState);
+ ipcMain.handle('getZoomLevel', handleGetZoomLevel);
+ ipcMain.handle('saveZoomLevel', handleSaveZoomLevel);
+- ipcMain.handle('desktopCapturerGetSources', (event, opts) => desktopCapturer.getSources(opts));
++ ipcMain.handle('desktopCapturerGetSources', (event, opts) => process.env.XDG_SESSION_TYPE == 'wayland' ?
++ // Port wayland electron 22+ screenshare "fix" from webcord
++ Promise.resolve([{
++ id: "screen:1:0",
++ appIcon: nativeImage.createEmpty(),
++ display_id: "",
++ name: "Entire Screen",
++ thumbnail: nativeImage.createEmpty()
++ }])
++ : desktopCapturer.getSources(opts));
+ ipcMain.on('play-notification-sound', playNotificationSound);
+ }
+
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh
new file mode 100755
index 0000000000..650edf1886
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix jq common-updater-scripts
+
+set -euo pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))"
+
+stripwhitespace() {
+ sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+}
+
+nixeval() {
+ nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r .
+}
+
+vendorhash() {
+ (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
+}
+
+findpath() {
+ path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)"
+ outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")"
+
+ if [ -n "$outpath" ]; then
+ path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}"
+ fi
+
+ echo "$path"
+}
+
+attr="${UPDATE_NIX_ATTR_PATH:-teams-for-linux}"
+version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)"
+
+pkgpath="$(findpath "$attr")"
+
+updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)"
+
+if [ "$updated" -eq 0 ]; then
+ echo 'update.sh: Package version not updated, nothing to do.'
+ exit 0
+fi
+
+curhash="$(nixeval "$attr.offlineCache.outputHash")"
+newhash="$(vendorhash "$attr.offlineCache")"
+
+if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then
+ sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath"
+else
+ echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.'
+fi
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index ab8a24bb09..254540bf8f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -29,7 +29,7 @@
, tl-expected
, hunspell
, glibmm_2_68
-, webkitgtk_4_1
+, webkitgtk_6_0
, jemalloc
, rnnoise
, protobuf
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
- version = "4.7.1";
+ version = "4.8.1";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
src = fetchFromGitHub {
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk";
+ sha256 = "0mxxfh70dffkrq76nky3pwrk10s1q4ahxx2ddb58dz8igq6pl4zi";
};
patches = [
@@ -101,8 +101,8 @@ stdenv.mkDerivation rec {
--replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
--replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
- substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \
- --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"'
+ substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
+ --replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
'';
# We want to run wrapProgram manually (with additional parameters)
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
tl-expected
hunspell
glibmm_2_68
- webkitgtk_4_1
+ webkitgtk_6_0
jemalloc
rnnoise
protobuf
@@ -181,10 +181,7 @@ stdenv.mkDerivation rec {
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \
- --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
- --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
- sed -i $out/bin/telegram-desktop \
- -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
+ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
'';
passthru = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
index 6e57a81dc2..6dbff9e809 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
- version = "unstable-2023-03-14";
+ version = "unstable-2023-04-18";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
- rev = "1a18da2ed4d5ce134e984d1586b915738e0da257";
- sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3";
+ rev = "fe316b0c5a155cceb2ddecee70d7b582cadfa225";
+ sha256 = "0wl2d1ycvf32prqjxxh6a14zgaqkk7s545cv2pn4dryn6lf7bfsp";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
index 6c95c7557e..3adfe73ab6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
- version = "2.0.2";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "Xithrius";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-4gEE2JCYNxPOV47w/wMRvYn5YJdgvlYl+fkk6qcXLr8=";
+ hash = "sha256-ecPrG3zZW+tr0LSCMLgGc6w2qmqzZOTAmEB88xKJxvk=";
};
- cargoHash = "sha256-IYk01mueNZu791LPdkB79VaxsFXZbqEFDbpw1ckYTMo=";
+ cargoHash = "sha256-SQ0anSl/MrSEyfcLbzma3RT2iDqVa0wrcYAmIMysyew=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix
index 188158e70b..67e99f540b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix
@@ -1,18 +1,18 @@
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems
-, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }:
+, python3, pipewire, libpulseaudio, xdg-utils, electron_24, makeDesktopItem }:
buildNpmPackage rec {
pname = "webcord";
- version = "4.1.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "SpacingBat3";
repo = "WebCord";
rev = "v${version}";
- sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4=";
+ sha256 = "sha256-530iWNvehImwSYt5HnZaqa4TAslrwxAOZi3gRm1K2/w=";
};
- npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM=";
+ npmDepsHash = "sha256-YguZtGn8CT4EqOQWS0GeNGBdZSC3Lj1gFR0ZiegWTJU=";
nativeBuildInputs = [
copyDesktopItems
@@ -46,7 +46,7 @@ buildNpmPackage rec {
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
# Add xdg-utils to path via suffix, per PR #181171
- makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \
+ makeWrapper '${electron_24}/bin/electron' $out/bin/webcord \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
@@ -73,6 +73,6 @@ buildNpmPackage rec {
changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ huantian ];
- platforms = electron_22.meta.platforms;
+ platforms = electron_24.meta.platforms;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch
new file mode 100644
index 0000000000..888dad1eee
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/add-extension.patch
@@ -0,0 +1,12 @@
+diff --git a/sources/code/common/main.ts b/sources/code/common/main.ts
+index 3936ee0..bd745ef 100644
+--- a/sources/code/common/main.ts
++++ b/sources/code/common/main.ts
+@@ -358,6 +358,7 @@ app.userAgentFallback = getUserAgent(process.versions.chrome, userAgent.mobile,
+ const singleInstance = app.requestSingleInstanceLock();
+
+ function main(): void {
++ session.defaultSession.loadExtension("@vencord@");
+ if (overwriteMain) {
+ // Execute flag-specific functions for ready application.
+ overwriteMain();
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix
new file mode 100644
index 0000000000..d3500c1e42
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix
@@ -0,0 +1,18 @@
+{ webcord
+, substituteAll
+, callPackage
+, lib
+}:
+webcord.overrideAttrs (old: {
+ patches = (old.patches or [ ]) ++ [
+ (substituteAll {
+ src = ./add-extension.patch;
+ vencord = callPackage ./vencord-web-extension { };
+ })
+ ];
+
+ meta = with lib; old.meta // {
+ description = "Webcord with Vencord web extension";
+ maintainers = with maintainers; [ FlafyDev NotAShelf ];
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/default.nix
new file mode 100644
index 0000000000..b73473facd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/default.nix
@@ -0,0 +1,60 @@
+{ buildNpmPackage
+, fetchFromGitHub
+, lib
+, substituteAll
+, esbuild
+, buildGoModule
+}:
+buildNpmPackage rec {
+ pname = "vencord-web-extension";
+ version = "1.1.6";
+
+ src = fetchFromGitHub {
+ owner = "Vendicated";
+ repo = "Vencord";
+ rev = "v${version}";
+ sha256 = "sha256-V9fzSoRqVlk9QqpzzR2x+aOwGHhQhQiSjXZWMC0uLnQ=";
+ };
+
+ ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
+ buildGoModule = args: buildGoModule (args // rec {
+ version = "0.15.18";
+ src = fetchFromGitHub {
+ owner = "evanw";
+ repo = "esbuild";
+ rev = "v${version}";
+ hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE=";
+ };
+ vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+ });
+ });
+
+ # Supresses an error about esbuild's version.
+ npmRebuildFlags = [ "|| true" ];
+
+ npmDepsHash = "sha256-jKSdeyQ8oHw7ZGby0XzDg4O8mtH276ykVuBcw7dU/Ls=";
+ npmFlags = [ "--legacy-peer-deps" ];
+ npmBuildScript = "buildWeb";
+
+ prePatch = ''
+ cp ${./package-lock.json} ./package-lock.json
+ '';
+
+ patches = [
+ (substituteAll {
+ src = ./replace-git.patch;
+ inherit version;
+ })
+ ];
+
+ installPhase = ''
+ cp -r dist/extension-unpacked $out
+ '';
+
+ meta = with lib; {
+ description = "Vencord web extension";
+ homepage = "https://github.com/Vendicated/Vencord";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ FlafyDev NotAShelf ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/package-lock.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/package-lock.json
new file mode 100644
index 0000000000..57cd8f98da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/package-lock.json
@@ -0,0 +1,4983 @@
+{
+ "name": "vencord",
+ "version": "1.1.6",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "vencord",
+ "version": "1.1.6",
+ "license": "GPL-3.0",
+ "dependencies": {
+ "@vap/core": "0.0.12",
+ "@vap/shiki": "0.10.3",
+ "fflate": "^0.7.4",
+ "nanoid": "^4.0.2",
+ "virtual-merge": "^1.0.1"
+ },
+ "devDependencies": {
+ "@types/diff": "^5.0.2",
+ "@types/lodash": "^4.14.191",
+ "@types/node": "^18.11.18",
+ "@types/react": "^18.0.27",
+ "@types/react-dom": "^18.0.10",
+ "@types/yazl": "^2.4.2",
+ "@typescript-eslint/eslint-plugin": "^5.49.0",
+ "@typescript-eslint/parser": "^5.49.0",
+ "diff": "^5.1.0",
+ "discord-types": "^1.3.26",
+ "esbuild": "^0.15.18",
+ "eslint": "^8.28.0",
+ "eslint-import-resolver-alias": "^1.1.2",
+ "eslint-plugin-header": "^3.1.1",
+ "eslint-plugin-path-alias": "^1.0.0",
+ "eslint-plugin-simple-import-sort": "^8.0.0",
+ "eslint-plugin-unused-imports": "^2.0.0",
+ "highlight.js": "10.6.0",
+ "moment": "^2.29.4",
+ "puppeteer-core": "^19.6.0",
+ "standalone-electron-types": "^1.0.0",
+ "stylelint": "^14.16.1",
+ "stylelint-config-standard": "^29.0.0",
+ "tsx": "^3.12.6",
+ "type-fest": "^3.5.3",
+ "typescript": "^4.9.4"
+ },
+ "engines": {
+ "node": ">=18",
+ "pnpm": ">=8"
+ }
+ },
+ "node_modules/@babel/code-frame": {
+ "version": "7.21.4",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+ "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/highlight": "^7.18.6"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-validator-identifier": {
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/highlight": {
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+ "dev": true,
+ "dependencies": {
+ "@babel/helper-validator-identifier": "^7.18.6",
+ "chalk": "^2.0.0",
+ "js-tokens": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^1.9.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "1.1.3"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+ "dev": true
+ },
+ "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@babel/highlight/node_modules/supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/@csstools/selector-specificity": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+ "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+ "dev": true,
+ "engines": {
+ "node": "^14 || ^16 || >=18"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
+ "peerDependencies": {
+ "postcss-selector-parser": "^6.0.10"
+ }
+ },
+ "node_modules/@esbuild-kit/cjs-loader": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/@esbuild-kit/cjs-loader/-/cjs-loader-2.4.2.tgz",
+ "integrity": "sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==",
+ "dev": true,
+ "dependencies": {
+ "@esbuild-kit/core-utils": "^3.0.0",
+ "get-tsconfig": "^4.4.0"
+ }
+ },
+ "node_modules/@esbuild-kit/core-utils": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.1.0.tgz",
+ "integrity": "sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==",
+ "dev": true,
+ "dependencies": {
+ "esbuild": "~0.17.6",
+ "source-map-support": "^0.5.21"
+ }
+ },
+ "node_modules/@esbuild-kit/core-utils/node_modules/esbuild": {
+ "version": "0.17.16",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.16.tgz",
+ "integrity": "sha512-aeSuUKr9aFVY9Dc8ETVELGgkj4urg5isYx8pLf4wlGgB0vTFjxJQdHnNH6Shmx4vYYrOTLCHtRI5i1XZ9l2Zcg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "optionalDependencies": {
+ "@esbuild/android-arm": "0.17.16",
+ "@esbuild/android-arm64": "0.17.16",
+ "@esbuild/android-x64": "0.17.16",
+ "@esbuild/darwin-arm64": "0.17.16",
+ "@esbuild/darwin-x64": "0.17.16",
+ "@esbuild/freebsd-arm64": "0.17.16",
+ "@esbuild/freebsd-x64": "0.17.16",
+ "@esbuild/linux-arm": "0.17.16",
+ "@esbuild/linux-arm64": "0.17.16",
+ "@esbuild/linux-ia32": "0.17.16",
+ "@esbuild/linux-loong64": "0.17.16",
+ "@esbuild/linux-mips64el": "0.17.16",
+ "@esbuild/linux-ppc64": "0.17.16",
+ "@esbuild/linux-riscv64": "0.17.16",
+ "@esbuild/linux-s390x": "0.17.16",
+ "@esbuild/linux-x64": "0.17.16",
+ "@esbuild/netbsd-x64": "0.17.16",
+ "@esbuild/openbsd-x64": "0.17.16",
+ "@esbuild/sunos-x64": "0.17.16",
+ "@esbuild/win32-arm64": "0.17.16",
+ "@esbuild/win32-ia32": "0.17.16",
+ "@esbuild/win32-x64": "0.17.16"
+ }
+ },
+ "node_modules/@esbuild-kit/esm-loader": {
+ "version": "2.5.5",
+ "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.5.5.tgz",
+ "integrity": "sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==",
+ "dev": true,
+ "dependencies": {
+ "@esbuild-kit/core-utils": "^3.0.0",
+ "get-tsconfig": "^4.4.0"
+ }
+ },
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.17.16",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.16.tgz",
+ "integrity": "sha512-mfiiBkxEbUHvi+v0P+TS7UnA9TeGXR48aK4XHkTj0ZwOijxexgMF01UDFaBX7Q6CQsB0d+MFNv9IiXbIHTNd4g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@eslint-community/eslint-utils": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+ "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+ "dev": true,
+ "dependencies": {
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+ }
+ },
+ "node_modules/@eslint-community/regexpp": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+ "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@eslint/eslintrc": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz",
+ "integrity": "sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==",
+ "dev": true,
+ "dependencies": {
+ "ajv": "^6.12.4",
+ "debug": "^4.3.2",
+ "espree": "^9.5.1",
+ "globals": "^13.19.0",
+ "ignore": "^5.2.0",
+ "import-fresh": "^3.2.1",
+ "js-yaml": "^4.1.0",
+ "minimatch": "^3.1.2",
+ "strip-json-comments": "^3.1.1"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/@eslint/js": {
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.38.0.tgz",
+ "integrity": "sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
+ "node_modules/@humanwhocodes/config-array": {
+ "version": "0.11.8",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+ "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+ "dev": true,
+ "dependencies": {
+ "@humanwhocodes/object-schema": "^1.2.1",
+ "debug": "^4.1.1",
+ "minimatch": "^3.0.5"
+ },
+ "engines": {
+ "node": ">=10.10.0"
+ }
+ },
+ "node_modules/@humanwhocodes/module-importer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.22"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
+ "node_modules/@humanwhocodes/object-schema": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+ "dev": true
+ },
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true,
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@puppeteer/browsers": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.4.1.tgz",
+ "integrity": "sha512-4IICvy1McAkT/HyNZHIs7sp8ngBX1dmO0TPQ+FWq9ATQMqI8p+Ulm5A3kS2wYDh5HDHHkYrrETOu6rlj64VuTw==",
+ "dev": true,
+ "dependencies": {
+ "debug": "4.3.4",
+ "extract-zip": "2.0.1",
+ "https-proxy-agent": "5.0.1",
+ "progress": "2.0.3",
+ "proxy-from-env": "1.1.0",
+ "tar-fs": "2.1.1",
+ "unbzip2-stream": "1.4.3",
+ "yargs": "17.7.1"
+ },
+ "bin": {
+ "browsers": "lib/cjs/main-cli.js"
+ },
+ "engines": {
+ "node": ">=14.1.0"
+ },
+ "peerDependencies": {
+ "typescript": ">= 4.7.4"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@types/diff": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz",
+ "integrity": "sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==",
+ "dev": true
+ },
+ "node_modules/@types/json-schema": {
+ "version": "7.0.11",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+ "dev": true
+ },
+ "node_modules/@types/lodash": {
+ "version": "4.14.194",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz",
+ "integrity": "sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==",
+ "dev": true
+ },
+ "node_modules/@types/minimist": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+ "dev": true
+ },
+ "node_modules/@types/node": {
+ "version": "18.15.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+ "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+ "dev": true
+ },
+ "node_modules/@types/normalize-package-data": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+ "dev": true
+ },
+ "node_modules/@types/parse-json": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+ "dev": true
+ },
+ "node_modules/@types/prop-types": {
+ "version": "15.7.5",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+ "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==",
+ "dev": true
+ },
+ "node_modules/@types/react": {
+ "version": "18.0.35",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.35.tgz",
+ "integrity": "sha512-6Laome31HpetaIUGFWl1VQ3mdSImwxtFZ39rh059a1MNnKGqBpC88J6NJ8n/Is3Qx7CefDGLgf/KhN/sYCf7ag==",
+ "dev": true,
+ "dependencies": {
+ "@types/prop-types": "*",
+ "@types/scheduler": "*",
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/@types/react-dom": {
+ "version": "18.0.11",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz",
+ "integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==",
+ "dev": true,
+ "dependencies": {
+ "@types/react": "*"
+ }
+ },
+ "node_modules/@types/scheduler": {
+ "version": "0.16.3",
+ "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
+ "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==",
+ "dev": true
+ },
+ "node_modules/@types/semver": {
+ "version": "7.3.13",
+ "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+ "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+ "dev": true
+ },
+ "node_modules/@types/yauzl": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+ "dev": true,
+ "optional": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@types/yazl": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/@types/yazl/-/yazl-2.4.2.tgz",
+ "integrity": "sha512-T+9JH8O2guEjXNxqmybzQ92mJUh2oCwDDMSSimZSe1P+pceZiFROZLYmcbqkzV5EUwz6VwcKXCO2S2yUpra6XQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@typescript-eslint/eslint-plugin": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz",
+ "integrity": "sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/regexpp": "^4.4.0",
+ "@typescript-eslint/scope-manager": "5.58.0",
+ "@typescript-eslint/type-utils": "5.58.0",
+ "@typescript-eslint/utils": "5.58.0",
+ "debug": "^4.3.4",
+ "grapheme-splitter": "^1.0.4",
+ "ignore": "^5.2.0",
+ "natural-compare-lite": "^1.4.0",
+ "semver": "^7.3.7",
+ "tsutils": "^3.21.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/parser": "^5.0.0",
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/parser": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
+ "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/scope-manager": "5.58.0",
+ "@typescript-eslint/types": "5.58.0",
+ "@typescript-eslint/typescript-estree": "5.58.0",
+ "debug": "^4.3.4"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/scope-manager": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
+ "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.58.0",
+ "@typescript-eslint/visitor-keys": "5.58.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/type-utils": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz",
+ "integrity": "sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/typescript-estree": "5.58.0",
+ "@typescript-eslint/utils": "5.58.0",
+ "debug": "^4.3.4",
+ "tsutils": "^3.21.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "*"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/types": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
+ "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typescript-eslint/typescript-estree": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
+ "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.58.0",
+ "@typescript-eslint/visitor-keys": "5.58.0",
+ "debug": "^4.3.4",
+ "globby": "^11.1.0",
+ "is-glob": "^4.0.3",
+ "semver": "^7.3.7",
+ "tsutils": "^3.21.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@typescript-eslint/utils": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz",
+ "integrity": "sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@types/json-schema": "^7.0.9",
+ "@types/semver": "^7.3.12",
+ "@typescript-eslint/scope-manager": "5.58.0",
+ "@typescript-eslint/types": "5.58.0",
+ "@typescript-eslint/typescript-estree": "5.58.0",
+ "eslint-scope": "^5.1.1",
+ "semver": "^7.3.7"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/@typescript-eslint/visitor-keys": {
+ "version": "5.58.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
+ "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.58.0",
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@vap/core": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npmjs.org/@vap/core/-/core-0.0.12.tgz",
+ "integrity": "sha512-3csHpkE1zUSRTZwl7xIf2uXg1cD4IhhtUm0F6K/dWydc95R5Nj+krB4OTNATuqkewIv/ViCbwjPfkafAgvZQSg==",
+ "dependencies": {
+ "eventemitter3": "^4.0.7"
+ }
+ },
+ "node_modules/@vap/shiki": {
+ "version": "0.10.3",
+ "resolved": "https://registry.npmjs.org/@vap/shiki/-/shiki-0.10.3.tgz",
+ "integrity": "sha512-tZPHZxDKEBlorQ2BaprytGfkbo5yKBvdxdAF144p94HCTpjO3ScJk/f319wi7GtV1NE4DV8HBQo/0XpldixWQA==",
+ "dependencies": {
+ "jsonc-parser": "^3.0.0",
+ "vscode-oniguruma": "^1.6.1",
+ "vscode-textmate": "5.2.0"
+ }
+ },
+ "node_modules/acorn": {
+ "version": "8.8.2",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+ "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-jsx": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+ "dev": true,
+ "peerDependencies": {
+ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "dev": true,
+ "dependencies": {
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
+ "node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/argparse": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+ "dev": true
+ },
+ "node_modules/arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/arrify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/assign-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+ "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/astral-regex": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/atob": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+ "dev": true,
+ "bin": {
+ "atob": "bin/atob.js"
+ },
+ "engines": {
+ "node": ">= 4.5.0"
+ }
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "dev": true
+ },
+ "node_modules/base": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "dev": true,
+ "dependencies": {
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/base/node_modules/define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/base64-js": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/bl": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+ "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+ "dev": true,
+ "dependencies": {
+ "buffer": "^5.5.0",
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.4.0"
+ }
+ },
+ "node_modules/brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "dependencies": {
+ "fill-range": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/buffer": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+ "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.1.13"
+ }
+ },
+ "node_modules/buffer-crc32": {
+ "version": "0.2.13",
+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/buffer-from": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+ "dev": true
+ },
+ "node_modules/cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "dev": true,
+ "dependencies": {
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/callsites": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/camelcase-keys": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+ "dev": true,
+ "dependencies": {
+ "camelcase": "^5.3.1",
+ "map-obj": "^4.0.0",
+ "quick-lru": "^4.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/chalk?sponsor=1"
+ }
+ },
+ "node_modules/chownr": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+ "dev": true
+ },
+ "node_modules/chromium-bidi": {
+ "version": "0.4.6",
+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.6.tgz",
+ "integrity": "sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw==",
+ "dev": true,
+ "dependencies": {
+ "mitt": "3.0.0"
+ },
+ "peerDependencies": {
+ "devtools-protocol": "*"
+ }
+ },
+ "node_modules/class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "dev": true,
+ "dependencies": {
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/class-utils/node_modules/kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "dev": true,
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/collection-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+ "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+ "dev": true,
+ "dependencies": {
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "node_modules/colord": {
+ "version": "2.9.3",
+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+ "dev": true
+ },
+ "node_modules/component-emitter": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+ "dev": true
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+ "dev": true
+ },
+ "node_modules/copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/cosmiconfig": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+ "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+ "dev": true,
+ "dependencies": {
+ "@types/parse-json": "^4.0.0",
+ "import-fresh": "^3.2.1",
+ "parse-json": "^5.0.0",
+ "path-type": "^4.0.0",
+ "yaml": "^1.10.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/cross-fetch": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+ "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+ "dev": true,
+ "dependencies": {
+ "node-fetch": "2.6.7"
+ }
+ },
+ "node_modules/cross-spawn": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/css-functions-list": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
+ "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.22"
+ }
+ },
+ "node_modules/cssesc": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+ "dev": true,
+ "bin": {
+ "cssesc": "bin/cssesc"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/csstype": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
+ "dev": true
+ },
+ "node_modules/debug": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/decamelize-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+ "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+ "dev": true,
+ "dependencies": {
+ "decamelize": "^1.1.0",
+ "map-obj": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/decamelize-keys/node_modules/map-obj": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+ "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/decode-uri-component": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/deep-is": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+ "dev": true
+ },
+ "node_modules/define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/devtools-protocol": {
+ "version": "0.0.1107588",
+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+ "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+ "dev": true
+ },
+ "node_modules/diff": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+ "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.3.1"
+ }
+ },
+ "node_modules/dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "dev": true,
+ "dependencies": {
+ "path-type": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/discord-types": {
+ "version": "1.3.26",
+ "resolved": "https://registry.npmjs.org/discord-types/-/discord-types-1.3.26.tgz",
+ "integrity": "sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/react": "17.0.2",
+ "moment": "^2.29.1"
+ }
+ },
+ "node_modules/discord-types/node_modules/@types/react": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz",
+ "integrity": "sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==",
+ "dev": true,
+ "dependencies": {
+ "@types/prop-types": "*",
+ "csstype": "^3.0.2"
+ }
+ },
+ "node_modules/doctrine": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+ "dev": true,
+ "dependencies": {
+ "esutils": "^2.0.2"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "dev": true
+ },
+ "node_modules/end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "dev": true,
+ "dependencies": {
+ "once": "^1.4.0"
+ }
+ },
+ "node_modules/error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "dev": true,
+ "dependencies": {
+ "is-arrayish": "^0.2.1"
+ }
+ },
+ "node_modules/esbuild": {
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+ "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "optionalDependencies": {
+ "@esbuild/android-arm": "0.15.18",
+ "@esbuild/linux-loong64": "0.15.18",
+ "esbuild-android-64": "0.15.18",
+ "esbuild-android-arm64": "0.15.18",
+ "esbuild-darwin-64": "0.15.18",
+ "esbuild-darwin-arm64": "0.15.18",
+ "esbuild-freebsd-64": "0.15.18",
+ "esbuild-freebsd-arm64": "0.15.18",
+ "esbuild-linux-32": "0.15.18",
+ "esbuild-linux-64": "0.15.18",
+ "esbuild-linux-arm": "0.15.18",
+ "esbuild-linux-arm64": "0.15.18",
+ "esbuild-linux-mips64le": "0.15.18",
+ "esbuild-linux-ppc64le": "0.15.18",
+ "esbuild-linux-riscv64": "0.15.18",
+ "esbuild-linux-s390x": "0.15.18",
+ "esbuild-netbsd-64": "0.15.18",
+ "esbuild-openbsd-64": "0.15.18",
+ "esbuild-sunos-64": "0.15.18",
+ "esbuild-windows-32": "0.15.18",
+ "esbuild-windows-64": "0.15.18",
+ "esbuild-windows-arm64": "0.15.18"
+ }
+ },
+ "node_modules/esbuild-linux-64": {
+ "version": "0.15.18",
+ "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+ "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/escalade": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eslint": {
+ "version": "8.38.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.38.0.tgz",
+ "integrity": "sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg==",
+ "dev": true,
+ "dependencies": {
+ "@eslint-community/eslint-utils": "^4.2.0",
+ "@eslint-community/regexpp": "^4.4.0",
+ "@eslint/eslintrc": "^2.0.2",
+ "@eslint/js": "8.38.0",
+ "@humanwhocodes/config-array": "^0.11.8",
+ "@humanwhocodes/module-importer": "^1.0.1",
+ "@nodelib/fs.walk": "^1.2.8",
+ "ajv": "^6.10.0",
+ "chalk": "^4.0.0",
+ "cross-spawn": "^7.0.2",
+ "debug": "^4.3.2",
+ "doctrine": "^3.0.0",
+ "escape-string-regexp": "^4.0.0",
+ "eslint-scope": "^7.1.1",
+ "eslint-visitor-keys": "^3.4.0",
+ "espree": "^9.5.1",
+ "esquery": "^1.4.2",
+ "esutils": "^2.0.2",
+ "fast-deep-equal": "^3.1.3",
+ "file-entry-cache": "^6.0.1",
+ "find-up": "^5.0.0",
+ "glob-parent": "^6.0.2",
+ "globals": "^13.19.0",
+ "grapheme-splitter": "^1.0.4",
+ "ignore": "^5.2.0",
+ "import-fresh": "^3.0.0",
+ "imurmurhash": "^0.1.4",
+ "is-glob": "^4.0.0",
+ "is-path-inside": "^3.0.3",
+ "js-sdsl": "^4.1.4",
+ "js-yaml": "^4.1.0",
+ "json-stable-stringify-without-jsonify": "^1.0.1",
+ "levn": "^0.4.1",
+ "lodash.merge": "^4.6.2",
+ "minimatch": "^3.1.2",
+ "natural-compare": "^1.4.0",
+ "optionator": "^0.9.1",
+ "strip-ansi": "^6.0.1",
+ "strip-json-comments": "^3.1.0",
+ "text-table": "^0.2.0"
+ },
+ "bin": {
+ "eslint": "bin/eslint.js"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint-import-resolver-alias": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz",
+ "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ },
+ "peerDependencies": {
+ "eslint-plugin-import": ">=1.4.0"
+ }
+ },
+ "node_modules/eslint-plugin-header": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
+ "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
+ "dev": true,
+ "peerDependencies": {
+ "eslint": ">=7.7.0"
+ }
+ },
+ "node_modules/eslint-plugin-path-alias": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz",
+ "integrity": "sha512-FXus57yC+Zd3sMv46pbloXYwFeNVNHJqlACr9V68FG/IzGFBBokGJpmjDbEjpt8ZCeVSndUubeDWWl2A8sCNVQ==",
+ "dev": true,
+ "dependencies": {
+ "nanomatch": "^1.2.13"
+ },
+ "peerDependencies": {
+ "eslint": "^7"
+ }
+ },
+ "node_modules/eslint-plugin-simple-import-sort": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-8.0.0.tgz",
+ "integrity": "sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw==",
+ "dev": true,
+ "peerDependencies": {
+ "eslint": ">=5.0.0"
+ }
+ },
+ "node_modules/eslint-plugin-unused-imports": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz",
+ "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==",
+ "dev": true,
+ "dependencies": {
+ "eslint-rule-composer": "^0.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "peerDependencies": {
+ "@typescript-eslint/eslint-plugin": "^5.0.0",
+ "eslint": "^8.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@typescript-eslint/eslint-plugin": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/eslint-rule-composer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+ "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0.0"
+ }
+ },
+ "node_modules/eslint-scope": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+ "dev": true,
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/eslint-visitor-keys": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+ "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/eslint-scope": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
+ "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+ "dev": true,
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/eslint/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/espree": {
+ "version": "9.5.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz",
+ "integrity": "sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^8.8.0",
+ "acorn-jsx": "^5.3.2",
+ "eslint-visitor-keys": "^3.4.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
+ }
+ },
+ "node_modules/esquery": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+ "dev": true,
+ "dependencies": {
+ "estraverse": "^5.1.0"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
+ "node_modules/esquery/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/esrecurse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+ "dev": true,
+ "dependencies": {
+ "estraverse": "^5.2.0"
+ },
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/esrecurse/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/eventemitter3": {
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+ },
+ "node_modules/extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+ "dev": true,
+ "dependencies": {
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/extract-zip": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.1.1",
+ "get-stream": "^5.1.0",
+ "yauzl": "^2.10.0"
+ },
+ "bin": {
+ "extract-zip": "cli.js"
+ },
+ "engines": {
+ "node": ">= 10.17.0"
+ },
+ "optionalDependencies": {
+ "@types/yauzl": "^2.9.1"
+ }
+ },
+ "node_modules/fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+ "dev": true
+ },
+ "node_modules/fast-glob": {
+ "version": "3.2.12",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+ "dev": true,
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/fast-glob/node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/fast-json-stable-stringify": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+ "dev": true
+ },
+ "node_modules/fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+ "dev": true
+ },
+ "node_modules/fastest-levenshtein": {
+ "version": "1.0.16",
+ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+ "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.9.1"
+ }
+ },
+ "node_modules/fastq": {
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+ "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+ "dev": true,
+ "dependencies": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "node_modules/fd-slicer": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+ "dev": true,
+ "dependencies": {
+ "pend": "~1.2.0"
+ }
+ },
+ "node_modules/fflate": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz",
+ "integrity": "sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw=="
+ },
+ "node_modules/file-entry-cache": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+ "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+ "dev": true,
+ "dependencies": {
+ "flat-cache": "^3.0.4"
+ },
+ "engines": {
+ "node": "^10.12.0 || >=12.0.0"
+ }
+ },
+ "node_modules/fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/find-up": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^6.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/flat-cache": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+ "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+ "dev": true,
+ "dependencies": {
+ "flatted": "^3.1.0",
+ "rimraf": "^3.0.2"
+ },
+ "engines": {
+ "node": "^10.12.0 || >=12.0.0"
+ }
+ },
+ "node_modules/flatted": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+ "dev": true
+ },
+ "node_modules/for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+ "dev": true,
+ "dependencies": {
+ "map-cache": "^0.2.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fs-constants": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+ "dev": true
+ },
+ "node_modules/fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "dev": true
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
+ },
+ "node_modules/get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true,
+ "engines": {
+ "node": "6.* || 8.* || >= 10.*"
+ }
+ },
+ "node_modules/get-stream": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+ "dev": true,
+ "dependencies": {
+ "pump": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/get-tsconfig": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.5.0.tgz",
+ "integrity": "sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
+ "node_modules/get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/glob": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "dev": true,
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.1.1",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ },
+ "engines": {
+ "node": "*"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/glob-parent": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^4.0.3"
+ },
+ "engines": {
+ "node": ">=10.13.0"
+ }
+ },
+ "node_modules/global-modules": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+ "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+ "dev": true,
+ "dependencies": {
+ "global-prefix": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/global-prefix": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+ "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+ "dev": true,
+ "dependencies": {
+ "ini": "^1.3.5",
+ "kind-of": "^6.0.2",
+ "which": "^1.3.1"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/global-prefix/node_modules/which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "which": "bin/which"
+ }
+ },
+ "node_modules/globals": {
+ "version": "13.20.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+ "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+ "dev": true,
+ "dependencies": {
+ "type-fest": "^0.20.2"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/globals/node_modules/type-fest": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/globby": {
+ "version": "11.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+ "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+ "dev": true,
+ "dependencies": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.2.9",
+ "ignore": "^5.2.0",
+ "merge2": "^1.4.1",
+ "slash": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/globjoin": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+ "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+ "dev": true
+ },
+ "node_modules/grapheme-splitter": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+ "dev": true
+ },
+ "node_modules/hard-rejection": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+ "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
+ "dependencies": {
+ "function-bind": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+ "dev": true,
+ "dependencies": {
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+ "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/has-values/node_modules/kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/highlight.js": {
+ "version": "10.6.0",
+ "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz",
+ "integrity": "sha512-8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/hosted-git-info": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+ "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/html-tags": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+ "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/https-proxy-agent": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+ "dev": true,
+ "dependencies": {
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/ieee754": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/ignore": {
+ "version": "5.2.4",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+ "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/import-fresh": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+ "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+ "dev": true,
+ "dependencies": {
+ "parent-module": "^1.0.0",
+ "resolve-from": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/import-lazy": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+ "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.8.19"
+ }
+ },
+ "node_modules/indent-string": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "dev": true,
+ "dependencies": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "dev": true
+ },
+ "node_modules/ini": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+ "dev": true
+ },
+ "node_modules/is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+ "dev": true
+ },
+ "node_modules/is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+ "dev": true
+ },
+ "node_modules/is-core-module": {
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
+ "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+ "dev": true,
+ "dependencies": {
+ "has": "^1.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "dependencies": {
+ "is-plain-object": "^2.0.4"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-path-inside": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+ "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-plain-obj": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
+ "node_modules/isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+ "dev": true
+ },
+ "node_modules/isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/js-sdsl": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",
+ "integrity": "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==",
+ "dev": true,
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/js-sdsl"
+ }
+ },
+ "node_modules/js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "node_modules/js-yaml": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+ "dev": true,
+ "dependencies": {
+ "argparse": "^2.0.1"
+ },
+ "bin": {
+ "js-yaml": "bin/js-yaml.js"
+ }
+ },
+ "node_modules/json-parse-even-better-errors": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+ "dev": true
+ },
+ "node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "node_modules/json-stable-stringify-without-jsonify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+ "dev": true
+ },
+ "node_modules/jsonc-parser": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+ "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+ },
+ "node_modules/kind-of": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/known-css-properties": {
+ "version": "0.26.0",
+ "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+ "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
+ "dev": true
+ },
+ "node_modules/levn": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+ "dev": true,
+ "dependencies": {
+ "prelude-ls": "^1.2.1",
+ "type-check": "~0.4.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/lines-and-columns": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+ "dev": true
+ },
+ "node_modules/locate-path": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/lodash.merge": {
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+ "dev": true
+ },
+ "node_modules/lodash.truncate": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+ "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+ "dev": true
+ },
+ "node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/map-obj": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+ "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+ "dev": true,
+ "dependencies": {
+ "object-visit": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mathml-tag-names": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+ "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/meow": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+ "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/minimist": "^1.2.0",
+ "camelcase-keys": "^6.2.2",
+ "decamelize": "^1.2.0",
+ "decamelize-keys": "^1.1.0",
+ "hard-rejection": "^2.1.0",
+ "minimist-options": "4.1.0",
+ "normalize-package-data": "^3.0.0",
+ "read-pkg-up": "^7.0.1",
+ "redent": "^3.0.0",
+ "trim-newlines": "^3.0.0",
+ "type-fest": "^0.18.0",
+ "yargs-parser": "^20.2.3"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/meow/node_modules/type-fest": {
+ "version": "0.18.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+ "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+ "dev": true,
+ "dependencies": {
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/min-indent": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+ "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/minimist-options": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+ "dev": true,
+ "dependencies": {
+ "arrify": "^1.0.1",
+ "is-plain-obj": "^1.1.0",
+ "kind-of": "^6.0.3"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/mitt": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+ "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+ "dev": true
+ },
+ "node_modules/mixin-deep": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+ "dev": true,
+ "dependencies": {
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/mkdirp-classic": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+ "dev": true
+ },
+ "node_modules/moment": {
+ "version": "2.29.4",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "node_modules/nanoid": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz",
+ "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.js"
+ },
+ "engines": {
+ "node": "^14 || ^16 || >=18"
+ }
+ },
+ "node_modules/nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "dev": true,
+ "dependencies": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+ "dev": true
+ },
+ "node_modules/natural-compare-lite": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+ "dev": true
+ },
+ "node_modules/node-fetch": {
+ "version": "2.6.7",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+ "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+ "dev": true,
+ "dependencies": {
+ "whatwg-url": "^5.0.0"
+ },
+ "engines": {
+ "node": "4.x || >=6.0.0"
+ },
+ "peerDependencies": {
+ "encoding": "^0.1.0"
+ },
+ "peerDependenciesMeta": {
+ "encoding": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/normalize-package-data": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+ "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+ "dev": true,
+ "dependencies": {
+ "hosted-git-info": "^4.0.1",
+ "is-core-module": "^2.5.0",
+ "semver": "^7.3.4",
+ "validate-npm-package-license": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+ "dev": true,
+ "dependencies": {
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-copy/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+ "dev": true,
+ "dependencies": {
+ "isobject": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dev": true,
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
+ "node_modules/optionator": {
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+ "dev": true,
+ "dependencies": {
+ "deep-is": "^0.1.3",
+ "fast-levenshtein": "^2.0.6",
+ "levn": "^0.4.1",
+ "prelude-ls": "^1.2.1",
+ "type-check": "^0.4.0",
+ "word-wrap": "^1.2.3"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/p-limit": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+ "dev": true,
+ "dependencies": {
+ "yocto-queue": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-locate": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/parent-module": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+ "dev": true,
+ "dependencies": {
+ "callsites": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-parse": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+ "dev": true
+ },
+ "node_modules/path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/pend": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+ "dev": true
+ },
+ "node_modules/picocolors": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+ "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+ "dev": true
+ },
+ "node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/postcss": {
+ "version": "8.4.22",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
+ "integrity": "sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "nanoid": "^3.3.6",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.0.2"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/postcss-media-query-parser": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+ "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
+ "dev": true
+ },
+ "node_modules/postcss-resolve-nested-selector": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+ "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
+ "dev": true
+ },
+ "node_modules/postcss-safe-parser": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+ "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ "peerDependencies": {
+ "postcss": "^8.3.3"
+ }
+ },
+ "node_modules/postcss-selector-parser": {
+ "version": "6.0.11",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+ "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+ "dev": true,
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/postcss-value-parser": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+ "dev": true
+ },
+ "node_modules/postcss/node_modules/nanoid": {
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+ "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
+ "node_modules/prelude-ls": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/progress": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "dev": true
+ },
+ "node_modules/pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "dependencies": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "node_modules/punycode": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/puppeteer-core": {
+ "version": "19.9.0",
+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.9.0.tgz",
+ "integrity": "sha512-IJYfCE0oFpi5dTvNFqOwo8Dey6zzx7hANy7z6K2bjpCux9oPOSOIubq40awNhaHlfi8soYtgU4qabnzMXB7xBQ==",
+ "dev": true,
+ "dependencies": {
+ "@puppeteer/browsers": "0.4.1",
+ "chromium-bidi": "0.4.6",
+ "cross-fetch": "3.1.5",
+ "debug": "4.3.4",
+ "devtools-protocol": "0.0.1107588",
+ "extract-zip": "2.0.1",
+ "https-proxy-agent": "5.0.1",
+ "proxy-from-env": "1.1.0",
+ "tar-fs": "2.1.1",
+ "unbzip2-stream": "1.4.3",
+ "ws": "8.13.0"
+ },
+ "engines": {
+ "node": ">=14.14.0"
+ },
+ "peerDependencies": {
+ "typescript": ">= 4.7.4"
+ },
+ "peerDependenciesMeta": {
+ "typescript": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/quick-lru": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+ "dev": true,
+ "dependencies": {
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+ "dev": true,
+ "dependencies": {
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "dependencies": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg-up/node_modules/type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/read-pkg/node_modules/hosted-git-info": {
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+ "dev": true
+ },
+ "node_modules/read-pkg/node_modules/normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
+ "dependencies": {
+ "hosted-git-info": "^2.1.4",
+ "resolve": "^1.10.0",
+ "semver": "2 || 3 || 4 || 5",
+ "validate-npm-package-license": "^3.0.1"
+ }
+ },
+ "node_modules/read-pkg/node_modules/semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/read-pkg/node_modules/type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/redent": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+ "dev": true,
+ "dependencies": {
+ "indent-string": "^4.0.0",
+ "strip-indent": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/require-from-string": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/resolve": {
+ "version": "1.22.3",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+ "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
+ "dev": true,
+ "dependencies": {
+ "is-core-module": "^2.12.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/resolve-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/resolve-url": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+ "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+ "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+ "dev": true
+ },
+ "node_modules/ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
+ "node_modules/reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+ "dev": true,
+ "engines": {
+ "iojs": ">=1.0.0",
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/rimraf": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+ "dev": true,
+ "dependencies": {
+ "glob": "^7.1.3"
+ },
+ "bin": {
+ "rimraf": "bin.js"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "dependencies": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
+ "node_modules/safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/safe-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+ "dev": true,
+ "dependencies": {
+ "ret": "~0.1.10"
+ }
+ },
+ "node_modules/semver": {
+ "version": "7.4.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+ "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
+ "dev": true,
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/set-value": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/set-value/node_modules/extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+ "dev": true,
+ "dependencies": {
+ "is-extendable": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/set-value/node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dev": true,
+ "dependencies": {
+ "shebang-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/signal-exit": {
+ "version": "3.0.7",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+ "dev": true
+ },
+ "node_modules/slash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/slice-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "astral-regex": "^2.0.0",
+ "is-fullwidth-code-point": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+ }
+ },
+ "node_modules/snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "dev": true,
+ "dependencies": {
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+ "dev": true,
+ "dependencies": {
+ "is-extendable": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/snapdragon/node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+ "dev": true
+ },
+ "node_modules/source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-js": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+ "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-resolve": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+ "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+ "dev": true,
+ "dependencies": {
+ "atob": "^2.1.2",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
+ }
+ },
+ "node_modules/source-map-support": {
+ "version": "0.5.21",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+ "dev": true,
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ },
+ "node_modules/source-map-support/node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-url": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+ "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+ "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+ "dev": true
+ },
+ "node_modules/spdx-correct": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+ "dev": true,
+ "dependencies": {
+ "spdx-expression-parse": "^3.0.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-exceptions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+ "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+ "dev": true
+ },
+ "node_modules/spdx-expression-parse": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+ "dev": true,
+ "dependencies": {
+ "spdx-exceptions": "^2.1.0",
+ "spdx-license-ids": "^3.0.0"
+ }
+ },
+ "node_modules/spdx-license-ids": {
+ "version": "3.0.13",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+ "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
+ "dev": true
+ },
+ "node_modules/split-string": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/standalone-electron-types": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/standalone-electron-types/-/standalone-electron-types-1.0.0.tgz",
+ "integrity": "sha512-0HOi/tlTz3mjWhsAz4uRbpQcHMZ+ifj1JzWW9nugykOHClBBG77ps8QinrzX1eow4Iw2pnC+RFaSYRgufF4BOg==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "^18.8.4"
+ }
+ },
+ "node_modules/static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+ "dev": true,
+ "dependencies": {
+ "is-descriptor": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "dependencies": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/static-extend/node_modules/kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
+ "node_modules/string-width": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "dev": true,
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "dev": true,
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-indent": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+ "dev": true,
+ "dependencies": {
+ "min-indent": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-json-comments": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/style-search": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+ "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
+ "dev": true
+ },
+ "node_modules/stylelint": {
+ "version": "14.16.1",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+ "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
+ "dev": true,
+ "dependencies": {
+ "@csstools/selector-specificity": "^2.0.2",
+ "balanced-match": "^2.0.0",
+ "colord": "^2.9.3",
+ "cosmiconfig": "^7.1.0",
+ "css-functions-list": "^3.1.0",
+ "debug": "^4.3.4",
+ "fast-glob": "^3.2.12",
+ "fastest-levenshtein": "^1.0.16",
+ "file-entry-cache": "^6.0.1",
+ "global-modules": "^2.0.0",
+ "globby": "^11.1.0",
+ "globjoin": "^0.1.4",
+ "html-tags": "^3.2.0",
+ "ignore": "^5.2.1",
+ "import-lazy": "^4.0.0",
+ "imurmurhash": "^0.1.4",
+ "is-plain-object": "^5.0.0",
+ "known-css-properties": "^0.26.0",
+ "mathml-tag-names": "^2.1.3",
+ "meow": "^9.0.0",
+ "micromatch": "^4.0.5",
+ "normalize-path": "^3.0.0",
+ "picocolors": "^1.0.0",
+ "postcss": "^8.4.19",
+ "postcss-media-query-parser": "^0.2.3",
+ "postcss-resolve-nested-selector": "^0.1.1",
+ "postcss-safe-parser": "^6.0.0",
+ "postcss-selector-parser": "^6.0.11",
+ "postcss-value-parser": "^4.2.0",
+ "resolve-from": "^5.0.0",
+ "string-width": "^4.2.3",
+ "strip-ansi": "^6.0.1",
+ "style-search": "^0.1.0",
+ "supports-hyperlinks": "^2.3.0",
+ "svg-tags": "^1.0.0",
+ "table": "^6.8.1",
+ "v8-compile-cache": "^2.3.0",
+ "write-file-atomic": "^4.0.2"
+ },
+ "bin": {
+ "stylelint": "bin/stylelint.js"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/stylelint"
+ }
+ },
+ "node_modules/stylelint-config-recommended": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz",
+ "integrity": "sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==",
+ "dev": true,
+ "peerDependencies": {
+ "stylelint": "^14.10.0"
+ }
+ },
+ "node_modules/stylelint-config-standard": {
+ "version": "29.0.0",
+ "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz",
+ "integrity": "sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==",
+ "dev": true,
+ "dependencies": {
+ "stylelint-config-recommended": "^9.0.0"
+ },
+ "peerDependencies": {
+ "stylelint": "^14.14.0"
+ }
+ },
+ "node_modules/stylelint/node_modules/balanced-match": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+ "dev": true
+ },
+ "node_modules/stylelint/node_modules/is-plain-object": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+ "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/stylelint/node_modules/resolve-from": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/supports-hyperlinks": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+ "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+ "dev": true,
+ "dependencies": {
+ "has-flag": "^4.0.0",
+ "supports-color": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/svg-tags": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+ "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+ "dev": true
+ },
+ "node_modules/table": {
+ "version": "6.8.1",
+ "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+ "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
+ "dev": true,
+ "dependencies": {
+ "ajv": "^8.0.1",
+ "lodash.truncate": "^4.4.2",
+ "slice-ansi": "^4.0.0",
+ "string-width": "^4.2.3",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/table/node_modules/ajv": {
+ "version": "8.12.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+ "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "json-schema-traverse": "^1.0.0",
+ "require-from-string": "^2.0.2",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/table/node_modules/json-schema-traverse": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+ "dev": true
+ },
+ "node_modules/tar-fs": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+ "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+ "dev": true,
+ "dependencies": {
+ "chownr": "^1.1.1",
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^2.1.4"
+ }
+ },
+ "node_modules/tar-stream": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+ "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+ "dev": true,
+ "dependencies": {
+ "bl": "^4.0.3",
+ "end-of-stream": "^1.4.1",
+ "fs-constants": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.1.1"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/text-table": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+ "dev": true
+ },
+ "node_modules/through": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+ "dev": true
+ },
+ "node_modules/to-object-path": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+ "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+ "dev": true,
+ "dependencies": {
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-object-path/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "dev": true,
+ "dependencies": {
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "regex-not": "^1.0.2",
+ "safe-regex": "^1.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
+ "node_modules/to-regex-range/node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/tr46": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+ "dev": true
+ },
+ "node_modules/trim-newlines": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/tslib": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+ "dev": true
+ },
+ "node_modules/tsutils": {
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+ "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+ "dev": true,
+ "dependencies": {
+ "tslib": "^1.8.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ },
+ "peerDependencies": {
+ "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+ }
+ },
+ "node_modules/tsx": {
+ "version": "3.12.6",
+ "resolved": "https://registry.npmjs.org/tsx/-/tsx-3.12.6.tgz",
+ "integrity": "sha512-q93WgS3lBdHlPgS0h1i+87Pt6n9K/qULIMNYZo07nSeu2z5QE2CellcAZfofVXBo2tQg9av2ZcRMQ2S2i5oadQ==",
+ "dev": true,
+ "dependencies": {
+ "@esbuild-kit/cjs-loader": "^2.4.2",
+ "@esbuild-kit/core-utils": "^3.0.0",
+ "@esbuild-kit/esm-loader": "^2.5.5"
+ },
+ "bin": {
+ "tsx": "dist/cli.js"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/type-check": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+ "dev": true,
+ "dependencies": {
+ "prelude-ls": "^1.2.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/type-fest": {
+ "version": "3.8.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.8.0.tgz",
+ "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/typescript": {
+ "version": "4.9.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+ "dev": true,
+ "bin": {
+ "tsc": "bin/tsc",
+ "tsserver": "bin/tsserver"
+ },
+ "engines": {
+ "node": ">=4.2.0"
+ }
+ },
+ "node_modules/unbzip2-stream": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+ "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+ "dev": true,
+ "dependencies": {
+ "buffer": "^5.2.1",
+ "through": "^2.3.8"
+ }
+ },
+ "node_modules/union-value": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+ "dev": true,
+ "dependencies": {
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/union-value/node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+ "dev": true,
+ "dependencies": {
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+ "dev": true,
+ "dependencies": {
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+ "dev": true,
+ "dependencies": {
+ "isarray": "1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/unset-value/node_modules/has-values": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/uri-js": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+ "dev": true,
+ "dependencies": {
+ "punycode": "^2.1.0"
+ }
+ },
+ "node_modules/urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+ "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+ "dev": true
+ },
+ "node_modules/use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+ "dev": true
+ },
+ "node_modules/v8-compile-cache": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+ "dev": true
+ },
+ "node_modules/validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+ "dev": true,
+ "dependencies": {
+ "spdx-correct": "^3.0.0",
+ "spdx-expression-parse": "^3.0.0"
+ }
+ },
+ "node_modules/virtual-merge": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/virtual-merge/-/virtual-merge-1.0.1.tgz",
+ "integrity": "sha512-h7rzV6n5fZJbDu2lP4iu+IOtsZ00uqECFUxFePK1uY0pz/S5B7FNDJpmdDVfyGL7poyJECEHfTaIpJaknNkU0Q=="
+ },
+ "node_modules/vscode-oniguruma": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
+ "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+ },
+ "node_modules/vscode-textmate": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz",
+ "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ=="
+ },
+ "node_modules/webidl-conversions": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+ "dev": true
+ },
+ "node_modules/whatwg-url": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+ "dev": true,
+ "dependencies": {
+ "tr46": "~0.0.3",
+ "webidl-conversions": "^3.0.0"
+ }
+ },
+ "node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/word-wrap": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/wrap-ansi": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "dev": true,
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "dev": true
+ },
+ "node_modules/write-file-atomic": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+ "dev": true,
+ "dependencies": {
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.7"
+ },
+ "engines": {
+ "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+ }
+ },
+ "node_modules/ws": {
+ "version": "8.13.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+ "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": ">=5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/y18n": {
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
+ },
+ "node_modules/yaml": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+ "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/yargs": {
+ "version": "17.7.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+ "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/yargs-parser": {
+ "version": "20.2.9",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/yargs/node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/yauzl": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+ "dev": true,
+ "dependencies": {
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
+ }
+ },
+ "node_modules/yocto-queue": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ }
+ }
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/replace-git.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/replace-git.patch
new file mode 100644
index 0000000000..ca377c642f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/vencord-web-extension/replace-git.patch
@@ -0,0 +1,26 @@
+diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
+index 7ff599a..85b3bfa 100644
+--- a/scripts/build/common.mjs
++++ b/scripts/build/common.mjs
+@@ -24,7 +24,7 @@ import { promisify } from "util";
+
+ export const watch = process.argv.includes("--watch");
+ export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
+-export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
++export const gitHash = "@version@";
+ export const banner = {
+ js: `
+ // Vencord ${gitHash}
+@@ -124,11 +124,7 @@ export const gitRemotePlugin = {
+ namespace: "git-remote", path: args.path
+ }));
+ build.onLoad({ filter, namespace: "git-remote" }, async () => {
+- const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
+- const remote = res.stdout.trim()
+- .replace("https://github.com/", "")
+- .replace("git@github.com:", "")
+- .replace(/.git$/, "");
++ const remote = "Vendicated/Vencord";
+
+ return { contents: `export default "${remote}"` };
+ });
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 4a9ac6d8f7..64b59c7454 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
- versions.aarch64-darwin = "5.14.2.17213";
- versions.x86_64-darwin = "5.14.2.17213";
- versions.x86_64-linux = "5.14.2.2046";
+ versions.aarch64-darwin = "5.14.5.17687";
+ versions.x86_64-darwin = "5.14.5.17687";
+ versions.x86_64-linux = "5.14.5.2430";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
- hash = "sha256-jXSjfPIQepSeG5B/CLBHiCbRP1ceczHt+Mu3KYLonkU=";
+ hash = "sha256-cklNvp6q/4yGWpLhDbruGiBHgaQrY5wHwhtsVapRxx4=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
- hash = "sha256-F/k9NE2GVzn5etkPWCMX80kkyRzVznsKo3rgtztcYn8=";
+ hash = "sha256-1w41TGBqUl8lnl08PglQImSV7JM71khlshacxh1oTJo=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
- hash = "sha256-k16JlqabzdNC/UXoPWM2yYzs66rOtJvhExHpjVka5M0=";
+ hash = "sha256-sf7w9P6Gajm8/D7DHo/u5d4kZwjxeJjAE96BUW/e4KE=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
index 4806e3ae4a..c412044bc9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "juju";
- version = "3.1.0";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "juju";
repo = "juju";
rev = "juju-${version}";
- sha256 = "sha256-n0OtugTjGXk4zCjGPhifY8VinXM6SYkbmX13jBfmV+o=";
+ sha256 = "sha256-nleWdgIYmIltZKjjFl6axQd2fkL8UIXZRbATU96cdQ0=";
};
- vendorHash = "sha256-vDjBmBLrJNRwcre2OmlIuOcxxQuN6b2eYOXLQap3F/U=";
+ vendorHash = "sha256-b6C1FbVXHeJqG9Vh8dqqZ+94T42oRM9kVbDmLuOiPvA=";
# Disable tests because it attempts to use a mongodb instance
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix
index 58bc5b3fdc..ac0de9cfd5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix
@@ -2,16 +2,16 @@
let
pname = "localsend";
- version = "1.8.0";
+ version = "1.9.0";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage";
- hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME=";
+ hash = "sha256-i5/haQHsw3BAOFGsHO41oiop1JgMISTr1Dw0tAeYupU=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
- hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU=";
+ hash = "sha256-Ibojcg5To288c+v6IKMOjuLz970osiKJU7/K0VnIs8k=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -21,7 +21,7 @@ let
linux = appimageTools.wrapType2 rec {
inherit pname version src meta;
- extraPkgs = p: [ p.libepoxy ];
+ extraPkgs = p: [ p.ayatana-ido p.libayatana-appindicator p.libayatana-indicator p.libdbusmenu p.libepoxy ];
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index 49e8852fd0..57596342e2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -22,11 +22,11 @@
stdenv.mkDerivation rec {
pname = "evolution-ews";
- version = "3.46.4";
+ version = "3.48.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58=";
+ sha256 = "vqakEdZAHXOqTh3oHUN5LwPAQ54DBZxVSn+YTEptmtg=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch
index c5fb77fc2a..dae88b9e2b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch
@@ -70,3 +70,27 @@ index ff1b8e3..4f876c0 100644
strv = g_settings_get_strv (settings, "labels");
for (ii = 0; strv && strv[ii]; ii++) {
+diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c
+index 7a1d7f4..3c0d5e1 100644
+--- a/src/Microsoft365/common/e-m365-tz-utils.c
++++ b/src/Microsoft365/common/e-m365-tz-utils.c
+@@ -192,7 +192,18 @@ e_m365_tz_utils_get_user_timezone (void)
+ gchar *location;
+ ICalTimezone *zone = NULL;
+
+- settings = g_settings_new ("org.gnome.evolution.calendar");
++ {
++ g_autoptr(GSettingsSchemaSource) schema_source;
++ g_autoptr(GSettingsSchema) schema;
++ schema_source = g_settings_schema_source_new_from_directory("@evo@",
++ g_settings_schema_source_get_default(),
++ TRUE,
++ NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ "org.gnome.evolution.calendar",
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, NULL);
++ }
+
+ if (g_settings_get_boolean (settings, "use-system-timezone"))
+ location = e_cal_util_get_system_timezone_location ();
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index a7d902b2d3..1e88f20e78 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -44,11 +44,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.48.0";
+ version = "3.48.1";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "LYRygZWJ6S78zk8tw70STpPTedMwCXj2mpZTxZKmDvY=";
+ sha256 = "tJpa3u3JGx0yVPAw9affjiYYLjNAzvd3Ecob9FU+5lA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix
index d15ab04315..81ccd63d0f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,29 +1,37 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
-, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
-, zstd, enableZstd ? true, enableMixmaster ? false
+, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir
+, pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false
+, withContrib ? true
}:
stdenv.mkDerivation rec {
- version = "20220429";
+ version = "20230407";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
- sha256 = "sha256-LBY7WtmEMg/PcMS/Tc5XEYunIWjoI4IQfUJURKgy1YA=";
+ sha256 = "sha256-cTZua1AbLMjkMhlUk2aMttj6HdwpJYnRYPuvukSxfwc=";
};
+ patches = [
+ # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144
+ ./fix-open-very-large-mailbox.patch
+ ];
+
buildInputs = [
cyrus_sasl gss gpgme libkrb5 libidn ncurses
notmuch openssl perl lmdb
mailcap sqlite
]
- ++ lib.optional enableZstd zstd;
+ ++ lib.optional enableZstd zstd
+ ++ lib.optional enableLua lua;
nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
+ pkg-config
];
enableParallelBuilding = true;
@@ -46,10 +54,6 @@ stdenv.mkDerivation rec {
--replace /etc/mime.types ${mailcap}/etc/mime.types
'';
- preBuild = ''
- export HOME=$(mktemp -d)
- '';
-
configureFlags = [
"--enable-autocrypt"
"--gpgme"
@@ -66,32 +70,41 @@ stdenv.mkDerivation rec {
"--zlib"
]
++ lib.optional enableZstd "--zstd"
+ ++ lib.optional enableLua "--lua"
++ lib.optional enableMixmaster "--mixmaster";
- # Fix missing libidn in mutt;
- # this fix is ugly since it links all binaries in mutt against libidn
- # like pgpring, pgpewrap, ...
- NIX_LDFLAGS = "-lidn";
-
postInstall = ''
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt"
- '';
+ ''
+ # https://github.com/neomutt/neomutt-contrib
+ # Contains vim-keys, keybindings presets and more.
+ + lib.optionalString withContrib "${lib.getExe lndir} ${passthru.contrib} $out/share/doc/neomutt";
doCheck = true;
preCheck = ''
- cp -r ${fetchFromGitHub {
- owner = "neomutt";
- repo = "neomutt-test-files";
- rev = "8629adab700a75c54e8e28bf05ad092503a98f75";
- sha256 = "1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr";
- }} $(pwd)/test-files
+ cp -r ${passthru.test-files} $(pwd)/test-files
chmod -R +w test-files
(cd test-files && ./setup.sh)
export NEOMUTT_TEST_DIR=$(pwd)/test-files
'';
+ passthru = {
+ test-files = fetchFromGitHub {
+ owner = "neomutt";
+ repo = "neomutt-test-files";
+ rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2";
+ sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8=";
+ };
+ contrib = fetchFromGitHub {
+ owner = "neomutt";
+ repo = "neomutt-contrib";
+ rev = "8e97688693ca47ea1055f3d15055a4f4ecc5c832";
+ sha256 = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k=";
+ };
+ };
+
checkTarget = "test";
postCheck = "unset NEOMUTT_TEST_DIR";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/fix-open-very-large-mailbox.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/fix-open-very-large-mailbox.patch
new file mode 100644
index 0000000000..11a4464a57
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/fix-open-very-large-mailbox.patch
@@ -0,0 +1,51 @@
+diff --git a/mutt_mailbox.c b/mutt_mailbox.c
+index 5581a8187..22f0ca21a 100644
+--- a/mutt_mailbox.c
++++ b/mutt_mailbox.c
+@@ -160,6 +160,9 @@ int mutt_mailbox_check(struct Mailbox *m_cur, CheckStatsFlags flags)
+ st_ctx.st_dev = 0;
+ st_ctx.st_ino = 0;
+
++ if (kInMboxOpen)
++ return 0;
++
+ #ifdef USE_IMAP
+ if (flags & MUTT_MAILBOX_CHECK_FORCE)
+ mutt_update_num_postponed();
+diff --git a/mx.c b/mx.c
+index 4bf5af141..a4e9f83f5 100644
+--- a/mx.c
++++ b/mx.c
+@@ -295,6 +295,8 @@ bool mx_mbox_ac_link(struct Mailbox *m)
+ return true;
+ }
+
++int kInMboxOpen = 0;
++
+ /**
+ * mx_mbox_open - Open a mailbox and parse it
+ * @param m Mailbox to open
+@@ -386,8 +388,10 @@ bool mx_mbox_open(struct Mailbox *m, OpenMailboxFlags flags)
+ m->msg_tagged = 0;
+ m->vcount = 0;
+
++ kInMboxOpen = 1;
+ enum MxOpenReturns rc = m->mx_ops->mbox_open(m);
+ m->opened++;
++ kInMboxOpen = 0;
+
+ if ((rc == MX_OPEN_OK) || (rc == MX_OPEN_ABORT))
+ {
+diff --git a/mx.h b/mx.h
+index 741431570..43e40bf32 100644
+--- a/mx.h
++++ b/mx.h
+@@ -38,6 +38,8 @@ extern const struct MxOps *mx_ops[];
+
+ extern struct EnumDef MboxTypeDef;
+
++extern int kInMboxOpen;
++
+ typedef uint8_t MsgOpenFlags; ///< Flags for mx_msg_open_new(), e.g. #MUTT_ADD_FROM
+ #define MUTT_MSG_NO_FLAGS 0 ///< No flags are set
+ #define MUTT_ADD_FROM (1 << 0) ///< add a From_ line
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix
index d7de9e971e..0a62ee3e33 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv
, pkg-config, gnupg
-, xapian, gmime, talloc, zlib
+, xapian, gmime3, talloc, zlib
, doxygen, perl, texinfo
, notmuch
, pythonPackages
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnupg # undefined dependencies
- xapian gmime talloc zlib # dependencies described in INSTALL
+ xapian gmime3 talloc zlib # dependencies described in INSTALL
perl
pythonPackages.python
] ++ lib.optional withRuby ruby;
@@ -42,6 +42,10 @@ stdenv.mkDerivation rec {
substituteInPlace lib/Makefile.local \
--replace '-install_name $(libdir)' "-install_name $out/lib"
+
+ # do not override CFLAGS of the Makefile created by mkmf
+ substituteInPlace bindings/Makefile.local \
+ --replace 'CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC"' ""
'' + lib.optionalString withEmacs ''
substituteInPlace emacs/notmuch-emacs-mua \
--replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \
@@ -81,7 +85,7 @@ stdenv.mkDerivation rec {
ln -s ${test-database} test/test-databases/database-v1.tar.xz
'';
- doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
+ doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
checkTarget = "test";
nativeCheckInputs = [
which dtach openssl bash
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
index a1ff67eb1e..c378fdafe9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
@@ -3,12 +3,12 @@ electron, libsecret }:
stdenv.mkDerivation rec {
pname = "tutanota-desktop";
- version = "3.110.0";
+ version = "3.112.6";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
name = "tutanota-desktop-${version}.tar.gz";
- sha256 = "sha256-ufrhJfYolx/O0/a5AU1nuUpQy0Md6TVgmdhTAi9Appo=";
+ sha256 = "sha256-Kqj6XQkwPU7pmR8JY8f7iMqpOYjvWxS5Yir/YTBPXjM=";
};
nativeBuildInputs = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
$out/bin/tutanota-desktop \
--add-flags $out/share/tutanota-desktop/resources/app.asar \
--run "mkdir -p /tmp/tutanota" \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]}
runHook postInstall
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
index a3f128a842..6b505f4156 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -43,11 +43,11 @@ in
stdenv.mkDerivation rec {
pname = "mullvad-vpn";
- version = "2023.2";
+ version = "2023.3";
src = fetchurl {
url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb";
- sha256 = "sha256-3evIB8IW0bioRqtpAdCRQhDywu8xPMN1oxhqQGIBANY=";
+ sha256 = "sha256-+XK9xUeSs93egmtsQ7qATug/n9taeQkmc4ZgObPYvn4=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix
index 41ff2b74a0..8cc96f1b6e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }:
+{ pkgs, nodejs_16, stdenv, lib, nixosTests }:
let
nodePackages = import ./node-composition.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix
index ca76a98f5a..6377a4b2c1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix
index 0b6d71b3ad..26b8e4be83 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix
@@ -1,19 +1,28 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "nali";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "zu1k";
repo = "nali";
rev = "v${version}";
- sha256 = "sha256-ZJnQiTcfvxHFgRNytQANs/lF4hy0S0cXOy8IuGECYi0=";
+ sha256 = "sha256-tIn5ty7faM9BBmUWCvok94QOAMVtz5daCPpZkDGOJfo=";
};
- vendorHash = "sha256-TLij88IksL0+pARKVhEhPg6qUPAXMlL2DWJk4ynahUs=";
+ vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
subPackages = [ "." ];
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = ''
+ installShellCompletion --cmd nali \
+ --bash <($out/bin/nali completion bash) \
+ --fish <($out/bin/nali completion fish) \
+ --zsh <($out/bin/nali completion zsh)
+ '';
+
meta = with lib; {
description = "An offline tool for querying IP geographic information and CDN provider";
homepage = "https://github.com/zu1k/nali";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix
index 4268191b42..20c8115a37 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "netmaker";
- version = "0.17.1";
+ version = "0.18.6";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
- hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g=";
+ hash = "sha256-k0cQ82RVzIdru0YOd7GvzFQ+DUciTALQg876thqEoeU=";
};
- vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI=";
+ vendorHash = "sha256-hJg2TlLMDNN0FreWXNYiCIvTscgPy4ZDlntcPeIcl6U=";
inherit subPackages;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
index d7966e3fc4..68e2bec7cc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "liferea";
- version = "1.14.4";
+ version = "1.15.0";
src = fetchurl {
url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
- sha256 = "MD1Qx+4/y1wdIllHFPuthLZMLiMdox0FFpVE7tcdYu8=";
+ sha256 = "1a7dlwuUOHeCsB+ofAOPlbyuh/QAB8kf50MsocMNz70=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
index 373bcc363b..701fc6f7b8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
- version = "3.8.0";
+ version = "3.8.1";
outputs = [ "out" "dev" ];
@@ -34,7 +34,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
- sha256 = "sha256-kwSETOz/0/LMypbTmwvMMrGzZdquBjkXfoSrLgTfPiQ=";
+ sha256 = "sha256-BTve1dq+OiUwh/Kiy20iSAyALolkdOX7FHwxvVAdS4U=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix
index 16abab431b..36b1b88696 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,16 +1,32 @@
-{ lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
+{ lib
+, fetchFromGitHub
+, mkDerivation
+, pkg-config
+, cmake
+, extra-cmake-modules
+, callPackage
+, qtbase
+, qtkeychain
+, qttools
+, sqlite
+, libsecret
+}:
mkDerivation rec {
pname = "owncloud-client";
- version = "2.11.0.8354";
+ version = "3.2.1";
- src = fetchurl {
- url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
- sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI=";
+ libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { };
+
+ src = fetchFromGitHub {
+ owner = "owncloud";
+ repo = "client";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE=";
};
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
- buildInputs = [ qtbase qtkeychain sqlite libsecret ];
+ buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ];
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
@@ -19,13 +35,17 @@ mkDerivation rec {
cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR"
"-DNO_SHIBBOLETH=1"
+ # https://github.com/owncloud/client/issues/10537#issuecomment-1447965096
+ # NB! From 4.0 it may be turned off by default
+ "-DWITH_AUTO_UPDATER=OFF"
];
meta = with lib; {
description = "Synchronise your ownCloud with your computer using this desktop client";
homepage = "https://owncloud.org";
- maintainers = [ maintainers.qknight ];
+ maintainers = with maintainers; [ qknight hellwolf ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
+ changelog = "https://github.com/owncloud/client/releases/tag/v${version}";
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
new file mode 100644
index 0000000000..fb089cf099
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix
@@ -0,0 +1,34 @@
+{ lib
+, fetchFromGitHub
+, mkDerivation
+, cmake
+, qtbase
+}:
+
+mkDerivation rec {
+ pname = "libre-graph-api-cpp-qt-client";
+ version = "0.13.2";
+
+ src = fetchFromGitHub {
+ owner = "owncloud";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ hash = "sha256-gbrA8P+ukQAiF2czC2szw3fJv1qoPJyMQ72t7PqB5/s=";
+ };
+
+ sourceRoot = "source/client";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ qtbase ];
+
+ cmakeFlags = [ ];
+
+ meta = with lib; {
+ description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API";
+ homepage = "https://owncloud.org";
+ maintainers = with maintainers; [ qknight hellwolf ];
+ platforms = platforms.unix;
+ license = licenses.asl20;
+ changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
index c7a1a02fc2..8a46b5a476 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, gradle, bash, coreutils
+{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils
, substituteAll, nixosTests, perl, fetchpatch, writeText }:
let
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
wrapper = substituteAll {
src = ./freenetWrapper;
- inherit bash coreutils jdk seednodes;
+ inherit bash coreutils jre seednodes;
};
# https://github.com/freenet/fred/blob/next/build-offline.sh
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper
index f8292615de..74ff2c6296 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -15,4 +15,4 @@ cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref
chmod u+rw -- $FREENET_HOME/seednodes.fref
cd -- $FREENET_HOME
-exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
+exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix
new file mode 100644
index 0000000000..15a9ce266e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, python3Packages
+, nix-update-script
+, pyrosimple
+, testers
+, fetchPypi
+, buildPythonPackage
+, bencode-py
+, apscheduler
+, jinja2
+, python-daemon
+, importlib-resources
+, parsimonious
+, prometheus-client
+, prompt-toolkit
+, requests
+, shtab
+, inotify
+, withInotify ? stdenv.isLinux
+, python-box
+, tomli
+, tomli-w
+}:
+
+let
+ pname = "pyrosimple";
+ version = "2.7.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU=";
+ };
+
+ propagatedBuildInputs = [
+ bencode-py
+ apscheduler
+ jinja2
+ python-daemon
+ importlib-resources
+ parsimonious
+ prometheus-client
+ prompt-toolkit
+ requests
+ shtab
+ python-box
+ tomli
+ tomli-w
+ ] ++ lib.optional withInotify inotify;
+
+in buildPythonPackage {
+ inherit pname version src propagatedBuildInputs;
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests = testers.testVersion {
+ package = pyrosimple;
+ command = "pyroadmin --version";
+ };
+ };
+
+ meta = let inherit (lib) licenses platforms maintainers;
+ in {
+ homepage = "https://kannibalox.github.io/pyrosimple/";
+ description = "A rTorrent client and Python 3 fork of the pyrocore tools";
+ license = licenses.gpl3Plus;
+ changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
+ platforms = platforms.all;
+ maintainers = builtins.attrValues { inherit (maintainers) ne9z; };
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
index 4cf4e1becf..cfc10c3f74 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/torrential/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ stdenv
+, lib
, fetchFromGitHub
, nix-update-script
, desktop-file-utils
@@ -7,11 +8,11 @@
, pkg-config
, python3
, vala
-, wrapGAppsHook
+, wrapGAppsHook4
, curl
, dht
, glib
-, gtk3
+, gtk4
, libb64
, libevent
, libgee
@@ -25,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "torrential";
- version = "2.0.1";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "davidmhewitt";
repo = "torrential";
rev = version;
- sha256 = "sha256-W9Is6l8y5XSlPER2BLlf+cyMPPdEQuaP4xM59VhfDE0=";
+ sha256 = "sha256-uHc/VNtbhetmGyuhynZH1TvxJscVX17eWO6dzX6Ft3A=";
};
nativeBuildInputs = [
@@ -41,14 +42,14 @@ stdenv.mkDerivation rec {
pkg-config
python3
vala
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
curl
dht
glib
- gtk3
+ gtk4
libb64
libevent
libgee
@@ -57,12 +58,15 @@ stdenv.mkDerivation rec {
libutp
miniupnpc
openssl
- pantheon.granite
+ pantheon.granite7
];
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
+
+ substituteInPlace meson/post_install.py \
+ --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
'';
passthru = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
index 5f148711c8..403d1e0cf3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix
@@ -3,7 +3,7 @@
# of applications.
#
# What Nix does, simplifying a bit, is that it extracts an AppImage and starts
-# it via buildFHSUserEnv - this is totally fine for majority of apps, but makes
+# it via buildFHSEnv - this is totally fine for majority of apps, but makes
# it by-design *impossible* to launch SUID wrappers [^1]; in case of pCloud,
# it's fusermount.
# (so pCloud starts, but silently fails to mount the FUSE drive.)
@@ -38,12 +38,12 @@
let
pname = "pcloud";
- version = "1.11.0";
- code = "XZspqgVZxM1CCER1we0esiDGuAxshjRSY77X";
+ version = "1.12.0";
+ code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7";
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
src = fetchzip {
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
- hash = "sha256-EXJ+5LwVF5lTXc5zlppRQLCm0EZwqG3ndfK4LIjmWwc=";
+ hash = "sha256-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix
index db76d3f586..11462dab9a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/pjsip/default.nix
@@ -1,4 +1,5 @@
{ lib
+, testers
, stdenv
, fetchFromGitHub
, fetchpatch
@@ -11,17 +12,16 @@
, Security
, python3
, pythonSupport ? true
-, pjsip
, runCommand
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
version = "2.13";
src = fetchFromGitHub {
- owner = pname;
+ owner = finalAttrs.pname;
repo = "pjproject";
- rev = version;
+ rev = finalAttrs.version;
sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
};
@@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
- mkdir -p $out/share/${pname}-${version}/samples
- cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
+ mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+ cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
'' + lib.optionalString pythonSupport ''
(cd pjsip-apps/src/swig/python && \
python setup.py install --prefix=$py
@@ -98,11 +98,26 @@ stdenv.mkDerivation rec {
install_name_tool -id $lib "''${change_args[@]}" $lib
fi
done
+
+ # Rewrite library references for all executables.
+ find "$out" -executable -type f | while read executable; do
+ install_name_tool "''${change_args[@]}" "$executable"
+ done
'';
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
dontPatchELF = true;
+ passthru.tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "pjsua --version";
+ };
+
+ passthru.tests.pkg-config = testers.hasPkgConfigModule {
+ package = finalAttrs.finalPackage;
+ moduleName = "libpjproject";
+ };
+
passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
'';
@@ -115,4 +130,4 @@ stdenv.mkDerivation rec {
mainProgram = "pjsua";
platforms = platforms.linux ++ platforms.darwin;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
index 7d7009e024..f9668a9eea 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix
@@ -8,7 +8,7 @@ let
desktopItem = makeDesktopItem {
name = "AnyDesk";
- exec = "@out@/bin/anydesk";
+ exec = "@out@/bin/anydesk %u";
icon = "anydesk";
desktopName = "AnyDesk";
genericName = description;
@@ -18,14 +18,14 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
- version = "6.2.0";
+ version = "6.2.1";
src = fetchurl {
urls = [
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz"
];
- sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o=";
+ hash = "sha256-lqfe0hROza/zgcNOSe7jJ1yqqsAIR+kav153g3BsmJw=";
};
passthru = {
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ shyim ];
+ maintainers = with maintainers; [ shyim cheriimoya ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix
index f1abf58348..a76bad22c9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.4.29";
+ version = "1.4.30";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "sha256-8B19rqbOYY+lS3Q/vh3Eu696KW03SOvlP9dgXPYYDiU=";
+ sha256 = "sha256-VYBolB6VJ3lT/rNl87qMW5DU5rdFCNvKezSLzx5y1JI=";
};
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index 3841c4af45..6b6e152efa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
@@ -1,10 +1,11 @@
{ stdenv
, lib
-, buildFHSUserEnv
+, buildFHSEnvChroot
, fetchurl
, gsettings-desktop-schemas
, makeDesktopItem
, makeWrapper
+, opensc
, writeTextDir
, configText ? ""
}:
@@ -53,11 +54,16 @@ let
# This library causes the program to core-dump occasionally. Use ours instead.
rm -r $out/lib/vmware/view/crtbora
+ # This opensc library is required to support smartcard authentication during the
+ # initial connection to Horizon.
+ mkdir $out/lib/vmware/view/pkcs11
+ ln -s ${opensc}/lib/pkcs11/opensc-pkcs11.so $out/lib/vmware/view/pkcs11/libopenscpkcs11.so
+
${lib.concatMapStrings wrapBinCommands bins}
'';
};
- vmwareFHSUserEnv = name: buildFHSUserEnv {
+ vmwareFHSUserEnv = name: buildFHSEnvChroot {
inherit name;
runScript = "${vmwareHorizonClientFiles}/bin/${name}_wrapper";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
index c52e96066f..16d5f0952e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/resilio-sync/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libxcrypt, ... }:
+{ lib, stdenv, fetchurl, autoPatchelfHook, libxcrypt-legacy }:
stdenv.mkDerivation rec {
pname = "resilio-sync";
@@ -24,11 +24,17 @@ stdenv.mkDerivation rec {
dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
sourceRoot = ".";
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ stdenv.cc.libc
+ libxcrypt-legacy
+ ];
+
installPhase = ''
install -D rslsync "$out/bin/rslsync"
- patchelf \
- --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix
index 0203128e6b..0e84601e73 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "rymdport";
- version = "3.3.2";
+ version = "3.3.4";
src = fetchFromGitHub {
owner = "Jacalz";
repo = "rymdport";
rev = "v${version}";
- hash = "sha256-UATtfJPpB0twIh6vsgfMSbu9S0F36l+PQgpWYDBmy4M=";
+ hash = "sha256-qCMQEor+R+feXbndG7RZ9HBa/n6Lu0vkQ+tvF/R+148=";
};
- vendorHash = "sha256-XJracr2oblyVid6QKri0EUr5LrEgA3w27PPqbqWcNh8=";
+ vendorHash = "sha256-7PSWMf4z/NjAyWUXpWoNHdngMN9anOvPu+F+o8O27zs=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
index 24923c3e6b..51ed176769 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "3.45";
+ version = "3.47";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
- hash = "sha256-sWomfombHGFhiLmVX56GOc2QDzj5Q2W7qHVgJ3lRxoU=";
+ hash = "sha256-0RDzTS/bjcXeYBWqRq/oWwI0kEmxYkT6oqCBYRi3dnQ=";
};
- vendorHash = "sha256-/sL5W9UmvHnp6OD3kmray8fty85v9fcS7R0A/K2PZLg=";
+ vendorHash = "sha256-oXf+aZxf0jBiOqYzD9mTjYND0LjjQeHIZXIrqcEuyYk=";
subPackages = [ "weed" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/savvycan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/savvycan/default.nix
new file mode 100644
index 0000000000..b9d791603f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/savvycan/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, qtbase
+, qttools
+, qmake
+, qtserialbus
+, qtserialport
+, qtdeclarative
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+
+ pname = "savvycan";
+ version = "208";
+
+ src = fetchFromGitHub {
+ owner = "collin80";
+ repo = "SavvyCAN";
+ rev = "V${version}";
+ hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw=";
+ };
+
+ buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ];
+
+ nativeBuildInputs = [ qmake wrapQtAppsHook ];
+
+ meta = with lib; {
+ description = "QT based cross platform canbus tool";
+ homepage = "https://savvycan.com/";
+ changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";
+ maintainers = with maintainers; [ simoneruffini ];
+ platforms = platforms.all;
+ license = licenses.mit;
+ mainProgram = "SavvyCAN";
+ longDescription = ''
+ SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse
+ engineering and capture tool. It was originally written to utilize EVTV
+ hardware such as the EVTVDue and CANDue hardware. It has since expanded to be
+ able to use any socketCAN compatible device as well as the Macchina M2 and
+ Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's
+ SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and
+ send to multiple buses and CAN capture devices at once. It has many functions
+ specifically meant for reverse engineering data found on the CAN bus:
+ - Ability to capture even very highly loaded buses
+ - Ability to connect to many dongles simultaneously
+ - Scan captured traffic for data that looks coherent
+ - Show ASCII of captured data to find things like VIN numbers and traffic to
+ and from the radio
+ - Graph data found on the bus
+ - Load and Save many different file formats common to CAN capture tools (Vector
+ captures, Microchip, CANDo, PCAN, and many more)
+ - Load and Save DBC files. DBC files are used to store definitions for how data
+ are formatted on the bus. You can turn the raw data into things like a RPM,
+ odometer readings, and more.
+ - UDS scanning and decoding
+ - Scripting interface to be able to expand the scope of the software
+ - Best of all, it's free and open source. Don't like something about it? Change
+ it!
+ '';
+ };
+
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
index 14f8db6a7e..49bf77a483 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -49,7 +49,7 @@
assert withQt -> qt5 != null;
let
- version = "4.0.4";
+ version = "4.0.5";
variant = if withQt then "qt" else "cli";
in
stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
- hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw=";
+ hash = "sha256-9U0V2oLVyzq+3HxvOuD8Uzj1tjoMtYBws43fn5RfGhQ=";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix
index 0fc2167f02..95c85d95d6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sniffnet/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "sniffnet";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "gyulyvgc";
repo = "sniffnet";
rev = "refs/tags/v${version}";
- hash = "sha256-sJUc14MXaCS4OHtwdCuwI1b7NAlOnaGsXBNUYCEXJqQ=";
+ hash = "sha256-8G6cfp5/eXjwyNBk2SvE2XmUt7Y42E76IjDU5QHUK7s=";
};
- cargoHash = "sha256-neRVpJmI4TgzvIQqKNqBr61O7rR8246PcxG50IIKE/M=";
+ cargoHash = "sha256-KN7jlB6PzRGpHBk5UvqPLhxRG7QAzOXLmEuFYNhdZJU=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/warp/Cargo.lock
deleted file mode 100644
index b156ce488d..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/warp/Cargo.lock
+++ /dev/null
@@ -1,3476 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
- "opaque-debug",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
-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"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-broadcast"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b19760fa2b7301cf235360ffd6d3558b1ed4249edd16d6cca8d690cee265b95"
-dependencies = [
- "event-listener",
- "futures-core",
- "parking_lot",
-]
-
-[[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-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-fs"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
-dependencies = [
- "async-lock",
- "autocfg",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
-dependencies = [
- "async-lock",
- "autocfg",
- "concurrent-queue",
- "futures-lite",
- "libc",
- "log",
- "parking",
- "polling",
- "slab",
- "socket2",
- "waker-fn",
- "windows-sys",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
-dependencies = [
- "event-listener",
- "futures-lite",
-]
-
-[[package]]
-name = "async-net"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f"
-dependencies = [
- "async-io",
- "autocfg",
- "blocking",
- "futures-lite",
-]
-
-[[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",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-attributes",
- "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-tar"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c49359998a76e32ef6e870dbc079ebad8f1e53e8441c5dd39d27b44493fe331"
-dependencies = [
- "async-std",
- "filetime",
- "libc",
- "pin-project",
- "redox_syscall",
- "xattr",
-]
-
-[[package]]
-name = "async-task"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
-
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.62"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "689894c2db1ea643a50834b999abf1c110887402542955ff5451dab8f861f9ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-tungstenite"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb"
-dependencies = [
- "async-std",
- "async-tls",
- "futures-io",
- "futures-util",
- "log",
- "pin-project-lite",
- "tungstenite",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.67"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "blake2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
-dependencies = [
- "digest 0.10.6",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-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 = "bumpalo"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-
-[[package]]
-name = "bytecodec"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf4c9d0bbf32eea58d7c0f812058138ee8edaf0f2802b6d03561b504729a325"
-dependencies = [
- "byteorder",
- "trackable 0.2.24",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
-[[package]]
-name = "cairo-rs"
-version = "0.16.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
-dependencies = [
- "bitflags",
- "cairo-sys-rs",
- "glib",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
-
-[[package]]
-name = "cfg-expr"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
- "zeroize",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
-dependencies = [
- "aead",
- "chacha20",
- "cipher",
- "poly1305",
- "zeroize",
-]
-
-[[package]]
-name = "checked_int_cast"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
-
-[[package]]
-name = "chrono"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time 0.1.45",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "concurrent-queue"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "darling"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "enumflags2"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "field-offset"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
-dependencies = [
- "memoffset",
- "rustc_version 0.3.3",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "windows-sys",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
-
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
-
-[[package]]
-name = "futures-task"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
-
-[[package]]
-name = "futures-util"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "futures_ringbuf"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b905098b5519bd63b2a1f9f4615198b0e38a473ce201ffdbd4dea6eb63087ddc"
-dependencies = [
- "futures",
- "log",
- "log-derive",
- "ringbuf",
- "rustc_version 0.4.0",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.16.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
-dependencies = [
- "bitflags",
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gdk4"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk-pixbuf",
- "gdk4-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk4-sys"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "gettext-rs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
-dependencies = [
- "gettext-sys",
- "locale_config",
-]
-
-[[package]]
-name = "gettext-sys"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d"
-dependencies = [
- "cc",
- "temp-dir",
-]
-
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
-[[package]]
-name = "gimli"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
-
-[[package]]
-name = "gio"
-version = "0.16.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "winapi",
-]
-
-[[package]]
-name = "glib"
-version = "0.16.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "once_cell",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf"
-dependencies = [
- "anyhow",
- "heck",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "graphene-rs"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
-dependencies = [
- "glib",
- "graphene-sys",
- "libc",
-]
-
-[[package]]
-name = "graphene-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
-dependencies = [
- "glib-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "gsk4"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk4",
- "glib",
- "graphene-rs",
- "gsk4-sys",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gsk4-sys"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5"
-dependencies = [
- "cairo-sys-rs",
- "gdk4-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gtk4"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "graphene-rs",
- "gsk4",
- "gtk4-macros",
- "gtk4-sys",
- "libc",
- "once_cell",
- "pango",
-]
-
-[[package]]
-name = "gtk4-macros"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832687a415d9d8bc11fe9c17dda1bf13ee262c41b995dd4df1d1cce33cead405"
-dependencies = [
- "anyhow",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quick-xml",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gtk4-sys"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "graphene-sys",
- "gsk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "gvdb"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a25bb788ebbe56697e340805b370e1ec0851be6308f2c883f07c7ccaeaa7dd"
-dependencies = [
- "byteorder",
- "flate2",
- "json",
- "memmap2",
- "safe-transmute",
- "serde",
- "serde-xml-rs",
- "walkdir",
- "xml-rs",
- "zvariant",
-]
-
-[[package]]
-name = "gvdb-macros"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10e4d0758e2231af146c92815f59233acb78d8c0f58c0bbf7bd496e5fde0d01"
-dependencies = [
- "gvdb",
- "litrs",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "hkdf"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.6",
-]
-
-[[package]]
-name = "hmac-sha1"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1333fad8d94b82cab989da428b0b36a3435db3870d85e971a1d6dc0a8576722"
-dependencies = [
- "sha1 0.2.0",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "if-addrs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
-
-[[package]]
-name = "js-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd"
-
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libadwaita"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
-dependencies = [
- "bitflags",
- "futures-channel",
- "gdk-pixbuf",
- "gdk4",
- "gio",
- "glib",
- "gtk4",
- "libadwaita-sys",
- "libc",
- "once_cell",
- "pango",
-]
-
-[[package]]
-name = "libadwaita-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
-dependencies = [
- "gdk4-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk4-sys",
- "libc",
- "pango-sys",
- "system-deps",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.139"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "litrs"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "locale_config"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
-dependencies = [
- "lazy_static",
- "objc",
- "objc-foundation",
- "regex",
- "winapi",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
- "value-bag",
-]
-
-[[package]]
-name = "log-derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a42526bb432bcd1b43571d5f163984effa25409a29f1a3242a54d0577d55bcf"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "magic-wormhole"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "803ddb5f8d832299be44336b5b2ddf1c10952999498247dd516b5757be2b51c7"
-dependencies = [
- "async-io",
- "async-std",
- "async-tar",
- "async-trait",
- "async-tungstenite",
- "base64 0.20.0",
- "bytecodec",
- "derive_more",
- "futures",
- "futures_ringbuf",
- "hex",
- "hkdf",
- "if-addrs",
- "libc",
- "log",
- "noise-protocol",
- "noise-rust-crypto",
- "percent-encoding",
- "rand",
- "rmp-serde",
- "serde",
- "serde_derive",
- "serde_json",
- "sha-1",
- "sha2",
- "socket2",
- "spake2",
- "stun_codec",
- "thiserror",
- "time 0.3.17",
- "url",
- "xsalsa20poly1305",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memmap2"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags",
- "cfg-if",
- "libc",
- "memoffset",
- "pin-utils",
-]
-
-[[package]]
-name = "noise-protocol"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb474d36dfe51bb4d7e733fee2b0dfd92ee1b95c716030a70e92737dea1a52b"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "noise-rust-crypto"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e7cfeb8e6a63b4a5ccef34ed7a22d084a129b1e53a000c080bbc54c0da6f8c"
-dependencies = [
- "aes-gcm",
- "blake2",
- "chacha20poly1305",
- "getrandom 0.2.8",
- "noise-protocol",
- "sha2",
- "x25519-dalek",
- "zeroize",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "object"
-version = "0.30.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "ordered-stream"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4eb9ba3f3e42dbdd3b7b122de5ca169c81e93d561eb900da3a8c99bcfcf381a"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "pango"
-version = "0.16.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
-dependencies = [
- "bitflags",
- "gio",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
-]
-
-[[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"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "polling"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
-dependencies = [
- "autocfg",
- "cfg-if",
- "libc",
- "log",
- "wepoll-ffi",
- "windows-sys",
-]
-
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
-dependencies = [
- "env_logger",
- "log",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
-dependencies = [
- "once_cell",
- "thiserror",
- "toml",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "qrcode"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f"
-dependencies = [
- "checked_int_cast",
- "image",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-xml"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.8",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-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",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ringbuf"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f65af18d50f789e74aaf23bbb3f65dcd22a3cb6e029b5bced149f6bd57c5c2a2"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "rmp"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
-[[package]]
-name = "rmp-serde"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.16",
-]
-
-[[package]]
-name = "rustix"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-
-[[package]]
-name = "safe-transmute"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8"
-
-[[package]]
-name = "salsa20"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686"
-dependencies = [
- "cipher",
- "zeroize",
-]
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-xml-rs"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782"
-dependencies = [
- "log",
- "serde",
- "thiserror",
- "xml-rs",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sha1"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simple_moving_average"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd19d3808aad2604c824399fd270260d634678b010328c9d96851bb0fb63121"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "smol"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-net",
- "async-process",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "spake2"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7139ade210556eca57dfc299ec2454846ab6be09232eb1139a36e285ae7fd48e"
-dependencies = [
- "curve25519-dalek",
- "hkdf",
- "rand_core 0.5.1",
- "sha2",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strsim"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-
-[[package]]
-name = "stun_codec"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f1df6c4e592afc1ffed8f4bc50ab9f4d70cfccb42829662b7d276247cbef3b1"
-dependencies = [
- "bytecodec",
- "byteorder",
- "crc",
- "hmac-sha1",
- "md5",
- "trackable 1.2.0",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "temp-dir"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "git+https://github.com/Stebalien/tempfile.git#1c6149d7ce33b2ad8b20a38a8ddce0fc29f68f0e"
-dependencies = [
- "cfg-if",
- "fastrand",
- "redox_syscall",
- "remove_dir_all",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
-dependencies = [
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "time-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
-dependencies = [
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "trackable"
-version = "0.2.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98abb9e7300b9ac902cc04920945a874c1973e08c310627cc4458c04b70dd32"
-dependencies = [
- "trackable 1.2.0",
- "trackable_derive",
-]
-
-[[package]]
-name = "trackable"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "017e2a1a93718e4e8386d037cfb8add78f1d690467f4350fb582f55af1203167"
-dependencies = [
- "trackable_derive",
-]
-
-[[package]]
-name = "trackable_derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
-dependencies = [
- "base64 0.13.1",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "log",
- "rand",
- "sha-1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
-[[package]]
-name = "uds_windows"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d"
-dependencies = [
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[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 = "version-compare"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "warp"
-version = "0.4.0"
-dependencies = [
- "async-broadcast",
- "async-channel",
- "backtrace",
- "chrono",
- "futures",
- "gdk4",
- "gettext-rs",
- "gio",
- "glib",
- "gtk4",
- "gvdb",
- "gvdb-macros",
- "libadwaita",
- "log",
- "magic-wormhole",
- "once_cell",
- "pretty_env_logger",
- "qrcode",
- "regex",
- "scopeguard",
- "serde",
- "serde_json",
- "simple_moving_average",
- "smol",
- "tempfile",
- "thiserror",
- "url",
- "urlencoding",
- "walkdir",
- "win32console",
- "xml-rs",
- "zbus",
- "zip",
- "zip-extensions",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "web-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "win32console"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e69bbdf01990d3e8b9f5a7c4667feda30c63be20aa2f8e66b2f4efb6c06f673"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
-
-[[package]]
-name = "x25519-dalek"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
-
-[[package]]
-name = "xsalsa20poly1305"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68bcb965d6c650091450b95cea12f07dcd299a01c15e2f9433b0813ea3c0886"
-dependencies = [
- "aead",
- "poly1305",
- "rand_core 0.6.4",
- "salsa20",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "zbus"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379d587c0ccb632d1179cf44082653f682842f0535f0fdfaefffc34849cc855e"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-io",
- "async-lock",
- "async-recursion",
- "async-task",
- "async-trait",
- "byteorder",
- "derivative",
- "dirs",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "once_cell",
- "ordered-stream",
- "rand",
- "serde",
- "serde_repr",
- "sha1 0.10.5",
- "static_assertions",
- "tracing",
- "uds_windows",
- "winapi",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66492a2e90c0df7190583eccb8424aa12eb7ff06edea415a4fff6688fae18cf8"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "regex",
- "syn",
-]
-
-[[package]]
-name = "zbus_names"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zip"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "flate2",
- "thiserror",
- "time 0.1.45",
-]
-
-[[package]]
-name = "zip-extensions"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c3c977bc3434ce2d4bcea8ad3c644672de0f2c402b72b9171ca80a8885d14"
-dependencies = [
- "zip",
-]
-
-[[package]]
-name = "zvariant"
-version = "3.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576cc41e65c7f283e5460f5818073e68fb1f1631502b969ef228c2e03c862efb"
-dependencies = [
- "byteorder",
- "enumflags2",
- "libc",
- "serde",
- "static_assertions",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "3.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fd4aafc0dee96ae7242a24249ce9babf21e1562822f03df650d4e68c20e41ed"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix
index 16ba528e15..d53e6d6e1f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix
@@ -17,25 +17,24 @@
stdenv.mkDerivation rec {
pname = "warp";
- version = "0.4";
+ version = "0.5.3";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = "v${version}";
- hash = "sha256-c8X0kedfM8DPTEQAbh8cXIfEvxG2cdUD3twVHs0/k7U";
+ hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc=";
};
postPatch = ''
patchShebangs build-aux
'';
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "tempfile-3.3.0" = "sha256-zVbGZOEYEmOJGtl5Ko8rYIW9NY16lq5+zMzJ/TSkfsc=";
- };
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix
index 4d52782c85..b95eb6cb51 100644
--- a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix
@@ -1,7 +1,7 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations }:
+{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations, wrapQtAppsHook }:
-mkDerivation rec {
- pname = "PageEdit";
+stdenv.mkDerivation rec {
+ pname = "pageedit";
version = "1.9.20";
src = fetchFromGitHub {
@@ -11,10 +11,21 @@ mkDerivation rec {
hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE=";
};
- nativeBuildInputs = [ cmake qttranslations ];
+ nativeBuildInputs = [ cmake qttranslations wrapQtAppsHook ];
propagatedBuildInputs = [ qtsvg qtwebengine ];
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
+ installPhase =
+ if stdenv.isDarwin then ''
+ runHook preInstall
+
+ mkdir -p $out/Applications
+ cp -r bin/PageEdit.app $out/Applications
+ makeWrapper $out/Applications/PageEdit.app/Contents/MacOS/PageEdit $out/bin/pageedit
+
+ runHook postInstall
+ '' else null;
+
meta = with lib; {
description = "ePub XHTML Visual Editor";
homepage = "https://sigil-ebook.com/pageedit/";
diff --git a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix
index 954c50befc..b90b23a390 100644
--- a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
wrapGAppsHook
+ perl
];
buildInputs = [
@@ -44,12 +45,12 @@ stdenv.mkDerivation rec {
enchant
wv
libjpeg
- perl
boost
libxslt
goffice
];
+ strictDeps = true;
enableParallelBuilding = true;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix
index 3bab193e8a..ab3e7721ab 100644
--- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "appflowy";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchzip {
url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz";
- sha256 = "sha256-fOPODq938ejJY4QDJawN/WFv6Ynr9pGgJPWnjWD/rQk=";
+ sha256 = "sha256-dZqnwROrw3ioCzUNvpklGOCr5cyjXU1Iqkp6xBdr3rA=";
stripRoot = false;
};
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
- cd AppFlowy/
+ cd AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04/AppFlowy/
mkdir -p $out/opt/
mkdir -p $out/bin/
diff --git a/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix b/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix
index 555b2a2aad..e1c5f7fdeb 100644
--- a/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/banana-accounting/default.nix
@@ -9,6 +9,8 @@
, libX11
, lib
, stdenv
+, libgcrypt
+, wrapGAppsHook
}:
stdenv.mkDerivation {
@@ -33,10 +35,12 @@ stdenv.mkDerivation {
stdenv.cc.cc.lib
libGL
libX11
+ libgcrypt
];
nativeBuildInputs = [
autoPatchelfHook
+ wrapGAppsHook
];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index e7633cdde0..25e8f18998 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -356,6 +356,9 @@ in
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx"
+
+ # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4
+ sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx
''
# This to avoid using /lib:/usr/lib at linking
+ ''
diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix
index 184157d9d0..adc6eb6ec1 100644
--- a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix
@@ -14,18 +14,18 @@ let
in
mkYarnPackage rec {
pname = "micropad";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchFromGitHub {
owner = "MicroPad";
repo = "Micropad-Electron";
rev = "v${version}";
- sha256 = "sha256-XylyQd4AhvrwJzBZXab7rA2IrZcqzEv8BANk+ozYyHk=";
+ sha256 = "sha256-XmnKhyb0JMWP0ZGzPvLPtpkgAemW/mdxunbFW9WV9lE=";
};
micropad-core = fetchzip {
url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz";
- sha256 = "0vddz95c1khalvl2a9zccy36j8s7862gpqcqlrvp1pn4bbp2pm3s";
+ sha256 = "0mzyd2p4mmnc19ffvd4sd75x7xwb1g5masdaqpn2n3h91687jmsf";
};
packageJSON = ./package.json;
diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json
index 167cef8113..912e451cba 100644
--- a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json
+++ b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json
@@ -1,6 +1,6 @@
{
"name": "micropad",
- "version": "4.2.0",
+ "version": "4.2.1",
"description": "A powerful note-taking app that helps you organise + take notes without restrictions.",
"main": "main.js",
"scripts": {
@@ -26,9 +26,9 @@
"homepage": "https://getmicropad.com",
"devDependencies": {
"@types/node": "^18.7.18",
- "electron": "^21.2.2",
- "electron-builder": "^23.3.3",
- "typescript": "~4.8.3"
+ "electron": "^23.1.3",
+ "electron-builder": "^23.6.0",
+ "typescript": "~4.9.5"
},
"dependencies": {
"dictionary-en": "^3.0.0",
diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock
index 93e7ea8736..a6a8c100f4 100644
--- a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock
+++ b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock
@@ -15,21 +15,20 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-"@electron/get@^1.14.1":
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
- integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^2.0.0":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+ integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
fs-extra "^8.1.0"
- got "^9.6.0"
+ got "^11.8.5"
progress "^2.0.3"
semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
global-agent "^3.0.0"
- global-tunnel-ng "^2.7.1"
"@electron/universal@1.2.1":
version "1.2.1"
@@ -61,23 +60,33 @@
lodash "^4.17.15"
tmp-promise "^3.0.2"
-"@sindresorhus/is@^0.14.0":
- version "0.14.0"
- resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
- integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sindresorhus/is@^4.0.0":
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+ integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-"@szmarczak/http-timer@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
- integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+"@szmarczak/http-timer@^4.0.5":
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+ integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
dependencies:
- defer-to-connect "^1.0.1"
+ defer-to-connect "^2.0.0"
"@tootallnate/once@2":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+"@types/cacheable-request@^6.0.1":
+ version "6.0.3"
+ resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+ integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+ dependencies:
+ "@types/http-cache-semantics" "*"
+ "@types/keyv" "^3.1.4"
+ "@types/node" "*"
+ "@types/responselike" "^1.0.0"
+
"@types/debug@^4.1.6":
version "4.1.7"
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
@@ -100,6 +109,18 @@
"@types/minimatch" "*"
"@types/node" "*"
+"@types/http-cache-semantics@*":
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+ integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
+"@types/keyv@^3.1.4":
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+ integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+ dependencies:
+ "@types/node" "*"
+
"@types/minimatch@*":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
@@ -111,14 +132,14 @@
integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
"@types/node@*", "@types/node@^18.7.18":
- version "18.11.9"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
- integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+ version "18.15.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz#286a65e3fdffd691e170541e6ecb0410b16a38be"
+ integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==
"@types/node@^16.11.26":
- version "16.18.3"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc"
- integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==
+ version "16.18.14"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.14.tgz#5465ce598486a703caddbefe8603f8a2cffa3461"
+ integrity sha512-wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw==
"@types/plist@^3.0.1":
version "3.0.2"
@@ -128,6 +149,13 @@
"@types/node" "*"
xmlbuilder ">=11.0.1"
+"@types/responselike@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+ integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+ dependencies:
+ "@types/node" "*"
+
"@types/verror@^1.10.3":
version "1.10.6"
resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb"
@@ -139,9 +167,9 @@
integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
"@types/yargs@^17.0.1":
- version "17.0.13"
- resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
- integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
+ version "17.0.22"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a"
+ integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==
dependencies:
"@types/yargs-parser" "*"
@@ -384,18 +412,23 @@ builder-util@23.6.0:
stat-mode "^1.0.0"
temp-file "^3.4.0"
-cacheable-request@^6.0.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
- integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+cacheable-lookup@^5.0.3:
+ version "5.0.4"
+ resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+ integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.2:
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+ integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
dependencies:
clone-response "^1.0.2"
get-stream "^5.1.0"
http-cache-semantics "^4.0.0"
- keyv "^3.0.0"
+ keyv "^4.0.0"
lowercase-keys "^2.0.0"
- normalize-url "^4.1.0"
- responselike "^1.0.2"
+ normalize-url "^6.0.1"
+ responselike "^2.0.0"
chalk@^4.0.2, chalk@^4.1.1:
version "4.1.2"
@@ -416,9 +449,9 @@ chromium-pickle-js@^0.2.0:
integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==
ci-info@^3.2.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
- integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
+ version "3.8.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+ integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
cli-truncate@^2.1.0:
version "2.1.0"
@@ -490,14 +523,6 @@ concat-map@0.0.1:
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-config-chain@^1.1.11:
- version "1.1.13"
- resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
- integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
- dependencies:
- ini "^1.3.4"
- proto-list "~1.2.1"
-
core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -533,22 +558,22 @@ debug@^2.6.8:
dependencies:
ms "2.0.0"
-decompress-response@^3.3.0:
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
- integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
+decompress-response@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+ integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
dependencies:
- mimic-response "^1.0.0"
+ mimic-response "^3.1.0"
-defer-to-connect@^1.0.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
- integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+defer-to-connect@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+ integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
define-properties@^1.1.3:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
- integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+ integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
dependencies:
has-property-descriptors "^1.0.0"
object-keys "^1.1.1"
@@ -621,11 +646,6 @@ dotenv@^9.0.2:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
-duplexer3@^0.1.4:
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
- integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
-
ejs@^3.1.7:
version "3.1.8"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
@@ -633,7 +653,7 @@ ejs@^3.1.7:
dependencies:
jake "^10.8.5"
-electron-builder@^23.3.3:
+electron-builder@^23.6.0:
version "23.6.0"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b"
integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw==
@@ -652,18 +672,18 @@ electron-builder@^23.3.3:
yargs "^17.5.1"
electron-context-menu@^3.1.2:
- version "3.6.0"
- resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz#d60fabb99d5bb06c46b6929c342c75cc0eee348e"
- integrity sha512-7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw==
+ version "3.6.1"
+ resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz#42f117e15309687b22283e6f8f7a0d95a19afe84"
+ integrity sha512-lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ==
dependencies:
cli-truncate "^2.1.0"
electron-dl "^3.2.1"
electron-is-dev "^2.0.0"
electron-dl@^3.2.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz#2d74a47a04eb8a042c90480cb59736c6f2626219"
- integrity sha512-NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA==
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.5.0.tgz#7a80bf13f168f7e5204774eee89dbc7c86de957b"
+ integrity sha512-Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig==
dependencies:
ext-name "^5.0.0"
pupa "^2.0.1"
@@ -707,12 +727,12 @@ electron-window-state@^5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
-electron@^21.2.2:
- version "21.2.2"
- resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz#e2f3dd014981df555d2cd1655590168b404edae4"
- integrity sha512-Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag==
+electron@^23.1.3:
+ version "23.1.3"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-23.1.3.tgz#42efdb98443a51db38bb0b627ec6788b1a64b92d"
+ integrity sha512-MNjuUS2K6/OxlJ0zTC77djo1R3xM038v1kUunvNFgDMZHYKpSOzOMNsPiwM2BGp+uZbkUb0nTnYafxXrM8H16w==
dependencies:
- "@electron/get" "^1.14.1"
+ "@electron/get" "^2.0.0"
"@types/node" "^16.11.26"
extract-zip "^2.0.1"
@@ -721,11 +741,6 @@ emoji-regex@^8.0.0:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-encodeurl@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
- integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
end-of-stream@^1.1.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -873,21 +888,14 @@ get-caller-file@^2.0.5:
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-intrinsic@^1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
- integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
+ integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
has-symbols "^1.0.3"
-get-stream@^4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
- integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
- dependencies:
- pump "^3.0.0"
-
get-stream@^5.1.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -919,16 +927,6 @@ global-agent@^3.0.0:
semver "^7.3.2"
serialize-error "^7.0.1"
-global-tunnel-ng@^2.7.1:
- version "2.7.1"
- resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
- integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
- dependencies:
- encodeurl "^1.0.2"
- lodash "^4.17.10"
- npm-conf "^1.1.3"
- tunnel "^0.0.6"
-
globalthis@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
@@ -936,22 +934,22 @@ globalthis@^1.0.1:
dependencies:
define-properties "^1.1.3"
-got@^9.6.0:
- version "9.6.0"
- resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
- integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+got@^11.8.5:
+ version "11.8.6"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+ integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
dependencies:
- "@sindresorhus/is" "^0.14.0"
- "@szmarczak/http-timer" "^1.1.2"
- cacheable-request "^6.0.0"
- decompress-response "^3.3.0"
- duplexer3 "^0.1.4"
- get-stream "^4.1.0"
- lowercase-keys "^1.0.1"
- mimic-response "^1.0.1"
- p-cancelable "^1.0.0"
- to-readable-stream "^1.0.0"
- url-parse-lax "^3.0.0"
+ "@sindresorhus/is" "^4.0.0"
+ "@szmarczak/http-timer" "^4.0.5"
+ "@types/cacheable-request" "^6.0.1"
+ "@types/responselike" "^1.0.0"
+ cacheable-lookup "^5.0.3"
+ cacheable-request "^7.0.2"
+ decompress-response "^6.0.0"
+ http2-wrapper "^1.0.0-beta.5.2"
+ lowercase-keys "^2.0.0"
+ p-cancelable "^2.0.0"
+ responselike "^2.0.0"
graceful-fs@^4.1.6, graceful-fs@^4.2.0:
version "4.2.10"
@@ -995,9 +993,9 @@ hosted-git-info@^4.1.0:
lru-cache "^6.0.0"
http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+ integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
http-proxy-agent@^5.0.0:
version "5.0.0"
@@ -1008,6 +1006,14 @@ http-proxy-agent@^5.0.0:
agent-base "6"
debug "4"
+http2-wrapper@^1.0.0-beta.5.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+ integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+ dependencies:
+ quick-lru "^5.1.1"
+ resolve-alpn "^1.0.0"
+
https-proxy-agent@^5.0.0:
version "5.0.1"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -1054,11 +1060,6 @@ inherits@2:
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-ini@^1.3.4:
- version "1.3.8"
- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
- integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
is-ci@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
@@ -1110,10 +1111,10 @@ js-yaml@^4.1.0:
dependencies:
argparse "^2.0.1"
-json-buffer@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
- integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
+json-buffer@3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+ integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
json-schema-traverse@^0.4.1:
version "0.4.1"
@@ -1126,9 +1127,9 @@ json-stringify-safe@^5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
- integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+ integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonfile@^4.0.0:
version "4.0.0"
@@ -1146,12 +1147,12 @@ jsonfile@^6.0.1:
optionalDependencies:
graceful-fs "^4.1.6"
-keyv@^3.0.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
- integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+keyv@^4.0.0:
+ version "4.5.2"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+ integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
dependencies:
- json-buffer "3.0.0"
+ json-buffer "3.0.1"
lazy-val@^1.0.4, lazy-val@^1.0.5:
version "1.0.5"
@@ -1172,16 +1173,11 @@ localforage@^1.10.0:
dependencies:
lie "3.1.1"
-lodash@^4.17.10, lodash@^4.17.15:
+lodash@^4.17.15:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
- integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
lowercase-keys@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -1218,11 +1214,16 @@ mime@^2.5.2:
resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-response@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+mimic-response@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+ integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
minimatch@3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1238,29 +1239,29 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
brace-expansion "^1.1.7"
minimatch@^5.0.1:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
- integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+ version "5.1.6"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
+ integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
dependencies:
brace-expansion "^2.0.1"
-minimist@^1.2.0:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
- integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-minimist@^1.2.6:
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
- integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+minimist@^1.2.0, minimist@^1.2.6:
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+ integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
minipass@^3.0.0:
- version "3.3.4"
- resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
- integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
+ version "3.3.6"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+ integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
dependencies:
yallist "^4.0.0"
+minipass@^4.0.0:
+ version "4.2.4"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06"
+ integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==
+
minizlib@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -1301,18 +1302,10 @@ node-addon-api@^1.6.3:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
-normalize-url@^4.1.0:
- version "4.5.1"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
- integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
-npm-conf@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
- integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
- dependencies:
- config-chain "^1.1.11"
- pify "^3.0.0"
+normalize-url@^6.0.1:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+ integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
object-keys@^1.1.1:
version "1.1.1"
@@ -1326,10 +1319,10 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
dependencies:
wrappy "1"
-p-cancelable@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
- integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+p-cancelable@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+ integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
path-exists@^4.0.0:
version "4.0.0"
@@ -1351,11 +1344,6 @@ pend@~1.2.0:
resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
-pify@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
- integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
plist@^3.0.1, plist@^3.0.4:
version "3.0.6"
resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
@@ -1364,21 +1352,11 @@ plist@^3.0.1, plist@^3.0.4:
base64-js "^1.5.1"
xmlbuilder "^15.1.1"
-prepend-http@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
- integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
-
progress@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-proto-list@~1.2.1:
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
- integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
-
pump@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -1388,9 +1366,9 @@ pump@^3.0.0:
once "^1.3.1"
punycode@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
- integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+ integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
pupa@^2.0.1:
version "2.1.1"
@@ -1399,6 +1377,11 @@ pupa@^2.0.1:
dependencies:
escape-goat "^2.0.0"
+quick-lru@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+ integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
read-config-file@6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade"
@@ -1415,12 +1398,17 @@ require-directory@^2.1.1:
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
-responselike@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
- integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
+resolve-alpn@^1.0.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+ integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
+responselike@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+ integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
dependencies:
- lowercase-keys "^1.0.0"
+ lowercase-keys "^2.0.0"
rimraf@^3.0.0:
version "3.0.2"
@@ -1500,9 +1488,9 @@ shebang-regex@^3.0.0:
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
simple-update-notifier@^1.0.7:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc"
- integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82"
+ integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
dependencies:
semver "~7.0.0"
@@ -1588,13 +1576,13 @@ supports-color@^7.1.0:
has-flag "^4.0.0"
tar@^6.1.11:
- version "6.1.12"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6"
- integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==
+ version "6.1.13"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
+ integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
- minipass "^3.0.0"
+ minipass "^4.0.0"
minizlib "^2.1.1"
mkdirp "^1.0.3"
yallist "^4.0.0"
@@ -1621,11 +1609,6 @@ tmp@^0.2.0:
dependencies:
rimraf "^3.0.0"
-to-readable-stream@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
- integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
truncate-utf8-bytes@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -1633,20 +1616,15 @@ truncate-utf8-bytes@^1.0.0:
dependencies:
utf8-byte-length "^1.0.1"
-tunnel@^0.0.6:
- version "0.0.6"
- resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
- integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
type-fest@^0.13.1:
version "0.13.1"
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-typescript@~4.8.3:
- version "4.8.4"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
- integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+typescript@~4.9.5:
+ version "4.9.5"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+ integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
typo-js@^1.2.1:
version "1.2.2"
@@ -1678,13 +1656,6 @@ uri-js@^4.2.2:
dependencies:
punycode "^2.1.0"
-url-parse-lax@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
- integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
- dependencies:
- prepend-http "^2.0.0"
-
utf8-byte-length@^1.0.1:
version "1.0.4"
resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
@@ -1735,15 +1706,15 @@ yallist@^4.0.0:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-yargs-parser@^21.0.0:
+yargs-parser@^21.1.1:
version "21.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
yargs@^17.5.1:
- version "17.6.1"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz#712508771045019cda059bc1ba3ae091aaa1402e"
- integrity sha512-leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg==
+ version "17.7.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
+ integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
dependencies:
cliui "^8.0.1"
escalade "^3.1.1"
@@ -1751,7 +1722,7 @@ yargs@^17.5.1:
require-directory "^2.1.1"
string-width "^4.2.3"
y18n "^5.0.5"
- yargs-parser "^21.0.0"
+ yargs-parser "^21.1.1"
yauzl@^2.10.0:
version "2.10.0"
diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix
index 71457edcd0..6642790712 100644
--- a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix
@@ -18,11 +18,11 @@
};
}
{
- name = "_electron_get___get_1.14.1.tgz";
+ name = "_electron_get___get_2.0.2.tgz";
path = fetchurl {
- name = "_electron_get___get_1.14.1.tgz";
- url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz";
- sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==";
+ name = "_electron_get___get_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz";
+ sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==";
};
}
{
@@ -50,19 +50,19 @@
};
}
{
- name = "_sindresorhus_is___is_0.14.0.tgz";
+ name = "_sindresorhus_is___is_4.6.0.tgz";
path = fetchurl {
- name = "_sindresorhus_is___is_0.14.0.tgz";
- url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz";
- sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
+ name = "_sindresorhus_is___is_4.6.0.tgz";
+ url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz";
+ sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==";
};
}
{
- name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
+ name = "_szmarczak_http_timer___http_timer_4.0.6.tgz";
path = fetchurl {
- name = "_szmarczak_http_timer___http_timer_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
- sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
+ name = "_szmarczak_http_timer___http_timer_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz";
+ sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==";
};
}
{
@@ -73,6 +73,14 @@
sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==";
};
}
+ {
+ name = "_types_cacheable_request___cacheable_request_6.0.3.tgz";
+ path = fetchurl {
+ name = "_types_cacheable_request___cacheable_request_6.0.3.tgz";
+ url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz";
+ sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==";
+ };
+ }
{
name = "_types_debug___debug_4.1.7.tgz";
path = fetchurl {
@@ -97,6 +105,22 @@
sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==";
};
}
+ {
+ name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz";
+ path = fetchurl {
+ name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz";
+ sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==";
+ };
+ }
+ {
+ name = "_types_keyv___keyv_3.1.4.tgz";
+ path = fetchurl {
+ name = "_types_keyv___keyv_3.1.4.tgz";
+ url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz";
+ sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==";
+ };
+ }
{
name = "_types_minimatch___minimatch_5.1.2.tgz";
path = fetchurl {
@@ -114,19 +138,19 @@
};
}
{
- name = "_types_node___node_18.11.9.tgz";
+ name = "_types_node___node_18.15.0.tgz";
path = fetchurl {
- name = "_types_node___node_18.11.9.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz";
- sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==";
+ name = "_types_node___node_18.15.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz";
+ sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==";
};
}
{
- name = "_types_node___node_16.18.3.tgz";
+ name = "_types_node___node_16.18.14.tgz";
path = fetchurl {
- name = "_types_node___node_16.18.3.tgz";
- url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz";
- sha512 = "jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==";
+ name = "_types_node___node_16.18.14.tgz";
+ url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.14.tgz";
+ sha512 = "wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw==";
};
}
{
@@ -137,6 +161,14 @@
sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==";
};
}
+ {
+ name = "_types_responselike___responselike_1.0.0.tgz";
+ path = fetchurl {
+ name = "_types_responselike___responselike_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz";
+ sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
+ };
+ }
{
name = "_types_verror___verror_1.10.6.tgz";
path = fetchurl {
@@ -154,11 +186,11 @@
};
}
{
- name = "_types_yargs___yargs_17.0.13.tgz";
+ name = "_types_yargs___yargs_17.0.22.tgz";
path = fetchurl {
- name = "_types_yargs___yargs_17.0.13.tgz";
- url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz";
- sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==";
+ name = "_types_yargs___yargs_17.0.22.tgz";
+ url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz";
+ sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g==";
};
}
{
@@ -418,11 +450,19 @@
};
}
{
- name = "cacheable_request___cacheable_request_6.1.0.tgz";
+ name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz";
path = fetchurl {
- name = "cacheable_request___cacheable_request_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz";
- sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
+ name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz";
+ url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
+ sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
+ };
+ }
+ {
+ name = "cacheable_request___cacheable_request_7.0.2.tgz";
+ path = fetchurl {
+ name = "cacheable_request___cacheable_request_7.0.2.tgz";
+ url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz";
+ sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==";
};
}
{
@@ -450,11 +490,11 @@
};
}
{
- name = "ci_info___ci_info_3.5.0.tgz";
+ name = "ci_info___ci_info_3.8.0.tgz";
path = fetchurl {
- name = "ci_info___ci_info_3.5.0.tgz";
- url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz";
- sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==";
+ name = "ci_info___ci_info_3.8.0.tgz";
+ url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz";
+ sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==";
};
}
{
@@ -545,14 +585,6 @@
sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
};
}
- {
- name = "config_chain___config_chain_1.1.13.tgz";
- path = fetchurl {
- name = "config_chain___config_chain_1.1.13.tgz";
- url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz";
- sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==";
- };
- }
{
name = "core_util_is___core_util_is_1.0.2.tgz";
path = fetchurl {
@@ -594,27 +626,27 @@
};
}
{
- name = "decompress_response___decompress_response_3.3.0.tgz";
+ name = "decompress_response___decompress_response_6.0.0.tgz";
path = fetchurl {
- name = "decompress_response___decompress_response_3.3.0.tgz";
- url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz";
- sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==";
+ name = "decompress_response___decompress_response_6.0.0.tgz";
+ url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz";
+ sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==";
};
}
{
- name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
+ name = "defer_to_connect___defer_to_connect_2.0.1.tgz";
path = fetchurl {
- name = "defer_to_connect___defer_to_connect_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
- sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
+ name = "defer_to_connect___defer_to_connect_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz";
+ sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==";
};
}
{
- name = "define_properties___define_properties_1.1.4.tgz";
+ name = "define_properties___define_properties_1.2.0.tgz";
path = fetchurl {
- name = "define_properties___define_properties_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz";
- sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==";
+ name = "define_properties___define_properties_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz";
+ sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==";
};
}
{
@@ -689,14 +721,6 @@
sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==";
};
}
- {
- name = "duplexer3___duplexer3_0.1.5.tgz";
- path = fetchurl {
- name = "duplexer3___duplexer3_0.1.5.tgz";
- url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz";
- sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==";
- };
- }
{
name = "ejs___ejs_3.1.8.tgz";
path = fetchurl {
@@ -714,19 +738,19 @@
};
}
{
- name = "electron_context_menu___electron_context_menu_3.6.0.tgz";
+ name = "electron_context_menu___electron_context_menu_3.6.1.tgz";
path = fetchurl {
- name = "electron_context_menu___electron_context_menu_3.6.0.tgz";
- url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz";
- sha512 = "7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw==";
+ name = "electron_context_menu___electron_context_menu_3.6.1.tgz";
+ url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz";
+ sha512 = "lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ==";
};
}
{
- name = "electron_dl___electron_dl_3.4.1.tgz";
+ name = "electron_dl___electron_dl_3.5.0.tgz";
path = fetchurl {
- name = "electron_dl___electron_dl_3.4.1.tgz";
- url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz";
- sha512 = "NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA==";
+ name = "electron_dl___electron_dl_3.5.0.tgz";
+ url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.5.0.tgz";
+ sha512 = "Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig==";
};
}
{
@@ -762,11 +786,11 @@
};
}
{
- name = "electron___electron_21.2.2.tgz";
+ name = "electron___electron_23.1.3.tgz";
path = fetchurl {
- name = "electron___electron_21.2.2.tgz";
- url = "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz";
- sha512 = "Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag==";
+ name = "electron___electron_23.1.3.tgz";
+ url = "https://registry.yarnpkg.com/electron/-/electron-23.1.3.tgz";
+ sha512 = "MNjuUS2K6/OxlJ0zTC77djo1R3xM038v1kUunvNFgDMZHYKpSOzOMNsPiwM2BGp+uZbkUb0nTnYafxXrM8H16w==";
};
}
{
@@ -777,14 +801,6 @@
sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
};
}
- {
- name = "encodeurl___encodeurl_1.0.2.tgz";
- path = fetchurl {
- name = "encodeurl___encodeurl_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz";
- sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==";
- };
- }
{
name = "end_of_stream___end_of_stream_1.4.4.tgz";
path = fetchurl {
@@ -962,19 +978,11 @@
};
}
{
- name = "get_intrinsic___get_intrinsic_1.1.3.tgz";
+ name = "get_intrinsic___get_intrinsic_1.2.0.tgz";
path = fetchurl {
- name = "get_intrinsic___get_intrinsic_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz";
- sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==";
- };
- }
- {
- name = "get_stream___get_stream_4.1.0.tgz";
- path = fetchurl {
- name = "get_stream___get_stream_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz";
- sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+ name = "get_intrinsic___get_intrinsic_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz";
+ sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==";
};
}
{
@@ -1001,14 +1009,6 @@
sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==";
};
}
- {
- name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
- path = fetchurl {
- name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz";
- url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz";
- sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==";
- };
- }
{
name = "globalthis___globalthis_1.0.3.tgz";
path = fetchurl {
@@ -1018,11 +1018,11 @@
};
}
{
- name = "got___got_9.6.0.tgz";
+ name = "got___got_11.8.6.tgz";
path = fetchurl {
- name = "got___got_9.6.0.tgz";
- url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz";
- sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
+ name = "got___got_11.8.6.tgz";
+ url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz";
+ sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==";
};
}
{
@@ -1082,11 +1082,11 @@
};
}
{
- name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
+ name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz";
path = fetchurl {
- name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
- sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
+ name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz";
+ url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz";
+ sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==";
};
}
{
@@ -1097,6 +1097,14 @@
sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==";
};
}
+ {
+ name = "http2_wrapper___http2_wrapper_1.0.3.tgz";
+ path = fetchurl {
+ name = "http2_wrapper___http2_wrapper_1.0.3.tgz";
+ url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz";
+ sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==";
+ };
+ }
{
name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz";
path = fetchurl {
@@ -1153,14 +1161,6 @@
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
};
}
- {
- name = "ini___ini_1.3.8.tgz";
- path = fetchurl {
- name = "ini___ini_1.3.8.tgz";
- url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz";
- sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
- };
- }
{
name = "is_ci___is_ci_3.0.1.tgz";
path = fetchurl {
@@ -1226,11 +1226,11 @@
};
}
{
- name = "json_buffer___json_buffer_3.0.0.tgz";
+ name = "json_buffer___json_buffer_3.0.1.tgz";
path = fetchurl {
- name = "json_buffer___json_buffer_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz";
- sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==";
+ name = "json_buffer___json_buffer_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz";
+ sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==";
};
}
{
@@ -1250,11 +1250,11 @@
};
}
{
- name = "json5___json5_2.2.1.tgz";
+ name = "json5___json5_2.2.3.tgz";
path = fetchurl {
- name = "json5___json5_2.2.1.tgz";
- url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz";
- sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==";
+ name = "json5___json5_2.2.3.tgz";
+ url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz";
+ sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
};
}
{
@@ -1274,11 +1274,11 @@
};
}
{
- name = "keyv___keyv_3.1.0.tgz";
+ name = "keyv___keyv_4.5.2.tgz";
path = fetchurl {
- name = "keyv___keyv_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz";
- sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
+ name = "keyv___keyv_4.5.2.tgz";
+ url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz";
+ sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==";
};
}
{
@@ -1313,14 +1313,6 @@
sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
};
}
- {
- name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
- path = fetchurl {
- name = "lowercase_keys___lowercase_keys_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
- sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
- };
- }
{
name = "lowercase_keys___lowercase_keys_2.0.0.tgz";
path = fetchurl {
@@ -1377,6 +1369,14 @@
sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
};
}
+ {
+ name = "mimic_response___mimic_response_3.1.0.tgz";
+ path = fetchurl {
+ name = "mimic_response___mimic_response_3.1.0.tgz";
+ url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz";
+ sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==";
+ };
+ }
{
name = "minimatch___minimatch_3.0.4.tgz";
path = fetchurl {
@@ -1394,35 +1394,35 @@
};
}
{
- name = "minimatch___minimatch_5.1.0.tgz";
+ name = "minimatch___minimatch_5.1.6.tgz";
path = fetchurl {
- name = "minimatch___minimatch_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz";
- sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==";
+ name = "minimatch___minimatch_5.1.6.tgz";
+ url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz";
+ sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==";
};
}
{
- name = "minimist___minimist_1.2.7.tgz";
+ name = "minimist___minimist_1.2.8.tgz";
path = fetchurl {
- name = "minimist___minimist_1.2.7.tgz";
- url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz";
- sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
+ name = "minimist___minimist_1.2.8.tgz";
+ url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz";
+ sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
};
}
{
- name = "minimist___minimist_1.2.6.tgz";
+ name = "minipass___minipass_3.3.6.tgz";
path = fetchurl {
- name = "minimist___minimist_1.2.6.tgz";
- url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz";
- sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==";
+ name = "minipass___minipass_3.3.6.tgz";
+ url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz";
+ sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==";
};
}
{
- name = "minipass___minipass_3.3.4.tgz";
+ name = "minipass___minipass_4.2.4.tgz";
path = fetchurl {
- name = "minipass___minipass_3.3.4.tgz";
- url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz";
- sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==";
+ name = "minipass___minipass_4.2.4.tgz";
+ url = "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz";
+ sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==";
};
}
{
@@ -1482,19 +1482,11 @@
};
}
{
- name = "normalize_url___normalize_url_4.5.1.tgz";
+ name = "normalize_url___normalize_url_6.1.0.tgz";
path = fetchurl {
- name = "normalize_url___normalize_url_4.5.1.tgz";
- url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz";
- sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==";
- };
- }
- {
- name = "npm_conf___npm_conf_1.1.3.tgz";
- path = fetchurl {
- name = "npm_conf___npm_conf_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz";
- sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
+ name = "normalize_url___normalize_url_6.1.0.tgz";
+ url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz";
+ sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==";
};
}
{
@@ -1514,11 +1506,11 @@
};
}
{
- name = "p_cancelable___p_cancelable_1.1.0.tgz";
+ name = "p_cancelable___p_cancelable_2.1.1.tgz";
path = fetchurl {
- name = "p_cancelable___p_cancelable_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz";
- sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
+ name = "p_cancelable___p_cancelable_2.1.1.tgz";
+ url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz";
+ sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==";
};
}
{
@@ -1553,14 +1545,6 @@
sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==";
};
}
- {
- name = "pify___pify_3.0.0.tgz";
- path = fetchurl {
- name = "pify___pify_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz";
- sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==";
- };
- }
{
name = "plist___plist_3.0.6.tgz";
path = fetchurl {
@@ -1569,14 +1553,6 @@
sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA==";
};
}
- {
- name = "prepend_http___prepend_http_2.0.0.tgz";
- path = fetchurl {
- name = "prepend_http___prepend_http_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz";
- sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==";
- };
- }
{
name = "progress___progress_2.0.3.tgz";
path = fetchurl {
@@ -1585,14 +1561,6 @@
sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
};
}
- {
- name = "proto_list___proto_list_1.2.4.tgz";
- path = fetchurl {
- name = "proto_list___proto_list_1.2.4.tgz";
- url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz";
- sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==";
- };
- }
{
name = "pump___pump_3.0.0.tgz";
path = fetchurl {
@@ -1602,11 +1570,11 @@
};
}
{
- name = "punycode___punycode_2.1.1.tgz";
+ name = "punycode___punycode_2.3.0.tgz";
path = fetchurl {
- name = "punycode___punycode_2.1.1.tgz";
- url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz";
- sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ name = "punycode___punycode_2.3.0.tgz";
+ url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz";
+ sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==";
};
}
{
@@ -1617,6 +1585,14 @@
sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
};
}
+ {
+ name = "quick_lru___quick_lru_5.1.1.tgz";
+ path = fetchurl {
+ name = "quick_lru___quick_lru_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz";
+ sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==";
+ };
+ }
{
name = "read_config_file___read_config_file_6.2.0.tgz";
path = fetchurl {
@@ -1634,11 +1610,19 @@
};
}
{
- name = "responselike___responselike_1.0.2.tgz";
+ name = "resolve_alpn___resolve_alpn_1.2.1.tgz";
path = fetchurl {
- name = "responselike___responselike_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz";
- sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==";
+ name = "resolve_alpn___resolve_alpn_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz";
+ sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==";
+ };
+ }
+ {
+ name = "responselike___responselike_2.0.1.tgz";
+ path = fetchurl {
+ name = "responselike___responselike_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz";
+ sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==";
};
}
{
@@ -1738,11 +1722,11 @@
};
}
{
- name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz";
+ name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz";
path = fetchurl {
- name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz";
- url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz";
- sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==";
+ name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz";
+ url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz";
+ sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==";
};
}
{
@@ -1842,11 +1826,11 @@
};
}
{
- name = "tar___tar_6.1.12.tgz";
+ name = "tar___tar_6.1.13.tgz";
path = fetchurl {
- name = "tar___tar_6.1.12.tgz";
- url = "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz";
- sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==";
+ name = "tar___tar_6.1.13.tgz";
+ url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz";
+ sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==";
};
}
{
@@ -1873,14 +1857,6 @@
sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==";
};
}
- {
- name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
- path = fetchurl {
- name = "to_readable_stream___to_readable_stream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
- sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
- };
- }
{
name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz";
path = fetchurl {
@@ -1889,14 +1865,6 @@
sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==";
};
}
- {
- name = "tunnel___tunnel_0.0.6.tgz";
- path = fetchurl {
- name = "tunnel___tunnel_0.0.6.tgz";
- url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz";
- sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==";
- };
- }
{
name = "type_fest___type_fest_0.13.1.tgz";
path = fetchurl {
@@ -1906,11 +1874,11 @@
};
}
{
- name = "typescript___typescript_4.8.4.tgz";
+ name = "typescript___typescript_4.9.5.tgz";
path = fetchurl {
- name = "typescript___typescript_4.8.4.tgz";
- url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz";
- sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==";
+ name = "typescript___typescript_4.9.5.tgz";
+ url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz";
+ sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==";
};
}
{
@@ -1953,14 +1921,6 @@
sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
};
}
- {
- name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
- path = fetchurl {
- name = "url_parse_lax___url_parse_lax_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
- sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==";
- };
- }
{
name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz";
path = fetchurl {
@@ -2034,11 +1994,11 @@
};
}
{
- name = "yargs___yargs_17.6.1.tgz";
+ name = "yargs___yargs_17.7.1.tgz";
path = fetchurl {
- name = "yargs___yargs_17.6.1.tgz";
- url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz";
- sha512 = "leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg==";
+ name = "yargs___yargs_17.7.1.tgz";
+ url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz";
+ sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==";
};
}
{
diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix
index e2a977cb54..1eab6d8086 100644
--- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix
@@ -17,13 +17,13 @@
}:
let
- version = "1.13.0";
+ version = "1.14.2";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
- hash = "sha256-aIJWEZD98tjfNDQjQfxRR1kOJ4P/fxZP8sw1dKy7apw=";
+ hash = "sha256-QpSp+8gsFApp4i4PajAQHHYZgwej/gusAw4J3Zetk4M=";
};
# Use specific package versions required by paperless-ngx
@@ -39,18 +39,6 @@ let
};
});
- # downgrade redis due to https://github.com/paperless-ngx/paperless-ngx/pull/1802
- # and https://github.com/django/channels_redis/issues/332
- channels-redis = super.channels-redis.overridePythonAttrs (oldAttrs: rec {
- version = "3.4.1";
- src = fetchFromGitHub {
- owner = "django";
- repo = "channels_redis";
- rev = version;
- hash = "sha256-ZQSsE3pkM+nfDhWutNuupcyC5MDikUu6zU4u7Im6bRQ=";
- };
- });
-
channels = super.channels.overridePythonAttrs (oldAttrs: rec {
version = "3.0.5";
pname = "channels";
@@ -74,6 +62,7 @@ let
hash = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI=";
};
});
+
};
};
@@ -93,7 +82,7 @@ let
pname = "paperless-ngx-frontend";
inherit version src;
- npmDepsHash = "sha256-es9x7KR5S7E8KjYWq8ie/EwlAy6zrDvySYQi1vy08Wc=";
+ npmDepsHash = "sha256-wUlybMxnXLNmeu2z+RFFOHVEhH12XD3ZfMo5K+HSBpY=";
nativeBuildInputs = [
python3
@@ -160,7 +149,10 @@ python.pkgs.buildPythonApplication rec {
django-compression-middleware
django-extensions
django-filter
+ django-guardian
+ django-ipware
django
+ djangorestframework-guardian2
djangorestframework
filelock
gunicorn
@@ -237,6 +229,7 @@ python.pkgs.buildPythonApplication rec {
whoosh
zipp
zope_interface
+ zxing_cpp
]
++ redis.optional-dependencies.hiredis
++ twisted.optional-dependencies.tls
diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
index 54d28ba0d6..fa87d669d1 100644
--- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix
@@ -27,11 +27,11 @@ let
in
stdenv.mkDerivation rec {
pname = "PortfolioPerformance";
- version = "0.61.4";
+ version = "0.62.0";
src = fetchurl {
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
- hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c=";
+ hash = "sha256-V3CHp0r+3Vya9lcuCfHeVQqmy9rxlN9cs5ZShoJ9XTA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix
index fbfe11a2c9..e90184b522 100644
--- a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix
@@ -26,6 +26,18 @@ python3Packages.buildPythonPackage rec {
wrapQtApp "$out"/bin/qnotero
'';
+ postInstall = ''
+ mkdir $out/share
+ mv $out/usr/share/applications $out/share/applications
+
+ substituteInPlace $out/share/applications/qnotero.desktop \
+ --replace "Icon=/usr/share/qnotero/resources/light/qnotero.png" "Icon=qnotero"
+
+ mkdir -p $out/share/icons/hicolor/64x64/apps
+ ln -s $out/usr/share/qnotero/resources/light/qnotero.png \
+ $out/share/icons/hicolor/64x64/apps/qnotero.png
+ '';
+
# no tests executed
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
index bc15b2ef29..e00af4d56f 100644
--- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix
@@ -17,14 +17,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
- version = "23.4.0";
+ version = "23.4.6";
in
stdenv.mkDerivation {
inherit pname appname version;
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
- sha256 = "sha256-8gSy7WL0wpLAXxVo3oOA9X12qd/R7P3MgmlwXxpJSUs=";
+ sha256 = "sha256-lfQkY/B+mv+hUeAfmZkZ2BHq7MjR0MUVNPjk5QCGisE=";
};
nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
changelog = "https://www.qownnotes.org/changelog.html";
downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ totoroot ];
+ maintainers = with maintainers; [ pbek totoroot ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
index 869b72fb8f..c16c757836 100644
--- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "super-productivity";
- version = "7.13.1";
+ version = "7.13.2";
src = fetchurl {
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
- sha256 = "sha256-ZZnyPdwzIX0WNywcD2uYxaDG/cbgU8nyiwe0r3YIrs0=";
+ sha256 = "sha256-HwRJUrNaoAnNuIcDWgXOYA+PxLjOE6NXRJqINIbVxOw=";
name = "${pname}-${version}.AppImage";
};
diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
index a2a967bf31..dd7290636a 100644
--- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
- version = "unstable-2023-04-04";
+ version = "unstable-2023-04-17";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
- rev = "a7d0065763c0bf0cfc2b410b17cb1fce33619616";
- sha256 = "wDAheXzObiqFkZ2ZVQAzMVZT5mzIEzxh6jNwPiPoWis=";
+ rev = "49b7592b6b59412d14884d19d9911d59b13f8c9f";
+ sha256 = "PS/g/ZdeCz/BHud6WtMkzvVQi+TBqEZLZaw05xRTmrQ=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix
index 97f8586894..c376d41514 100644
--- a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix
@@ -6,13 +6,13 @@
let
pname = "trilium-desktop";
- version = "0.59.2";
+ version = "0.59.4";
linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- linuxSource.sha256 = "1mnggfb16vi02dikhnsc3nbdrb0m25f9lch4d1r65lr6svw7sxjp";
+ linuxSource.sha256 = "0vv58bcwx62slrc6f7ra61m71nqh6pb2rg4h99f8krj2h56zhrij";
darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip";
- darwinSource.sha256 = "0j07yxfgvqn76bfpbqlvabdkbfrhp5g4f58w9gf6g1n9ky7w7dzj";
+ darwinSource.sha256 = "18jdz32i0blh3hrdyh558fmqncjrnv1j1g3hwjcph8hi90pqycdr";
meta = metaCommon // {
mainProgram = "trilium";
diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/server.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/server.nix
index bb785c4ef4..6db1f4e036 100644
--- a/third_party/nixpkgs/pkgs/applications/office/trilium/server.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/trilium/server.nix
@@ -3,8 +3,8 @@
let
serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- serverSource.sha256 = "1i7rrzj40ixi4l4hhxdn9n0b8zmm40ycprhaklh9kk39v38rai3y";
- version = "0.59.2";
+ serverSource.sha256 = "1ys9vnxrxhy52accqxkmvf63kqwaf3ba6ysk3a8wfn2rwxa766g8";
+ version = "0.59.4";
in stdenv.mkDerivation rec {
pname = "trilium-server";
inherit version;
diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix
index 2c18ce6b00..3abf9f16b0 100644
--- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix
@@ -41,12 +41,12 @@
stdenv.mkDerivation rec {
pname = "zotero";
- version = "6.0.23";
+ version = "6.0.26";
src = fetchurl {
url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- hash = "sha256-DPuUSEhZM6gRO82eXalf1ucDBQh2KvTBwOPjR5DEsqM=";
+ hash = "sha256-Btrzv9trUFjCrQ+OEc7MUOzq7x3XW7jtgUJMitmPK0A=";
};
nativeBuildInputs = [ wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix
index 255b3828f7..97076070ae 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/default.nix
@@ -57,26 +57,10 @@ let
inherit mkDerivation;
};
in {
- alligator = callPackage ./alligator.nix {};
- angelfish = callPackage ./angelfish.nix { inherit srcs; };
- audiotube = callPackage ./audiotube.nix {};
- calindori = callPackage ./calindori.nix {};
- kalk = callPackage ./kalk.nix {};
- kasts = callPackage ./kasts.nix {};
- kclock = callPackage ./kclock.nix {};
- keysmith = callPackage ./keysmith.nix {};
- koko = callPackage ./koko.nix {};
- krecorder = callPackage ./krecorder.nix {};
- ktrip = callPackage ./ktrip.nix {};
- kweather = callPackage ./kweather.nix {};
- neochat = callPackage ./neochat.nix { inherit srcs; };
plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {};
plasma-settings = callPackage ./plasma-settings.nix {};
- plasmatube = callPackage ./plasmatube {};
- qmlkonsole = callPackage ./qmlkonsole.nix {};
spacebar = callPackage ./spacebar.nix {};
- tokodon = callPackage ./tokodon.nix {};
};
in lib.makeScope libsForQt5.newScope packages
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
deleted file mode 100644
index 704b92b2b0..0000000000
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7a9405ed02b0d86839644a2c237ca7ca8b891b76 Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel
-Date: Wed, 30 Nov 2022 21:07:56 -0500
-Subject: [PATCH] Add placeholders for runtime dependencies
-
----
- src/videomodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/videomodel.cpp b/src/videomodel.cpp
-index 4bb3451..b558f31 100644
---- a/src/videomodel.cpp
-+++ b/src/videomodel.cpp
-@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl()
- return {};
- }
-
-- QString youtubeDl = QStringLiteral("yt-dlp");
-+ QString youtubeDl = QStringLiteral("@yt-dlp@");
- QStringList arguments;
- arguments << QLatin1String("--dump-json")
- << m_videoId;
---
-2.38.0
-
diff --git a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix
index 52d3c56617..11011293ff 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/chirp/default.nix
@@ -1,7 +1,10 @@
{ lib
, fetchFromGitHub
+, glib
+, gsettings-desktop-schemas
, python3
, unstableGitUpdater
+, wrapGAppsHook
}:
python3.pkgs.buildPythonApplication rec {
@@ -14,7 +17,13 @@ python3.pkgs.buildPythonApplication rec {
rev = "33402b7c545c5a92b7042369867e7eb75ef32a59";
hash = "sha256-duSEpd2GBBskoKNFos5X9wFtsjRct1918VhZd1T2rvU=";
};
-
+ buildInputs = [
+ glib
+ gsettings-desktop-schemas
+ ];
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
propagatedBuildInputs = with python3.pkgs; [
future
pyserial
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
index 725f531dd0..c1d3950bed 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gnss-sdr/default.nix
@@ -60,13 +60,10 @@ gnuradio.pkgs.mkDerivation rec {
pugixml
protobuf
gnuradio.unwrapped.boost
+ gnuradio.unwrapped.logLib
] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [
gnuradio.unwrapped.uhd
- ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [
- gnuradio.unwrapped.spdlog
- ] else [
- gnuradio.unwrapped.log4cpp
- ]) ++ lib.optionals (enableRawUdp) [
+ ] ++ lib.optionals (enableRawUdp) [
libpcap
] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
thrift
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
index 1c53482143..e10d3df374 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
@@ -225,7 +225,7 @@ let
inherit (shared) hasFeature; # function
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit pname;
inherit (shared)
version
@@ -253,8 +253,10 @@ stdenv.mkDerivation rec {
inherit
boost
volk
- log4cpp
;
+ # Used by many gnuradio modules, the same attribute is present in
+ # gnuradio3.10 where there it's spdlog.
+ logLib = log4cpp;
} // lib.optionalAttrs (hasFeature "gr-uhd") {
inherit uhd;
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix
index 170aa554e9..a393cd5528 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, cmake
# Remove gcc and python references
, removeReferencesTo
@@ -141,6 +140,9 @@ let
};
gr-blocks = {
cmakeEnableFlag = "GR_BLOCKS";
+ runtime = [
+ libsndfile
+ ];
};
gr-fec = {
cmakeEnableFlag = "GR_FEC";
@@ -259,7 +261,7 @@ let
inherit (shared) hasFeature; # function
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit pname;
inherit (shared)
version
@@ -283,8 +285,10 @@ stdenv.mkDerivation rec {
inherit
boost
volk
- log4cpp
;
+ # Used by many gnuradio modules, the same attribute is present in
+ # gnuradio3.10 where there it's spdlog.
+ logLib = log4cpp;
} // lib.optionalAttrs (hasFeature "gr-uhd") {
inherit uhd;
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix
index 4a98fc0ddf..ca0f7fb97e 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, cmake
# Remove gcc and python references
, removeReferencesTo
@@ -143,6 +142,10 @@ let
};
gr-blocks = {
cmakeEnableFlag = "GR_BLOCKS";
+ runtime = [
+ # Required to compile wavfile blocks.
+ libsndfile
+ ];
};
gr-fec = {
cmakeEnableFlag = "GR_FEC";
@@ -278,7 +281,7 @@ let
inherit (shared) hasFeature; # function
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
inherit pname;
inherit (shared)
version
@@ -302,8 +305,10 @@ stdenv.mkDerivation rec {
inherit
boost
volk
- spdlog
;
+ # Used by many gnuradio modules, the same attribute is present in
+ # previous gnuradio versions where there it's log4cpp.
+ logLib = spdlog;
} // lib.optionalAttrs (hasFeature "gr-uhd") {
inherit uhd;
} // lib.optionalAttrs (hasFeature "gr-pdu") {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
index 2ccc2c7377..e6bcffda26 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix
@@ -5,7 +5,7 @@
, qtbase
, qtsvg
, qtwayland
-, gnuradio3_8Minimal
+, gnuradioMinimal
, thrift
, mpir
, fftwFloat
@@ -25,15 +25,15 @@ assert portaudioSupport -> portaudio != null;
# audio backends are mutually exclusive
assert !(pulseaudioSupport && portaudioSupport);
-gnuradio3_8Minimal.pkgs.mkDerivation rec {
+gnuradioMinimal.pkgs.mkDerivation rec {
pname = "gqrx";
- version = "2.15.9";
+ version = "2.15.10";
src = fetchFromGitHub {
owner = "gqrx-sdr";
repo = "gqrx";
rev = "v${version}";
- hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg=";
+ hash = "sha256-oynon3bInIBZxGo2PjNY6jMGzJp82mqM2Yo9wI8fOjA=";
};
nativeBuildInputs = [
@@ -43,21 +43,21 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
wrapGAppsHook
];
buildInputs = [
- gnuradio3_8Minimal.unwrapped.log4cpp
+ gnuradioMinimal.unwrapped.logLib
mpir
fftwFloat
alsa-lib
libjack2
- gnuradio3_8Minimal.unwrapped.boost
+ gnuradioMinimal.unwrapped.boost
qtbase
qtsvg
qtwayland
- gnuradio3_8Minimal.pkgs.osmosdr
+ gnuradioMinimal.pkgs.osmosdr
rtl-sdr
hackrf
- ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [
+ ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [
thrift
- gnuradio3_8Minimal.unwrapped.python.pkgs.thrift
+ gnuradioMinimal.unwrapped.python.pkgs.thrift
] ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
++ lib.optionals portaudioSupport [ portaudio ];
diff --git a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix
index 02542e5031..1bfb4c74f6 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix
@@ -49,7 +49,7 @@ gnuradio3_8.pkgs.mkDerivation rec {
buildInputs = [
gnuradio3_8.unwrapped.boost
codec2
- gnuradio3_8.unwrapped.log4cpp
+ gnuradio3_8.unwrapped.logLib
gmp
libpulseaudio
libconfig
diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
index 82627dbb61..52cdc4ccd2 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix
@@ -23,7 +23,6 @@
, limesuite
, libbladeRF
, mbelib
-, mkDerivation
, ninja
, ocl-icd
, opencv3
@@ -45,21 +44,22 @@
, sgp4
, soapysdr-with-plugins
, uhd
+, wrapQtAppsHook
, zlib
}:
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "sdrangel";
- version = "7.11.0";
+ version = "7.13.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
- hash = "sha256-zWux84a1MCK0XJXRXcaLHieJ47d4n/wO/xdwTYuuGJw=";
+ hash = "sha256-xG41FNlMfqH5MaGVFFENP0UFEkZYiWhtpNSPh2s4Irk=";
};
- nativeBuildInputs = [ cmake ninja pkg-config ];
+ nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
buildInputs = [
airspy
@@ -106,12 +106,10 @@ mkDerivation rec {
cmakeFlags = [
"-DAPT_DIR=${aptdec}"
- "-DDAB_INCLUDE_DIR:PATH=${dab_lib}/include/dab_lib"
- "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
- "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
- "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite${stdenv.hostPlatform.extensions.sharedLibrary}"
+ "-DDAB_DIR=${dab_lib}"
"-DSGP4_DIR=${sgp4}"
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
+ "-Wno-dev"
];
LD_LIBRARY_PATH = "${ocl-icd}/lib";
diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix
index 59a1e0f59a..e11e2af401 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix
@@ -6,6 +6,7 @@
, ncurses, swig2
, extraPackages ? []
, testers
+, buildPackages
}:
let
@@ -51,7 +52,7 @@ in stdenv.mkDerivation (finalAttrs: {
postFixup = lib.optionalString (lib.length extraPackages != 0) ''
# Join all plugins via symlinking
for i in ${toString extraPackages}; do
- ${lndir}/bin/lndir -silent $i $out
+ ${buildPackages.xorg.lndir}/bin/lndir -silent $i $out
done
# Needed for at least the remote plugin server
for file in $out/bin/*; do
diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
index b810af6e2e..873c49dd9a 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
@@ -11,9 +11,9 @@
# requires numpy
, enablePythonApi ? false
, python3
+, buildPackages
, enableExamples ? false
, enableUtils ? false
-, enableSim ? false
, libusb1
, enableDpdk ? false
, dpdk
@@ -34,6 +34,11 @@
let
onOffBool = b: if b then "ON" else "OFF";
inherit (lib) optionals;
+ # Later used in pythonEnv generation. Python + mako are always required for the build itself but not necessary for runtime.
+ pythonEnvArg = (ps: with ps; [ mako ]
+ ++ optionals (enablePythonApi) [ numpy setuptools ]
+ ++ optionals (enableUtils) [ requests six ]
+ );
in
stdenv.mkDerivation rec {
@@ -84,21 +89,14 @@ stdenv.mkDerivation rec {
++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]
;
- # Python + mako are always required for the build itself but not necessary for runtime.
- pythonEnv = python3.withPackages (ps: with ps; [ mako ]
- ++ optionals (enablePythonApi) [ numpy setuptools ]
- ++ optionals (enableUtils) [ requests six ]
- );
+ pythonEnv = python3.withPackages pythonEnvArg;
nativeBuildInputs = [
cmake
pkg-config
- ]
- # If both enableLibuhd_Python_api and enableUtils are off, we don't need
- # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime
- # dependency
- ++ optionals (!enablePythonApi && !enableUtils) [ pythonEnv ]
- ;
+ # Present both here and in buildInputs for cross compilation.
+ (buildPackages.python3.withPackages pythonEnvArg)
+ ];
buildInputs = [
boost
libusb1
@@ -121,8 +119,6 @@ stdenv.mkDerivation rec {
patches = [
# Disable tests that fail in the sandbox
./no-adapter-tests.patch
- ] ++ lib.optionals stdenv.isAarch32 [
- ./neon.patch
];
postPhases = [ "installFirmware" "removeInstalledTests" ]
diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/neon.patch b/third_party/nixpkgs/pkgs/applications/radio/uhd/neon.patch
deleted file mode 100644
index 18ec59c1d6..0000000000
--- a/third_party/nixpkgs/pkgs/applications/radio/uhd/neon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: When building for armhf, enable NEON
- NEON is part of the armhf baseline, so this will always be enabled on
- armhf.
-Author: Paul Tagliamonte
-Bug-Debian: https://bugs.debian.org/873608
-Origin: vendor
-Last-Update: 2017-08-29
-
---- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt
-+++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt
-@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V
- ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S
- )
-+
-+ SET ( CMAKE_CXX_FLAGS "-mfpu=neon" )
- ENDIF()
-
- ########################################################################
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
index 3f21987661..7f97959614 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "celestia";
- version = "1.6.2.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "CelestiaProject";
repo = "Celestia";
rev = version;
- sha256 = "1s9fgxh6i3x1sy75y5wcidi2mjrf5xj71dd4n6rg0hkps441sgsp";
+ sha256 = "sha256-iBlrP9Yr/l3tzR1PpRf8C87WfrL6mZDwDtWyd2yJ7Dc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
index 3769948fd3..c4721c490c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix
@@ -14,11 +14,11 @@
mkDerivation rec {
pname = "kstars";
- version = "3.6.3";
+ version = "3.6.4";
src = fetchurl {
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
- sha256 = "sha256-sve9q4iM/Y8+K64Ceby/KGx5Un5G0o5cCnIxJkXTgug=";
+ sha256 = "sha256-9MJqJVgSZVBzlLv08Z6i8yO4YV1exsD5+yLJjqIGD20=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
index c3880b0b1d..2b8d292ead 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
hash = "sha256-7jzS3pRklPsCTgCr3nrywfHCNlBDHuyuGGvrVoI9+A0=";
};
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace CMakeLists.txt \
+ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
+ 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
+ substituteInPlace src/CMakeLists.txt \
+ --replace "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
+ '';
+
nativeBuildInputs = [
cmake
perl
@@ -44,22 +52,28 @@ stdenv.mkDerivation rec {
qtmultimedia
qtserialport
qttranslations
- qtwayland
qtwebengine
calcmysky
qxlsx
indilib
libnova
+ ] ++ lib.optionals stdenv.isLinux [
+ qtwayland
];
preConfigure = lib.optionalString stdenv.isDarwin ''
- substituteInPlace CMakeLists.txt \
- --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
- 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
+ export LC_ALL=en_US.UTF-8
'';
+ # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
+ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib";
+
dontWrapGApps = true;
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium
+ '';
+
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
index bde774c622..d455e98264 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
@@ -18,7 +18,20 @@ stdenv.mkDerivation rec {
# We use nixpkgs versions of these libraries
rm -r third-party
sed -i '/^LIBS/d' system.mk/*
- sed -i 's|^LIBRARIES.*$|LIBRARIES = -lbz2 -lz -ljansson|' */*/*/*/Makefile
+ sed -i 's|^LIBRARIES.*$|LIBRARIES = -lbz2 -lz -ljansson|' */*/*/*/Makefile*
+
+ # `make support` installs above libraries
+ substituteInPlace system.mk/* \
+ --replace ": support" ":"
+
+ # Variable name is different in this makefile
+ substituteInPlace applications/bed/sort-bed/src/Makefile.darwin \
+ --replace "DIST_DIR" "BINDIR"
+
+ # `mkdir -p $BINDIR` is missing
+ substituteInPlace applications/bed/sort-bed/src/Makefile.darwin \
+ --replace 'mkdir -p ''${OBJ_DIR}' 'mkdir -p ''${OBJ_DIR} ''${BINDIR}'
+
substituteInPlace applications/bed/starch/src/Makefile --replace '$(LIBRARIES)' ""
# Function name is different in nixpkgs provided libraries
@@ -27,7 +40,7 @@ stdenv.mkDerivation rec {
done
# Don't force static
- for f in */*/*/*/Makefile ; do
+ for f in */*/*/*/Makefile* ; do
substituteInPlace $f --replace '-static' ""
done
'';
@@ -46,6 +59,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ jbedo ];
platforms = platforms.x86_64;
- broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
index aac36d2af3..92cb420139 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bedtools";
- version = "2.30.0";
+ version = "2.31.0";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
- sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
+ sha256 = "sha256-LBD3z0+zGbQJ67oyPRFPgbiMY9EP17vSk1EKz3DrkEc=";
};
strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix
index 03e61bdcbe..daae9c0961 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/bin.nix
@@ -35,7 +35,7 @@ in
stdenv.mkDerivation {
inherit pname version src;
- nativeBuildInputs = lib.optional stdenv.isLinux [ autoPatchelfHook ];
+ nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix
index 762b0515e8..59da360d1b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix
@@ -1,19 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, boost, cmake, libcifpp, zlib, }:
+{ lib, stdenv, fetchFromGitHub, cmake, libcifpp, libmcfp, zlib }:
+let
+ libcifpp' = libcifpp.overrideAttrs (oldAttrs: rec {
+ # dssp 4.2.2.1 requires specific version "5.0.8" of libcifpp
+ version = "5.0.8";
+ src = fetchFromGitHub {
+ inherit (oldAttrs.src) owner repo;
+ rev = "v${version}";
+ sha256 = "sha256-KJGcopGhCWSl+ElG3BPJjBf/kvYJowOHxto6Ci1IMco=";
+ };
+ });
+in
stdenv.mkDerivation rec {
pname = "dssp";
- version = "4.0.5";
+ version = "4.2.2.1";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = pname;
rev = "v${version}";
- sha256 = "1x35rdcm4fch66pjbmy73lv0gdb6g9y3v023a66512a6nzsqjsir";
+ sha256 = "sha256-vmGvC5d8LTo+pcY9sxwj0d6JvH8Lyk+QSOZo5raBci4=";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost libcifpp zlib ];
+ buildInputs = [ libcifpp' libmcfp zlib ];
meta = with lib; {
description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/hh-suite/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/hh-suite/default.nix
new file mode 100644
index 0000000000..2e01ace7d0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/hh-suite/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, xxd
+, enableMpi ? false
+, mpi
+, openmp
+}:
+stdenv.mkDerivation rec {
+ pname = "hh-suite";
+ version = "3.3.0";
+
+ src = fetchFromGitHub {
+ owner = "soedinglab";
+ repo = "hh-suite";
+ rev = "v${version}";
+ hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
+ };
+
+ nativeBuildInputs = [ cmake xxd ];
+ cmakeFlags = lib.optional stdenv.hostPlatform.isx86 "-DHAVE_SSE2=1"
+ ++ lib.optional stdenv.hostPlatform.isAarch "-DHAVE_ARM8=1"
+ ++ lib.optional stdenv.hostPlatform.avx2Support "-DHAVE_AVX2=1"
+ ++ lib.optional stdenv.hostPlatform.sse4_1Support "-DHAVE_SSE4_1=1";
+
+ buildInputs = lib.optional stdenv.cc.isClang openmp
+ ++ lib.optional enableMpi mpi;
+
+ meta = with lib; {
+ description = "Remote protein homology detection suite";
+ homepage = "https://github.com/soedinglab/hh-suite";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ natsukium ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix
index 12bbfa09c2..a41cdfc5de 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/kent/default.nix
@@ -13,26 +13,32 @@
}:
stdenv.mkDerivation rec {
pname = "kent";
- version = "404";
+ version = "446";
src = fetchFromGitHub {
owner = "ucscGenomeBrowser";
repo = pname;
rev = "v${version}_base";
- sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx";
+ hash = "sha256-d8gcoyMwINdHoD6xaNKt4rCKrKir99+i4KIzJ2YnxRw=";
};
buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ];
patchPhase = ''
+ runHook prePatch
+
substituteInPlace ./src/checkUmask.sh \
--replace "/bin/bash" "${bash}/bin/bash"
substituteInPlace ./src/hg/sqlEnvTest.sh \
--replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config"
+
+ runHook postPatch
'';
buildPhase = ''
+ runHook preBuild
+
export MACHTYPE=$(uname -m)
export CFLAGS="-fPIC"
export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g')
@@ -56,18 +62,26 @@ stdenv.mkDerivation rec {
cd ../utils
make
+
+ runHook postBuild
'';
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/bin
mkdir -p $out/lib
cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib
cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib
cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin
+
+ runHook postInstall
'';
meta = with lib; {
description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities";
+ homepage = "http://genome.ucsc.edu";
+ changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base";
license = licenses.unfree;
maintainers = with maintainers; [ scalavision ];
platforms = platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix
index 6b317b43de..e9acd1c88b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mafft";
- version = "7.515";
+ version = "7.520";
src = fetchFromGitLab {
owner = "sysimm";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ssZvjOHJLsBjB48sKr1U7VrRZUIduFkme22MdVbzoNk=";
+ sha256 = "sha256-H+EcKahJWwidAx+IUT4uCZEty+S8hUeMSB8VbTu5SmQ=";
};
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix
index c72dd1b190..5e18d5ead5 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix
@@ -2,22 +2,13 @@
stdenv.mkDerivation rec {
pname = "samtools";
- version = "1.13";
+ version = "1.17";
src = fetchurl {
url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA=";
+ sha256 = "sha256-Ot85C2KCGf1kCPFGAqTEqpDmPhizldrXIqtRlDiipyk";
};
- patches = [
- # Pull upstream patch for ncurses-6.3 support
- (fetchpatch {
- name = "ncurses-6.3.patch";
- url = "https://github.com/samtools/samtools/commit/396ef20eb0854d6b223c3223b60bb7efe42301f7.patch";
- sha256 = "sha256-p0l9ymXK9nqL2w8EytbW+qeaI7dD86IQgIVxacBj838=";
- })
- ];
-
# tests require `bgzip` from the htslib package
nativeCheckInputs = [ htslib ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix
index d083e202a9..45f0a1d7f4 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/subread/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "subread";
- version = "2.0.4";
+ version = "2.0.5";
src = fetchurl {
url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz";
- sha256 = "sha256-xUs37YOzQxjY8Rm1wC+50KZcgRGVvMnhdF322vdMots=";
+ sha256 = "sha256-frZzd+IV4IxfPK44PWOgV9yPRPoUB3smPbxoDchbaSc=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix
index 53daffbe06..5f197bd7f7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/tandem-aligner/default.nix
@@ -6,14 +6,14 @@
, zlib
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "TandemAligner";
- version = "unstable-2022-09-17";
+ version = "0.1";
src = fetchFromGitHub {
owner = "seryrzu";
repo = "tandem_aligner";
- rev = "ac6004f108ad20477045f4d0b037d96051a9df70";
+ rev = "v${finalAttrs.version}";
hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8=";
};
@@ -58,9 +58,10 @@ stdenv.mkDerivation {
meta = {
description = "A parameter-free algorithm for sequence alignment";
homepage = "https://github.com/seryrzu/tandem_aligner";
+ changelog = "https://github.com/seryrzu/tandem_aligner/releases/tag/v${finalAttrs.version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ amesgen ];
platforms = lib.platforms.linux;
mainProgram = "tandem_aligner";
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix
index 412642f523..cf64070d78 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix
@@ -1,47 +1,76 @@
{ lib
, fetchFromGitHub
, python3Packages
+, runtimeShell
+, bcftools
+, htslib
}:
-python3Packages.buildPythonApplication rec {
+let
+ ssshtest = fetchFromGitHub {
+ owner = "ryanlayer";
+ repo = "ssshtest";
+ rev = "d21f7f928a167fca6e2eb31616673444d15e6fd0";
+ hash = "sha256-zecZHEnfhDtT44VMbHLHOhRtNsIMWeaBASupVXtmrks=";
+ };
+in python3Packages.buildPythonApplication rec {
pname = "truvari";
- version = "2.1.1";
+ version = "4.0.0";
src = fetchFromGitHub {
- owner = "spiralgenetics";
+ owner = "ACEnglish";
repo = "truvari";
rev = "v${version}";
- sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h";
+ hash = "sha256-UJNMKEV5m2jFqnWvkVAtymkcE2TjPIXp7JqRZpMSqsE=";
};
postPatch = ''
substituteInPlace setup.py \
- --replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1'
+ --replace "rich==" "rich>="
+ substituteInPlace truvari/utils.py \
+ --replace "/bin/bash" "${runtimeShell}"
+ patchShebangs repo_utils/test_files
'';
propagatedBuildInputs = with python3Packages; [
- pyvcf
- levenshtein
- progressbar2
+ rich
+ edlib
pysam
- pyfaidx
intervaltree
- pytabix
- acebinf
- bwapy
joblib
+ numpy
+ pytabix
+ bwapy
pandas
];
- # no tests
- doCheck = false;
+ makeWrapperArgs = [
+ "--prefix" "PATH" ":" (lib.makeBinPath [ bcftools htslib ])
+ ];
+
pythonImportsCheck = [ "truvari" ];
+ nativeCheckInputs = [
+ bcftools
+ htslib
+ ] ++ (with python3Packages; [
+ coverage
+ ]);
+
+ checkPhase = ''
+ runHook preCheck
+
+ ln -s ${ssshtest}/ssshtest .
+ bash repo_utils/truvari_ssshtests.sh
+
+ runHook postCheck
+ '';
+
meta = with lib; {
description = "Structural variant comparison tool for VCFs";
- homepage = "https://github.com/spiralgenetics/truvari";
+ homepage = "https://github.com/ACEnglish/truvari";
license = licenses.mit;
- maintainers = with maintainers; [ scalavision ];
+ maintainers = with maintainers; [ natsukium scalavision ];
longDescription = ''
Truvari is a benchmarking tool for comparison sets of SVs.
It can calculate the recall, precision, and f-measure of a
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
index 98f7ccbfee..5ad4ce884c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "16.1.3";
+ version = "16.1.9";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "sha256-k1F4OaER9vg8GIi4eqppeh2f0MtlcBSfd4zkewFp2As=";
+ hash = "sha256-QGduoUKWNUjNlMEYO0wD5+igjuF03V5SVlgq44d2HDs=";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
index cc145baef0..4fb077e498 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix
@@ -12,13 +12,13 @@ assert (blas.isILP64 == arpack.isILP64);
stdenv.mkDerivation rec {
pname = "octopus";
- version = "12.1";
+ version = "12.2";
src = fetchFromGitLab {
owner = "octopus-code";
repo = "octopus";
rev = version;
- sha256 = "sha256-dQdb4wGKOQefrgtQVorq6EH9IiAh1tMmj3GiZOXgTBY=";
+ sha256 = "sha256-tM3D0geOT+8X3EofI+iPR48z8LKFSxQMoO/W/be+OFg=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix
index 1cd23d0f41..6a024748da 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/bitscope/common.nix
@@ -1,5 +1,5 @@
{ atk
-, buildFHSUserEnv
+, buildFHSEnv
, cairo
, dpkg
, gdk-pixbuf
@@ -56,7 +56,7 @@ let
${(wrapBinary libs) attrs.toolName}
'';
});
-in buildFHSUserEnv {
+in buildFHSEnv {
name = "${attrs.toolName}-${attrs.version}";
runScript = "${pkg.outPath}/bin/${attrs.toolName}";
} // { inherit (pkg) meta name; }
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix
index 535871e4ed..94d2428399 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "dataexplorer";
- version = "3.7.4";
+ version = "3.7.6";
src = fetchurl {
url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz";
- sha256 = "sha256-bghI7Hun7ZKUVEj7T58K0oaclnhUGd4z+eIqZF3eXHQ=";
+ sha256 = "sha256-mwz4o1m2ldjyD4pbwMQxeaI8a8JXzis+s0I+6GW8WaY=";
};
nativeBuildInputs = [ ant makeWrapper ];
@@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
--set SWT_GTK3 0 \
--set LIBOVERLAY_SCROLLBAR 0
- install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_DUO_UDEV_RULE/50-Junsi-iCharger-DUO.rules \
- $out/etc/udev/rules.d/50-Junsi-iCharger-DUO.rules
+ install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_USB_UDEV_RULE/50-Junsi-iCharger-USB.rules \
+ $out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules
install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \
$out/etc/udev/rules.d/50-SkyRC-Charger.rules
'';
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix
index f83cfa1bf0..0c45184e31 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,13 +1,12 @@
-{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gerbv";
- version = "2015-10-08";
+ version = "2.7.0";
- src = fetchgit {
- url = "git://git.geda-project.org/gerbv.git";
- rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659";
- sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
+ src = fetchurl {
+ url = "mirror://sourceforge/gerbv/${pname}-${version}.tar.gz";
+ sha256 = "sha256-xe6AjEIwzmvjrRCrY8VHCYOG1DAicE3iXduTeOYgU7Q=";
};
patches = [
@@ -21,15 +20,17 @@ stdenv.mkDerivation {
];
nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
- buildInputs = [ gettext libtool cairo gtk2 ];
+ buildInputs = [ gettext libtool cairo gtk2-x11 ];
configureFlags = ["--disable-update-desktop-database"];
+ env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
+
meta = with lib; {
description = "A Gerber (RS-274X) viewer";
homepage = "http://gerbv.geda-project.org/";
maintainers = with maintainers; [ mog ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.gpl2;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
index cc03a2e8c8..276c59aee7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.114";
+ version = "3.3.115";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
- sha256 = "sha256-zzpfyrs3qWckzeLkp0A73ye1HpFGzmenlNvkcBfPhKw=";
+ sha256 = "sha256-rbenwCsYygg1oGS2cvbNxR+HXEVLAYmnQ/LOi5HmSqU=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
index eb65b6881a..1b0bdc3ae4 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix
@@ -94,9 +94,6 @@ stdenv.mkDerivation rec {
# should be resolved in the next release
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
]
- ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346
- "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/"
- ]
++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
++ optionals (!withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=OFF"
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
index b102da24a3..2c81611888 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,45 +3,45 @@
{
"kicad" = {
kicadVersion = {
- version = "7.0.1";
+ version = "7.0.2";
src = {
- rev = "3b83917a115be1ce2f33a73039f59f8784b5c2e7";
- sha256 = "021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn";
+ rev = "6a45011f421d65a241e1df4a2dc720819922f343";
+ sha256 = "0san7pjgvd8niwrki722qb6y46r71rlyspqp43pmkiz55dmz52zx";
};
};
libVersion = {
- version = "7.0.1";
+ version = "7.0.2";
libSources = {
- symbols.rev = "adfe3c06b5750d81580ed44e669b578f49c205eb";
- symbols.sha256 = "14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30";
- templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200";
- templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv";
- footprints.rev = "1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3";
- footprints.sha256 = "0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy";
- packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33";
- packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
+ symbols.rev = "22ed11504c140fded542eeb104cdb02e0a65672e";
+ symbols.sha256 = "0aah92rb8yx00z0xwx9z7xn5rrw4cc3z35gr7c0bnb49hiak01jc";
+ templates.rev = "331068741c80fee8195646d3dee40f3b840495e7";
+ templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
+ footprints.rev = "e187e2dfa9bd04d91cad0d875049ab56780b6e32";
+ footprints.sha256 = "1qrdznfd4a6kzwd4aaijkpyjy0xnrmi66isq9z52652a8s6ja48v";
+ packages3d.rev = "6374ae3db8b43a4d779185b7017fcfe0e1f32590";
+ packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31";
};
};
};
"kicad-unstable" = {
kicadVersion = {
- version = "2023-03-29";
+ version = "2023-04-14";
src = {
- rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95";
- sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn";
+ rev = "4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5";
+ sha256 = "06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr";
};
};
libVersion = {
- version = "2023-03-29";
+ version = "2023-04-14";
libSources = {
- symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95";
- symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz";
+ symbols.rev = "38d4e7e1ab6a9b5d9eee85f687e60467753b2135";
+ symbols.sha256 = "0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc";
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
- footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c";
- footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc";
- packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33";
- packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v";
+ footprints.rev = "4da055a2d572ff87e7ecea97cf358ed8c1d46dfc";
+ footprints.sha256 = "1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk";
+ packages3d.rev = "0f43a0962437feb53bd2083e9f39efffb5a5dd90";
+ packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31";
};
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
index 5ec866ea9c..cb7be33429 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
@@ -16,28 +16,15 @@
stdenv.mkDerivation rec {
pname = "nvc";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "nickg";
repo = pname;
rev = "r${version}";
- hash = "sha256-hsoEAFSXI2bvzZV33jdg1849fipPQlUu3MZVvht54fI=";
+ hash = "sha256-UeA+6RKZMttLThyAf80ONximXRJNw5mUNM+cyCDTcGM=";
};
- patches = [
- # TODO: remove me on next release
- (fetchpatch {
- url = "https://github.com/nickg/nvc/commit/c857e16c33851f8a5386b97bc0dada2836b5db83.patch";
- hash = "sha256-rvZHI1iQXT9zLpCugg5mGmMZBRbTe9PSHtDG7FVZ67Q=";
- })
- ];
-
- # TODO: recheck me on next release
- postPatch = lib.optionalString stdenv.isLinux ''
- sed -i "/vhpi4/d" test/regress/testlist.txt
- '';
-
nativeBuildInputs = [
autoreconfHook
check
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
index e77f6aeeb2..1feac7530f 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,22 +1,23 @@
{ lib, stdenv, fetchFromGitHub
, perl, flex, bison, python3, autoconf
, which, cmake, help2man
+, makeWrapper, glibcLocales
}:
stdenv.mkDerivation rec {
pname = "verilator";
- version = "5.006";
+ version = "5.008";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-PA8hbE6XECapuaO5YcgEodOoxSDqpMucdijJBBb7fZg=";
+ hash = "sha256-+eJBGvQOk5w+PyUF3aieuXZVeKNS4cKQqHnJibKwFnM=";
};
enableParallelBuilding = true;
buildInputs = [ perl ];
- nativeBuildInputs = [ flex bison python3 autoconf help2man ];
+ nativeBuildInputs = [ makeWrapper flex bison python3 autoconf help2man ];
nativeCheckInputs = [ which ];
doCheck = stdenv.isLinux; # darwin tests are broken for now...
@@ -28,6 +29,12 @@ stdenv.mkDerivation rec {
patchShebangs bin/* src/{flexfix,vlcovgen} test_regress/{driver.pl,t/*.pl}
'';
+ postInstall = lib.optionalString stdenv.isLinux ''
+ for x in $(ls $out/bin/verilator*); do
+ wrapProgram "$x" --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
+ done
+ '';
+
meta = with lib; {
description = "Fast and robust (System)Verilog simulator/compiler";
homepage = "https://www.veripool.org/wiki/verilator";
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
index ade194cc6c..4bc98d5cac 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "opensmt";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
- sha256 = "sha256-v0CyVMi7Hb4Kdw8v/ZcKXpVHabq4m2cOhsNGXXVI4dw=";
+ sha256 = "sha256-+u0Go+QU56mmV1G+m+sDOhi3QaWveZILS9fWv8THoWc=";
};
nativeBuildInputs = [ cmake bison flex ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix
deleted file mode 100644
index a509d70ed4..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/logic/sad/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, haskell, spass }:
-
-stdenv.mkDerivation rec {
- pname = "system-for-automated-deduction";
- version = "2.3.25";
- src = fetchurl {
- url = "http://nevidal.org/download/sad-${version}.tar.gz";
- sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
- };
- buildInputs = [ haskell.compiler.ghc844 spass ];
- patches = [
- ./patch.patch
- # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
- # the <> operator with a different meaning defined by this package
- ./monoid.patch
- ];
- postPatch = ''
- substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
- '';
- installPhase = ''
- mkdir -p $out/{bin,provers}
- install alice $out/bin
- install provers/moses $out/provers
- substituteAll provers/provers.dat $out/provers/provers.dat
- substituteAll init.opt $out/init.opt
- cp -r examples $out
- '';
- inherit spass;
- meta = {
- description = "A program for automated proving of mathematical texts";
- longDescription = ''
- The system for automated deduction is intended for automated processing of formal mathematical texts
- written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
- '';
- license = lib.licenses.gpl3Plus;
- maintainers = [ lib.maintainers.schmitthenner ];
- homepage = "http://nevidal.org/sad.en.html";
- platforms = lib.platforms.linux;
- broken = true; # ghc-8.4.4 is gone from Nixpkgs
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/monoid.patch b/third_party/nixpkgs/pkgs/applications/science/logic/sad/monoid.patch
deleted file mode 100644
index da9c21bcae..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/logic/sad/monoid.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs
-index 0700fa0388f..69815864710 100644
---- a/Alice/Core/Check.hs
-+++ b/Alice/Core/Check.hs
-@@ -18,8 +18,12 @@
- - along with this program. If not, see .
- -}
-
-+{-# LANGUAGE NoImplicitPrelude #-}
-+
- module Alice.Core.Check (fillDef) where
-
-+import Prelude hiding ((<>))
-+
- import Control.Monad
- import Data.Maybe
-
-diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs
-index c361bcf220d..4e493d8c91b 100644
---- a/Alice/Core/Reason.hs
-+++ b/Alice/Core/Reason.hs
-@@ -17,9 +17,12 @@
- - You should have received a copy of the GNU General Public License
- - along with this program. If not, see .
- -}
-+{-# LANGUAGE NoImplicitPrelude #-}
-
- module Alice.Core.Reason where
-
-+import Prelude hiding ((<>))
-+
- import Control.Monad
-
- import Alice.Core.Base
-diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs
-index 4f8550bdf11..0f59d135b16 100644
---- a/Alice/Core/Verify.hs
-+++ b/Alice/Core/Verify.hs
-@@ -18,8 +18,12 @@
- - along with this program. If not, see .
- -}
-
-+{-# LANGUAGE NoImplicitPrelude #-}
-+
- module Alice.Core.Verify (verify) where
-
-+import Prelude hiding ((<>))
-+
- import Control.Monad
- import Data.IORef
- import Data.Maybe
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/sad/patch.patch b/third_party/nixpkgs/pkgs/applications/science/logic/sad/patch.patch
deleted file mode 100644
index a5b1d61770..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/logic/sad/patch.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -aur serious/sad-2.3-25/Alice/Core/Base.hs sad-2.3-25/Alice/Core/Base.hs
---- serious/sad-2.3-25/Alice/Core/Base.hs 2008-03-29 18:24:12.000000000 +0000
-+++ sad-2.3-25/Alice/Core/Base.hs 2015-11-27 06:38:28.740840823 +0000
-@@ -21,6 +21,7 @@
- module Alice.Core.Base where
-
- import Control.Monad
-+import Control.Applicative
- import Data.IORef
- import Data.List
- import Data.Time
-@@ -61,10 +62,21 @@
- type CRMC a b = IORef RState -> IO a -> (b -> IO a) -> IO a
- newtype CRM b = CRM { runCRM :: forall a . CRMC a b }
-
-+instance Functor CRM where
-+ fmap = liftM
-+
-+instance Applicative CRM where
-+ pure = return
-+ (<*>) = ap
-+
- instance Monad CRM where
- return r = CRM $ \ _ _ k -> k r
- m >>= n = CRM $ \ s z k -> runCRM m s z (\ r -> runCRM (n r) s z k)
-
-+instance Alternative CRM where
-+ (<|>) = mplus
-+ empty = mzero
-+
- instance MonadPlus CRM where
- mzero = CRM $ \ _ z _ -> z
- mplus m n = CRM $ \ s z k -> runCRM m s (runCRM n s z k) k
-diff -aur serious/sad-2.3-25/Alice/Core/Thesis.hs sad-2.3-25/Alice/Core/Thesis.hs
---- serious/sad-2.3-25/Alice/Core/Thesis.hs 2008-03-05 13:10:50.000000000 +0000
-+++ sad-2.3-25/Alice/Core/Thesis.hs 2015-11-27 06:35:08.311015166 +0000
-@@ -21,6 +21,7 @@
- module Alice.Core.Thesis (thesis) where
-
- import Control.Monad
-+import Control.Applicative
- import Data.List
- import Data.Maybe
-
-@@ -126,11 +127,22 @@
-
- newtype TM res = TM { runTM :: [String] -> [([String], res)] }
-
-+instance Functor TM where
-+ fmap = liftM
-+
-+instance Applicative TM where
-+ pure = return
-+ (<*>) = ap
-+
- instance Monad TM where
- return r = TM $ \ s -> [(s, r)]
- m >>= k = TM $ \ s -> concatMap apply (runTM m s)
- where apply (s, r) = runTM (k r) s
-
-+instance Alternative TM where
-+ (<|>) = mplus
-+ empty = mzero
-+
- instance MonadPlus TM where
- mzero = TM $ \ _ -> []
- mplus m k = TM $ \ s -> runTM m s ++ runTM k s
-diff -aur serious/sad-2.3-25/Alice/Export/Base.hs sad-2.3-25/Alice/Export/Base.hs
---- serious/sad-2.3-25/Alice/Export/Base.hs 2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Export/Base.hs 2015-11-27 06:32:47.782738005 +0000
-@@ -39,7 +39,7 @@
- -- Database reader
-
- readPrDB :: String -> IO [Prover]
--readPrDB file = do inp <- catch (readFile file) $ die . ioeGetErrorString
-+readPrDB file = do inp <- catchIOError (readFile file) $ die . ioeGetErrorString
-
- let dws = dropWhile isSpace
- cln = reverse . dws . reverse . dws
-diff -aur serious/sad-2.3-25/Alice/Export/Prover.hs sad-2.3-25/Alice/Export/Prover.hs
---- serious/sad-2.3-25/Alice/Export/Prover.hs 2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Export/Prover.hs 2015-11-27 06:36:47.632919161 +0000
-@@ -60,7 +60,7 @@
- when (askIB IBPdmp False ins) $ putStrLn tsk
-
- seq (length tsk) $ return $
-- do (wh,rh,eh,ph) <- catch run
-+ do (wh,rh,eh,ph) <- catchIOError run
- $ \ e -> die $ "run error: " ++ ioeGetErrorString e
-
- hPutStrLn wh tsk ; hClose wh
-diff -aur serious/sad-2.3-25/Alice/ForTheL/Base.hs sad-2.3-25/Alice/ForTheL/Base.hs
---- serious/sad-2.3-25/Alice/ForTheL/Base.hs 2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/ForTheL/Base.hs 2015-11-27 06:31:51.921230428 +0000
-@@ -226,7 +226,7 @@
- varlist = do vs <- chainEx (char ',') var
- nodups vs ; return vs
-
--nodups vs = unless (null $ dups vs) $
-+nodups vs = unless ((null :: [a] -> Bool) $ dups vs) $
- fail $ "duplicate names: " ++ show vs
-
- hidden = askPS psOffs >>= \ n -> return ('h':show n)
-diff -aur serious/sad-2.3-25/Alice/Import/Reader.hs sad-2.3-25/Alice/Import/Reader.hs
---- serious/sad-2.3-25/Alice/Import/Reader.hs 2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Import/Reader.hs 2015-11-27 06:36:41.818866167 +0000
-@@ -24,7 +24,7 @@
- import Control.Monad
- import System.IO
- import System.IO.Error
--import System.Exit
-+import System.Exit hiding (die)
-
- import Alice.Data.Text
- import Alice.Data.Instr
-@@ -44,7 +44,7 @@
- readInit "" = return []
-
- readInit file =
-- do input <- catch (readFile file) $ die file . ioeGetErrorString
-+ do input <- catchIOError (readFile file) $ die file . ioeGetErrorString
- let tkn = tokenize input ; ips = initPS ()
- inp = ips { psRest = tkn, psFile = file, psLang = "Init" }
- liftM fst $ fireLPM instf inp
-@@ -74,7 +74,7 @@
- reader lb fs (ps:ss) [TI (InStr ISfile file)] =
- do let gfl = if null file then hGetContents stdin
- else readFile file
-- input <- catch gfl $ die file . ioeGetErrorString
-+ input <- catchIOError gfl $ die file . ioeGetErrorString
- let tkn = tokenize input
- ips = initPS $ (psProp ps) { tvr_expr = [] }
- sps = ips { psRest = tkn, psFile = file, psOffs = psOffs ps }
-diff -aur serious/sad-2.3-25/Alice/Parser/Base.hs sad-2.3-25/Alice/Parser/Base.hs
---- serious/sad-2.3-25/Alice/Parser/Base.hs 2008-03-09 09:36:40.000000000 +0000
-+++ sad-2.3-25/Alice/Parser/Base.hs 2015-11-27 06:14:28.616734527 +0000
-@@ -20,6 +20,7 @@
-
- module Alice.Parser.Base where
-
-+import Control.Applicative
- import Control.Monad
- import Data.List
-
-@@ -45,11 +46,22 @@
- type CPMC a b c = (c -> CPMS a b) -> (String -> CPMS a b) -> CPMS a b
- newtype CPM a c = CPM { runCPM :: forall b . CPMC a b c }
-
-+instance Functor (CPM a) where
-+ fmap = liftM
-+
-+instance Applicative (CPM a) where
-+ pure = return
-+ (<*>) = ap
-+
- instance Monad (CPM a) where
- return r = CPM $ \ k _ -> k r
- m >>= n = CPM $ \ k l -> runCPM m (\ b -> runCPM (n b) k l) l
- fail e = CPM $ \ _ l -> l e
-
-+instance Alternative (CPM a) where
-+ (<|>) = mplus
-+ empty = mzero
-+
- instance MonadPlus (CPM a) where
- mzero = CPM $ \ _ _ _ z -> z
- mplus m n = CPM $ \ k l s -> runCPM m k l s . runCPM n k l s
-diff -aur serious/sad-2.3-25/init.opt sad-2.3-25/init.opt
---- serious/sad-2.3-25/init.opt 2007-10-11 15:25:45.000000000 +0000
-+++ sad-2.3-25/init.opt 2015-11-27 07:23:41.372816854 +0000
-@@ -1,6 +1,6 @@
- # Alice init options
--[library examples]
--[provers provers/provers.dat]
-+[library @out@/examples]
-+[provers @out@/provers/provers.dat]
- [prover spass]
- [timelimit 3]
- [depthlimit 7]
-diff -aur serious/sad-2.3-25/provers/provers.dat sad-2.3-25/provers/provers.dat
---- serious/sad-2.3-25/provers/provers.dat 2008-08-26 21:20:25.000000000 +0000
-+++ sad-2.3-25/provers/provers.dat 2015-11-27 07:24:18.878169702 +0000
-@@ -3,7 +3,7 @@
- Pmoses
- LMoses
- Fmoses
--Cprovers/moses
-+C@out@/provers/moses
- Yproved in
- Nfound unprovable in
- Utimeout in
-@@ -12,7 +12,7 @@
- Pspass
- LSPASS
- Fdfg
--Cprovers/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
-+C@spass@/bin/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
- YSPASS beiseite: Proof found.
- NSPASS beiseite: Completion found.
- USPASS beiseite: Ran out of time.
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix
index 00a5b13598..3b88ff3403 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix
@@ -7,33 +7,24 @@
, libuuid
, openjdk
, gperftools
+, gtest
+, uhdm
+, antlr4
, flatbuffers
-, fetchpatch
+, capnproto
}:
stdenv.mkDerivation rec {
pname = "surelog";
- version = "1.45";
+ version = "1.57";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = pname;
rev = "v${version}";
- hash = "sha256-/SSKcEIhmWDOKN4v3djWTwZ5/nQvR8ibflzSVFDt/rM=";
- fetchSubmodules = true;
+ hash = "sha256-Gty0OSNG5Nonyw7v2KiKP51LhiugMY7uqI6aJ6as0SQ=";
};
- # This prevents race conditions in unit tests that surface since we run
- # ctest in parallel.
- # This patch can be removed with the next version of surelog
- patches = [
- (fetchpatch {
- url = "https://github.com/chipsalliance/Surelog/commit/9a54efbd156becf65311a4272104810f36041fa6.patch";
- sha256 = "sha256-rU1Z/0wlVTgnPLqTN/87n+gI1iJ+6k/+sunVVd0ulhQ=";
- name = "parallel-test-running.patch";
- })
- ];
-
nativeBuildInputs = [
cmake
pkg-config
@@ -42,16 +33,25 @@ stdenv.mkDerivation rec {
psutil
orderedmultidict
]))
+ gtest
+ antlr4
];
buildInputs = [
libuuid
gperftools
flatbuffers
+ uhdm
+ capnproto
+ antlr4.runtime.cpp
];
cmakeFlags = [
"-DSURELOG_USE_HOST_FLATBUFFERS=On"
+ "-DSURELOG_USE_HOST_UHDM=On"
+ "-DSURELOG_USE_HOST_GTEST=On"
+ "-DSURELOG_USE_HOST_ANTLR=On"
+ "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}"
];
doCheck = true;
@@ -62,16 +62,11 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
- postInstall = ''
- mv $out/lib/surelog/* $out/lib/
- mv $out/lib/pkg $out/lib/surelog/
- '';
-
meta = {
description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler";
homepage = "https://github.com/chipsalliance/Surelog";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ matthuszagh ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
index 4572a06d63..abbcd41769 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tlaplus";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchurl {
url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar";
- sha256 = "sha256-+hhUPkTtWXSoW9LGDA3BZiCuEXaA6o5pPSaRmZ7ZCyI=";
+ sha256 = "sha256-5P8V6oH05voSXAgwBDclSxdxdMalrfaNpElkar4IUZ0=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix
index a87b6fbf35..2a667a8ac9 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix
@@ -3,56 +3,39 @@
, fetchFromGitHub
, cmake
, python3
+, capnproto
, gtest
-, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "UHDM";
- version = "1.45";
+ version = "1.57";
src = fetchFromGitHub {
owner = "chipsalliance";
repo = pname;
rev = "v${version}";
- hash = "sha256-mxQRmI8yUUrSUYa4kUT9URgfqYvuz3V9e1IGjtiHyhc=";
- fetchSubmodules = true;
+ hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw=";
};
- # Add ability to use local googletest provided from nix instead of
- # the version from the submodule in third_party/. The third_party/ version
- # is slightly older and does not work with our hydra Darwin builds that needs
- # to set a particular temp directory.
- # This patch allows to choose UHDM_USE_HOST_GTEST=On in the cflags.
- patches = [
- (fetchpatch {
- url = "https://github.com/chipsalliance/UHDM/commit/ad60fdb65a7c49fdc8ee3fffdca791f9364af4f5.patch";
- sha256 = "sha256-IkwnepWWmBychJ0mu+kaddUEc9jkldIRq+GyJkhrO8A=";
- name = "allow-local-gtest.patch";
- })
- ];
-
nativeBuildInputs = [
cmake
- ];
-
- buildInputs = [
(python3.withPackages (p: with p; [ orderedmultidict ]))
gtest
];
+ buildInputs = [
+ capnproto
+ ];
+
cmakeFlags = [
"-DUHDM_USE_HOST_GTEST=On"
+ "-DUHDM_USE_HOST_CAPNP=On"
];
doCheck = true;
checkPhase = "make test";
- postInstall = ''
- mv $out/lib/uhdm/* $out/lib/
- rm -rf $out/lib/uhdm
- '';
-
meta = {
description = "Universal Hardware Data Model";
homepage = "https://github.com/chipsalliance/UHDM";
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
index 173d1d5a21..da8d8ac9ea 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "workcraft";
- version = "3.3.9";
+ version = "3.4.0";
src = fetchurl {
url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
- sha256 = "sha256-Z3QtOGyOjmiM+qfB0FO4UDg8O99Ru/Qy2WNoBpXd1So=";
+ sha256 = "sha256-iqHdyyZX3AcBAjPTpZAiJi0IHhEDWBtKp0e2LAdWGsQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
index f810a5a567..e2842d9d15 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix
@@ -92,8 +92,8 @@ in
sha256 = "sha256-ItmtZHDhCeLAVtN7K80dqyAh20o7TM4xk2sTb9QgHvk=";
};
z3_4_8 = common {
- version = "4.8.15";
- sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5";
+ version = "4.8.17";
+ sha256 = "sha256-BSwjgOU9EgCcm18Zx0P9mnoPc9ZeYsJwEu0ffnACa+8=";
};
z3_4_8_5 = common {
tag = "Z3";
diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix
index ad22d57882..3db5356b49 100755
--- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/streamlit/default.nix
@@ -26,12 +26,12 @@
buildPythonApplication rec {
pname = "streamlit";
- version = "1.18.1";
+ version = "1.21.0";
format = "wheel"; # source currently requires pipenv
src = fetchPypi {
inherit pname version format;
- hash = "sha256-lO2QfM/G+4M55f8JCZBwk10SkMp4gXb68KncHm90k7g=";
+ hash = "sha256-BYYlmJUqkSbhZlLKpbyI7u6nsnc68lLi2szxyEzqrvQ=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
index 43b53e56c0..13ccdc8680 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, lib, fetchurl, util-linux, makeWrapper
-, enableReadline ? true, readline, ncurses }:
+{ lib
+, stdenv
+, fetchurl
+, makeWrapper
+, ncurses
+, readline
+, util-linux
+, enableReadline ? true
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "calc";
version = "2.14.1.5";
src = fetchurl {
urls = [
- "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2"
- "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
+ "https://github.com/lcn2/calc/releases/download/v${finalAttrs.version}/calc-${finalAttrs.version}.tar.bz2"
+ "http://www.isthe.com/chongo/src/calc/calc-${finalAttrs.version}.tar.bz2"
];
- sha256 = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A=";
+ hash = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A=";
};
postPatch = ''
@@ -19,9 +26,17 @@ stdenv.mkDerivation rec {
--replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
'';
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ util-linux ]
- ++ lib.optionals enableReadline [ readline ncurses ];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ buildInputs = [
+ util-linux
+ ]
+ ++ lib.optionals enableReadline [
+ ncurses
+ readline
+ ];
makeFlags = [
"T=$(out)"
@@ -34,18 +49,22 @@ stdenv.mkDerivation rec {
# Handle LDFLAGS defaults in calc
"DEFAULT_LIB_INSTALL_PATH=$(out)/lib"
- ] ++ lib.optionals enableReadline [
+ ]
+ ++ lib.optionals enableReadline [
"READLINE_LIB=-lreadline"
"USE_READLINE=-DUSE_READLINE"
];
- meta = with lib; {
- description = "C-style arbitrary precision calculator";
+ meta = {
homepage = "http://www.isthe.com/chongo/tech/comp/calc/";
+ description = "C-style arbitrary precision calculator";
+ changelog = "https://github.com/lcn2/calc/blob/v${finalAttrs.version}/CHANGES";
# The licensing situation depends on readline (see section 3 of the LGPL)
# If linked against readline then GPLv2 otherwise LGPLv2.1
- license = with licenses; if enableReadline then gpl2Only else lgpl21Only;
- maintainers = with maintainers; [ matthewbauer ];
- platforms = platforms.all;
+ license = if enableReadline
+ then lib.licenses.gpl2Only
+ else lib.licenses.lgpl21Only;
+ maintainers = with lib.maintainers; [ matthewbauer ];
+ platforms = lib.platforms.all;
};
-}
+})
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/form/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/form/default.nix
index 73fe0cfb5d..c56ee432bd 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/form/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/form/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, gmp, zlib }:
stdenv.mkDerivation {
- version = "4.3.0";
+ version = "4.3.1";
pname = "form";
# This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
src = fetchurl {
- url = "https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz";
- sha256 = "sha256-sjTg0JX3PssJBM3DsNjYMjqfp/RncKUvsiJnxiSq+/Y=";
+ url = "https://github.com/vermaseren/form/releases/download/v4.3.1/form-4.3.1.tar.gz";
+ sha256 = "sha256-8fUS3DT+m71rGfLf7wX8uZEt+0PINop1t5bsRy7ou84=";
};
buildInputs = [ gmp zlib ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix
index ec3bb4c795..b4e8c6fb23 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/glsurf/default.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
homepage = "https://raffalli.eu/~christophe/glsurf/";
description = "A program to draw implicit surfaces and curves";
license = lib.licenses.gpl2Plus;
+ platforms = lib.platforms.all;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix
index 1acc6a287c..0878070136 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "JAGS";
- version = "4.3.1";
+ version = "4.3.2";
src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz";
- sha256 = "sha256-+SWDVbXp6xO9M8X6cg8MvrrOp9CkpCtxsPsUUB7hQik=";
+ sha256 = "sha256-hx9VavQDp8LOag8C8Vz4WlcnY+CT0mZY66xVxKtHL8g=";
};
nativeBuildInputs = [ gfortran ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
index f420c940f3..d25f0ad344 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/nasc/default.nix
@@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \
--replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \
--replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - '
+ substituteInPlace subprojects/libqalculate/libqalculate/meson.build \
+ --replace "link_with: 'libqalculate_lib_static'" "link_with: libqalculate_lib_static"
'';
passthru = {
@@ -80,6 +82,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl3Plus;
mainProgram = "com.github.parnold_x.nasc";
- broken = true; # at 2022-09-23
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
index 0c82e7ebf3..573b42c39f 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "sha256-RdvoBs/QeBR032nMh79TLMGU6U7dsY6Ep+QKq4IKRTk=";
+ sha256 = "sha256-eBclDq9Uiu5rA74tlBkOiP3fRwAZn84F3LPA2cKkuw8=";
};
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix
index 67c7f6fb4a..21ab877b7a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-qt";
- version = "4.6.0";
+ version = "4.6.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${version}";
- hash = "sha256-/TDzjlB8rW/TorndcLbxY9pc3q7vY3M6eLxBRfnBs9Y=";
+ hash = "sha256-9DT1U0iKj5C/Tc9MggEr/RwHhVr4GSOJQVhTiLFk9NY=";
};
nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch
deleted file mode 100644
index b0f3634340..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ipywidgets-on_submit-deprecationwarning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/sage/interacts/library.py b/src/sage/interacts/library.py
-index 06d680109a..139b00bfd1 100644
---- a/src/sage/interacts/library.py
-+++ b/src/sage/interacts/library.py
-@@ -1434,6 +1434,8 @@ def riemann_sum(
- creates the mathlet::
-
- sage: interacts.calculus.riemann_sum()
-+ ...
-+ DeprecationWarning: on_submit is deprecated. Instead, set the .continuous_update attribute to False and observe the value changing with: mywidget.observe(callback, 'value').
- Manual interactive function with 9 widgets
- title: HTMLText(value='Riemann integral with random sampling
')
- f: EvalText(value='x^2+1', description='$f(x)=$', layout=Layout(max_width='41em'))
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 8913d636fa..f2e0268541 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
@@ -141,12 +141,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-YdPnMsjXBm9ZRm6a8hH8rSynkrABjLoIzqwp3F/rKAw=";
})
+ # https://github.com/sagemath/sage/pull/35336, merged in 10.0.beta8
+ (fetchpatch {
+ name = "ipywidgets-8.0.5-upgrade.patch";
+ url = "https://github.com/sagemath/sage/commit/7ab3e3aa81d47a35d09161b965bba8ab16fd5c9e.diff";
+ sha256 = "sha256-WjdsPTui6uv92RerlV0mqltmLaxADvz+3aqSvxBFmfU=";
+ })
+
+ # https://github.com/sagemath/sage/pull/35499
+ (fetchpatch {
+ name = "ipywidgets-8.0.5-upgrade-part-deux.patch";
+ url = "https://github.com/sagemath/sage/pull/35499.diff";
+ sha256 = "sha256-uNCjLs9qrARTQNsq1+kTdvuV2A1M4xx5b1gWh5c55X0=";
+ })
+
# rebased from https://github.com/sagemath/sage/pull/34994, merged in sage 10.0.beta2
./patches/numpy-1.24-upgrade.patch
- # temporarily paper over https://github.com/jupyter-widgets/ipywidgets/issues/3669
- ./patches/ipywidgets-on_submit-deprecationwarning.patch
-
# Sage uses mixed integer programs (MIPs) to find edge disjoint
# spanning trees. For some reason, aarch64 glpk takes much longer
# than x86_64 glpk to solve such MIPs. Since the MIP formulation
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix
index 47a86fa2ae..c927df9a54 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/foldingathome/client.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, autoPatchelfHook
-, buildFHSUserEnv
+, buildFHSEnv
, dpkg
, fetchurl
, gcc-unwrapped
@@ -35,7 +35,7 @@ let
installPhase = "cp -ar usr $out";
};
in
-buildFHSUserEnv {
+buildFHSEnv {
name = fahclient.name;
targetPkgs = pkgs': [
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix
index ca94be96d6..ddc0cdfa4e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix
@@ -25,6 +25,12 @@ python3.pkgs.buildPythonApplication rec {
})
];
+ # AttributeError: module 'numpy' has no attribute 'float'.
+ postPatch = ''
+ substituteInPlace src/sas/sascalc/pr/p_invertor.py \
+ --replace "dtype=np.float)" "dtype=float)"
+ '';
+
nativeBuildInputs = [
python3.pkgs.pyqt5
wrapQtAppsHook
diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index cdc5bc8557..d08c15dd8a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -19,11 +19,11 @@ let
in stdenv.mkDerivation rec {
pname = "gromacs";
- version = "2023";
+ version = "2023.1";
src = fetchurl {
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
- sha256 = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g=";
+ sha256 = "sha256-7vK7Smy2MUz52kfybfKg0nr0v3swmXI9Q2AQc6sKQvQ=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch
deleted file mode 100644
index ddd91aec9a..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/0002-fix-ftbfs-with-gcc-10.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fixing argument mismatches in Fortran code, addressing #957430.
-Author: Andrius Merkys
-Forwarded: ccp4-dev@dl.ac.uk
---- a/fortran/pack_f.f
-+++ b/fortran/pack_f.f
-@@ -106,7 +106,7 @@
- endif
- 10 continue
- filnarray(len(filn) + 1) = 0
-- call pack_wordimage_f(data, x, y, filnarray)
-+ call pack_longimage_f(data, x, y, filnarray)
- return
- end
-
-@@ -138,7 +138,7 @@
- endif
- 10 continue
- filnarray(len(filn) + 1) = 0
-- call v2pack_wordimage_f(data, x, y, filnarray)
-+ call v2pack_longimage_f(data, x, y, filnarray)
- return
- end
-
---- a/fortran/lgglib.f
-+++ b/fortran/lgglib.f
-@@ -1236,7 +1236,7 @@
- B3(2) = XYZ(2) * CELL(2)
- B3(3) = XYZ(3) * CELL(3)
- C
-- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
-+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
- END
- c
- c
-@@ -1274,7 +1274,7 @@
- B3(1) = XYZ(1)
- B3(2) = XYZ(2)
- B3(3) = XYZ(3)
-- CALL matmult(3,3,3,1,ORTH,B3,XYZ,B1)
-+ CALL matmult(3,3,3,1,ORTH,B3,XYZ)
- END
- character*80 function getnam(filnam)
- character*(*) filnam
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix
index 0a981f0adf..1428ef8265 100644
--- a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/default.nix
@@ -3,10 +3,10 @@
, fetchurl
, fetchFromGitHub
, fetchpatch
+, fetchzip
, cmake
, lz4
, bzip2
-, gfortran
, m4
, hdf5
, gsl
@@ -38,14 +38,12 @@
let
libccp4 = stdenv.mkDerivation rec {
pname = "libccp4";
- version = "6.5.1";
+ version = "8.0.0";
src = fetchurl {
- # Original mirror, now times out
- # url = "ftp://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz";
- url = "https://deb.debian.org/debian/pool/main/libc/${pname}/${pname}_${version}.orig.tar.gz";
- sha256 = "1rfvjliny29vy5bdi6rrjaw9hhhhh72pw536xwvqipqcjlylf2r8";
+ url = "https://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz";
+ hash = "sha256-y4E66GYSoIZjKd6rfO6W6sVz2BvlskA0HUD5rVMi/y0=";
};
- nativeBuildInputs = [ gfortran m4 ];
+ nativeBuildInputs = [ meson ninja ];
buildInputs = [ hdf5 gsl ];
configureFlags = [ "FFLAGS=-fallow-argument-mismatch" ];
@@ -53,16 +51,22 @@ let
# libccp4 tries to read syminfo.lib by looking at an environment variable, which hinders reproducibility.
# We hard-code this by providing a little patch and then passing the absolute path to syminfo.lib as a
# preprocessor flag.
- preBuild = ''
- makeFlagsArray+=(CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"')
- export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
- '';
- makeFlags = [ "CFLAGS='-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/syminfo.lib\"" ];
+ env.NIX_CFLAGS_COMPILE = "-DNIX_PROVIDED_SYMOP_FILE=\"${placeholder "out"}/share/ccp4/syminfo.lib\"";
patches = [
./libccp4-use-hardcoded-syminfo-lib.patch
- ./0002-fix-ftbfs-with-gcc-10.patch
];
+
+ postPatch =
+ let
+ mesonPatch = fetchzip {
+ url = "https://wrapdb.mesonbuild.com/v2/libccp4c_8.0.0-1/get_patch#somefile.zip";
+ hash = "sha256-ohskfKh+972Pl56KtwAeWwHtAaAFNpCzz5vZBAI/vdU=";
+ };
+ in
+ ''
+ cp ${mesonPatch}/meson.build .
+ '';
};
# This is the statically-linked, pre-built binary of mosflm. Compiling it ourselves turns out to be very difficult
# since the build process is very hard-coded for a specific machine, architecture, and libraries.
@@ -145,10 +149,17 @@ let
src = fetchFromGitHub {
owner = "nexusformat";
repo = pname;
- rev = "d469f175e5273c1d488e71a6134f84088f57d39c";
- sha256 = "1jrzzh75i68ad1yrim7s1nx9wy0s49ghkziahs71mm5azprm6gh9";
+ rev = "49e3b65eca772bca77af13ba047d8b577673afba";
+ hash = "sha256-bEzfWdZuHmb0PDzCqy8Dey4tLtq+4coO0sT0GzqrTYI=";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/spanezz/HDF5-External-Filter-Plugins/commit/6b337fe36da97a3ef72354393687ce3386c0709d.patch";
+ hash = "sha256-wnBEdL/MjEyRHPwaVtuhzY+DW1AFeaUQUmIXh+JaRHo=";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ hdf5 lz4 bzip2 ];
@@ -184,13 +195,14 @@ stdenv.mkDerivation rec {
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
++ lib.optionals stdenv.isDarwin [
argp-standalone
+ ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [
memorymappingHook
]
- # hdf5-external-filter-plugins doesn't link on Darwin
- ++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ];
+ ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
patches = [
./link-to-argp-standalone-if-needed.patch
+ ./disable-fmemopen-on-aarch64-darwin.patch
(fetchpatch {
url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff";
hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc=";
@@ -204,7 +216,7 @@ stdenv.mkDerivation rec {
sed -i -e 's#execlp("mosflm"#execl("${mosflm}/bin/mosflm"#' libcrystfel/src/indexers/mosflm.c;
'';
- postInstall = lib.optionalString (withBitshuffle && !stdenv.isDarwin) ''
+ postInstall = lib.optionalString withBitshuffle ''
for file in $out/bin/*; do
wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins
done
@@ -224,7 +236,7 @@ stdenv.mkDerivation rec {
downloadPage = "https://www.desy.de/~twhite/crystfel/download.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pmiddend ];
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch
new file mode 100644
index 0000000000..c35350d000
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/physics/crystfel/disable-fmemopen-on-aarch64-darwin.patch
@@ -0,0 +1,13 @@
+diff --git a/libcrystfel/src/image-cbf.c b/libcrystfel/src/image-cbf.c
+index b8f09a1f..f8a15c1b 100644
+--- a/libcrystfel/src/image-cbf.c
++++ b/libcrystfel/src/image-cbf.c
+@@ -287,7 +287,7 @@ static float *read_cbf_data(const char *filename, int gz, int *w, int *h)
+
+ } else {
+
+- #ifdef HAVE_ZLIB
++ #if defined(HAVE_ZLIB) && !(defined(__aarch64__) && defined(__APPLE__))
+ gzFile gzfh;
+ int len_read;
+ size_t len;
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix
index 9221f4bcdb..41a0e00ae7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}:
+{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }:
stdenv.mkDerivation rec {
pname = "elmerfem";
- version = "9.0";
+ version = "unstable-2023-02-03";
src = fetchFromGitHub {
owner = "elmercsc";
- repo = "elmerfem";
- rev = "release-${version}";
- sha256 = "VK7jvu4s5d7k0c39XqY9dEzg/vXtX5Yr/09VcuZVQ9A=";
+ repo = pname;
+ rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343";
+ hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug=";
};
hardeningDisable = [ "format" ];
@@ -29,19 +29,14 @@ stdenv.mkDerivation rec {
libGL
libGLU
opencascade
- vtk_8_withQt5
+ tbb
+ vtkWithQt5
];
preConfigure = ''
patchShebangs ./
'';
- patches = [
- ./patches/0001-fix-import-of-QPainterPath.patch
- ./patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch
- ./patches/0003-ignore-qwt_compat.patch
- ];
-
storepath = placeholder "out";
cmakeFlags = [
@@ -58,7 +53,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
- homepage = "https://elmerfem.org/";
+ homepage = "https://elmerfem.org";
description = "A finite element software for multiphysical problems";
platforms = platforms.unix;
maintainers = with maintainers; [ wulfsta broke ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch
deleted file mode 100644
index a9e1ba442b..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 87885de957aa3f891fe963503c94685675c24f49 Mon Sep 17 00:00:00 2001
-From: grindhold
-Date: Wed, 27 Apr 2022 19:16:42 +0200
-Subject: [PATCH] fix import of QPainterPath
-
----
- ElmerGUI/Application/twod/renderarea.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ElmerGUI/Application/twod/renderarea.cpp b/ElmerGUI/Application/twod/renderarea.cpp
-index 4c2515c5..65128ea9 100644
---- a/ElmerGUI/Application/twod/renderarea.cpp
-+++ b/ElmerGUI/Application/twod/renderarea.cpp
-@@ -38,6 +38,7 @@
- * *
- *****************************************************************************/
- #include
-+#include
- #include
- #include
- #include
---
-2.33.3
-
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch
deleted file mode 100644
index 6c2782b9e0..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 06634e5fd46a27dca11b87d4a38e9ead561de3d5 Mon Sep 17 00:00:00 2001
-From: grindhold
-Date: Thu, 28 Apr 2022 15:47:07 +0200
-Subject: [PATCH] fem: rename loopvars to avoid redefinition
-
----
- fem/src/modules/DCRComplexSolve.F90 | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90
-index 469214ee..268591fd 100644
---- a/fem/src/modules/DCRComplexSolve.F90
-+++ b/fem/src/modules/DCRComplexSolve.F90
-@@ -502,14 +502,14 @@ CONTAINS
-
- IF ( SIZE(Hwrk,1) == 1 ) THEN
-
-- DO i=1,MIN(3,SIZE(Hwrk,2))
-- Tensor( i,1:n ) = Hwrk( 1,1,1:n )
-+ DO k=1,MIN(3,SIZE(Hwrk,2))
-+ Tensor( k,1:n ) = Hwrk( 1,1,1:n )
- END DO
-
- ELSE
-
-- DO i=1,MIN(3,SIZE(Hwrk,1))
-- Tensor( i,1:n ) = Hwrk( i,1,1:n )
-+ DO k=1,MIN(3,SIZE(Hwrk,1))
-+ Tensor( k,1:n ) = Hwrk( k,1,1:n )
- END DO
-
- END IF
-@@ -1391,21 +1391,21 @@ contains
-
- IF ( SIZE(Hwrk,1) == 1 ) THEN
-
-- DO i=1,MIN(3,SIZE(Hwrk,2))
-- Tensor( i,i,1:n ) = Hwrk( 1,1,1:n )
-+ DO k=1,MIN(3,SIZE(Hwrk,2))
-+ Tensor( k,k,1:n ) = Hwrk( 1,1,1:n )
- END DO
-
- ELSE IF ( SIZE(Hwrk,2) == 1 ) THEN
-
-- DO i=1,MIN(3,SIZE(Hwrk,1))
-- Tensor(i,i,1:n) = Hwrk(i,1,1:n)
-+ DO k=1,MIN(3,SIZE(Hwrk,1))
-+ Tensor(k,k,1:n) = Hwrk(k,1,1:n)
- END DO
-
- ELSE
-
-- DO i=1,MIN(3,SIZE(Hwrk,1))
-+ DO k=1,MIN(3,SIZE(Hwrk,1))
- DO j=1,MIN(3,SIZE(Hwrk,2))
-- Tensor( i,j,1:n ) = Hwrk(i,j,1:n)
-+ Tensor( k,j,1:n ) = Hwrk(k,j,1:n)
- END DO
- END DO
-
-@@ -1443,14 +1443,14 @@ contains
-
- IF ( SIZE(Hwrk,1) == 1 ) THEN
-
-- DO i=1,MIN(3,SIZE(Hwrk,2))
-- Tensor( i,1:n ) = Hwrk( 1,1,1:n )
-+ DO k=1,MIN(3,SIZE(Hwrk,2))
-+ Tensor( k,1:n ) = Hwrk( 1,1,1:n )
- END DO
-
- ELSE
-
-- DO i=1,MIN(3,SIZE(Hwrk,1))
-- Tensor( i,1:n ) = Hwrk( i,1,1:n )
-+ DO k=1,MIN(3,SIZE(Hwrk,1))
-+ Tensor( k,1:n ) = Hwrk( k,1,1:n )
- END DO
-
- END IF
---
-2.33.3
-
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch
deleted file mode 100644
index 26954008d5..0000000000
--- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 26601fec36a4978e805aad40e6d0cbf268c653d2 Mon Sep 17 00:00:00 2001
-From: grindhold
-Date: Thu, 28 Apr 2022 17:13:06 +0200
-Subject: [PATCH] ignore qwt_compat
-
----
- ElmerGUI/Application/src/convergenceview.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h
-index 377b644b..64250149 100755
---- a/ElmerGUI/Application/src/convergenceview.h
-+++ b/ElmerGUI/Application/src/convergenceview.h
-@@ -52,7 +52,7 @@
- #include
- #include
- /*#include <-- deprecated in Qwt6, using qwt_compat.h instead*/
--#include
-+/*#include */
- #include
- #include
-
-@@ -76,8 +76,8 @@ public:
-
- private:
- int d_count;
-- QwtArray d_x;
-- QwtArray d_y;
-+ QVector d_x;
-+ QVector d_y;
- };
-
- class Curve
---
-2.33.3
-
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix
index 304bab6499..fa161a8147 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/havoc/default.nix
@@ -3,29 +3,34 @@
, fetchFromGitHub
, libxkbcommon
, pkg-config
-, wayland
, wayland-protocols
+, wayland-scanner
+, wayland
}:
stdenv.mkDerivation rec {
pname = "havoc";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "ii8";
repo = pname;
rev = version;
- hash = "sha256-zNKDQqkDeNj5fB5EdMVfAs2H4uBgLh6Fp3uSjiJ1VhQ=";
+ hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4=";
};
- nativeBuildInputs = [
+ depsBuildBuild = [
pkg-config
];
+ nativeBuildInputs = [
+ wayland-protocols
+ wayland-scanner
+ ];
+
buildInputs = [
libxkbcommon
wayland
- wayland-protocols
];
dontConfigure = true;
@@ -37,12 +42,15 @@ stdenv.mkDerivation rec {
install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/
'';
+ enableParallelBuilding = true;
+
meta = with lib; {
homepage = "https://github.com/ii8/havoc";
description = "A minimal terminal emulator for Wayland";
license = with licenses; [ mit publicDomain ];
platforms = with platforms; unix;
- broken = stdenv.isDarwin; # no wayland support
maintainers = with maintainers; [ AndersonTorres ];
+ # fatal error: 'sys/epoll.h' file not found
+ broken = stdenv.isDarwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
index 07980f8375..e693e51c93 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -23,21 +23,22 @@
, nixosTests
, go
, buildGoModule
+, nix-update-script
}:
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.27.1";
+ version = "0.28.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
- hash = "sha256-/K/5T15kULTQP1FCLnyrKfhlQjIStayutaxLjmHjHes=";
+ hash = "sha256-pAo+bT10rdQOf9j3imKWCCMFGm8KntUeTQUrEE1wYZc=";
};
- vendorHash = "sha256-JLPPNOsoq+ErLhELsX3z3YehYfgp7OGXEXlP3IVcM5k=";
+ vendorHash = "sha256-vq19exqsEtXhN20mgC5GCpYGm8s9AC6nlfCfG1lUiI8=";
buildInputs = [
harfbuzz
@@ -99,16 +100,16 @@ buildPythonApplication rec {
CGO_ENABLED = 0;
GOFLAGS = "-trimpath";
- configurePhase = let
- goModules = (buildGoModule {
- pname = "kitty-go-modules";
- inherit src vendorHash version;
- }).go-modules;
- in ''
+ go-modules = (buildGoModule {
+ pname = "kitty-go-modules";
+ inherit src vendorHash version;
+ }).go-modules;
+
+ configurePhase = ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
export GOPROXY=off
- cp -r --reflink=auto ${goModules} vendor
+ cp -r --reflink=auto ${go-modules} vendor
'';
buildPhase = let
@@ -161,6 +162,8 @@ buildPythonApplication rec {
--replace test_ssh_connection_data dont_test_ssh_connection_data
substituteInPlace kitty_tests/fonts.py \
--replace 'class Rendering(BaseTest)' 'class Rendering'
+ # theme collection test starts an http server
+ rm tools/themes/collection_test.go
'';
checkPhase = ''
@@ -216,19 +219,10 @@ buildPythonApplication rec {
runHook postInstall
'';
- # Patch shebangs that Nix can't automatically patch
- preFixup =
- let
- pathComponent = if stdenv.isDarwin then "Applications/kitty.app/Contents/Resources" else "lib";
- in
- ''
- substituteInPlace $out/${pathComponent}/kitty/shell-integration/ssh/askpass.py \
- --replace '/usr/bin/env -S ' $out/bin/
- substituteInPlace $shell_integration/ssh/askpass.py \
- --replace '/usr/bin/env -S ' $out/bin/
- '';
-
- passthru.tests.test = nixosTests.terminal-emulators.kitty;
+ passthru = {
+ updateScript = nix-update-script {};
+ tests.test = nixosTests.terminal-emulators.kitty;
+ };
meta = with lib; {
homepage = "https://github.com/kovidgoyal/kitty";
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix
index c24830cf2d..217c6552ef 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -1,14 +1,98 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem, nixosTests
-, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
-, harfbuzz #substituting glyphs with opentype fonts
-, fribidi, m17n_lib #bidi and encoding
-, openssl, libssh2 #build-in ssh
-, fcitx5, fcitx5-gtk, ibus, uim #IME
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkg-config
+, autoconf
+, makeDesktopItem
+, nixosTests
+, vte
+, harfbuzz # can be replaced with libotf
+, fribidi
+, m17n_lib
+, libssh2 #build-in ssh
+, fcitx5
+, fcitx5-gtk
+, ibus
+, uim #IME
, wrapGAppsHook #color picker in mlconfig
-, Cocoa #Darwin
+, gdk-pixbuf
+, gtk3
+, gtk ? gtk3
+# List of gui libraries to use. According to `./configure --help` ran on
+# release 3.9.3, options are: (xlib|win32|fb|quartz|console|wayland|sdl2|beos)
+, enableGuis ? {
+ xlib = enableX11;
+ fb = stdenv.isLinux;
+ quartz = stdenv.isDarwin;
+ wayland = stdenv.isLinux;
+ sdl2 = true;
+}
+, libxkbcommon
+, wayland # for the "wayland" --with-gui option
+, SDL2 # for the "sdl" --with-gui option
+# List of typing engines, the default list enables compiling all of the
+# available ones, as recorded on release 3.9.3
+, enableTypeEngines ? {
+ xcore = false; # Considered legacy
+ xft = enableX11;
+ cairo = true;
+}
+, libX11
+, libXft
+, cairo
+# List of external tools to create, this default list includes all default
+# tools, as recorded on release 3.9.3.
+, enableTools ? {
+ mlclient = true;
+ mlconfig = true;
+ mlcc = true;
+ mlterm-menu = true;
+ # Note that according to upstream's ./configure script, to disable
+ # mlimgloader you have to disable _all_ tools. See:
+ # https://github.com/arakiken/mlterm/issues/69
+ mlimgloader = true;
+ registobmp = true;
+ mlfc = true;
+}
+# Whether to enable the X window system
+, enableX11 ? stdenv.isLinux
+# Most of the input methods and other build features are enabled by default,
+# the following attribute set can be used to disable some of them. It's parsed
+# when we set `configureFlags`. If you find other configure Flags that require
+# dependencies, it'd be nice to make that contribution here.
+, enableFeatures ? {
+ uim = !stdenv.isDarwin;
+ ibus = !stdenv.isDarwin;
+ fcitx = !stdenv.isDarwin;
+ m17n = !stdenv.isDarwin;
+ ssh2 = true;
+ bidi = true;
+ # Open Type layout support, (substituting glyphs with opentype fonts)
+ otl = true;
+}
+# Configure the Exec directive in the generated .desktop file
+, desktopBinary ? (
+ if enableGuis.xlib then
+ "mlterm"
+ else if enableGuis.wayland then
+ "mlterm-wl"
+ else if enableGuis.sdl2 then
+ "mlterm-sdl2"
+ else
+ throw "mlterm: couldn't figure out what desktopBinary to use."
+ )
}:
-stdenv.mkDerivation rec {
+let
+ # Returns a --with-feature=, or `--without-feature` if all attributes are false or don't
+ # exist. Used later in configureFlags
+ withFeaturesList = featureName: attrset: let
+ commaSepList = lib.concatStringsSep "," (builtins.attrNames (lib.filterAttrs (n: v: v) attrset));
+ in
+ lib.withFeatureAs (commaSepList != "") featureName commaSepList
+ ;
+in stdenv.mkDerivation rec {
pname = "mlterm";
version = "3.9.3";
@@ -19,29 +103,41 @@ stdenv.mkDerivation rec {
sha256 = "sha256-gfs5cdwUUwSBWwJJSaxrQGWJvLkI27RMlk5QvDALEDg=";
};
- nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ];
+ nativeBuildInputs = [
+ pkg-config
+ autoconf
+ ] ++ lib.optionals enableTools.mlconfig [
+ wrapGAppsHook
+ ];
buildInputs = [
- libX11
- gdk-pixbuf.dev
- cairo
- libXft
- gtk3
- harfbuzz
- fribidi
- ] ++ lib.optionals (!stdenv.isDarwin) [
- # need linker magic, not adapted for Darwin yet
- openssl
- libssh2
-
- # Not supported on Darwin
+ gtk
vte
+ gdk-pixbuf
+ ] ++ lib.optionals enableTypeEngines.xcore [
+ libX11
+ ] ++ lib.optionals enableTypeEngines.xft [
+ libXft
+ ] ++ lib.optionals enableTypeEngines.cairo [
+ cairo
+ ] ++ lib.optionals enableGuis.wayland [
+ libxkbcommon
+ wayland
+ ] ++ lib.optionals enableGuis.sdl2 [
+ SDL2
+ ] ++ lib.optionals enableFeatures.otl [
+ harfbuzz
+ ] ++ lib.optionals enableFeatures.bidi [
+ fribidi
+ ] ++ lib.optionals enableFeatures.ssh2 [
+ libssh2
+ ] ++ lib.optionals enableFeatures.m17n [
m17n_lib
-
+ ] ++ lib.optionals enableFeatures.fcitx [
fcitx5
fcitx5-gtk
+ ] ++ lib.optionals enableFeatures.ibus [
ibus
- ] ++ lib.optionals (stdenv.system != "aarch64-linux") [
- # FIXME Currently broken on aarch64-linux
+ ] ++ lib.optionals enableFeatures.uim [
uim
];
@@ -64,32 +160,16 @@ stdenv.mkDerivation rec {
--replace "-m 2755 -g utmp" " " \
--replace "-m 4755 -o root" " "
'';
- NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "
- -L${stdenv.cc.cc.lib}/lib
- -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
- -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
- " + lib.optionalString (openssl != null) "
- -lcrypto
- " + lib.optionalString (libssh2 != null) "
- -lssh2
- ";
configureFlags = [
- "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice
- "--with-type-engines=cairo,xft,xcore"
- "--with-gtk=3.0"
- "--enable-ind" #indic scripts
- "--enable-fribidi" #bidi scripts
- "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
- #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core
- #and configuring ~/.mlterm/key correctly.
- ] ++ lib.optionals (!stdenv.isDarwin) [
- "--with-x=yes"
- "--with-gui=xlib,fb"
- "--enable-m17nlib" #character encodings
- ] ++ lib.optionals stdenv.isDarwin [
- "--with-gui=quartz"
- ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ];
+ (withFeaturesList "type-engines" enableTypeEngines)
+ (withFeaturesList "tools" enableTools)
+ (withFeaturesList "gui" enableGuis)
+ (lib.withFeature enableX11 "x")
+ ] ++ lib.optionals (gtk != null) [
+ "--with-gtk=${lib.versions.major gtk.version}.0"
+ ] ++ (lib.mapAttrsToList (n: v: lib.enableFeature v n) enableFeatures) ++ [
+ ];
enableParallelBuilding = true;
@@ -105,24 +185,32 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "mlterm";
- exec = "mlterm %U";
+ exec = "${desktopBinary} %U";
icon = "mlterm";
type = "Application";
- comment = "Terminal emulator";
+ comment = "Multi Lingual TERMinal emulator";
desktopName = "mlterm";
genericName = "Terminal emulator";
- categories = [ "Application" "System" "TerminalEmulator" ];
+ categories = [ "System" "TerminalEmulator" ];
startupNotify = false;
};
- passthru.tests.test = nixosTests.terminal-emulators.mlterm;
+ passthru = {
+ tests.test = nixosTests.terminal-emulators.mlterm;
+ inherit
+ enableTypeEngines
+ enableTools
+ enableGuis
+ enableFeatures
+ ;
+ };
meta = with lib; {
description = "Multi Lingual TERMinal emulator";
homepage = "https://mlterm.sourceforge.net/";
license = licenses.bsd3;
- maintainers = with maintainers; [ vrthra ramkromberg atemu ];
- platforms = with platforms; linux ++ darwin;
- broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51
+ maintainers = with maintainers; [ ramkromberg atemu doronbehar ];
+ platforms = platforms.all;
+ mainProgram = desktopBinary;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
index 54c9f94676..4dee206be2 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix
@@ -14,13 +14,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "terminator";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "gnome-terminator";
repo = "terminator";
rev = "v${version}";
- hash = "sha256-dN9+6VGIdIyY52nm2BMONeb+WV7UGL68frjnHRxRzTU=";
+ hash = "sha256-Kx0z9oheA7Ihgsyg6zgPcGFMrqlXoIpQcL/dMqPB2qA=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/Cargo.lock b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/Cargo.lock
index eeec1102af..e612a1aff5 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/Cargo.lock
@@ -64,12 +64,52 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstream"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-wincon",
+ "concolor-override",
+ "concolor-query",
+ "is-terminal",
+ "utf8parse",
+]
+
[[package]]
name = "anstyle"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+[[package]]
+name = "anstyle-parse"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.45.0",
+]
+
[[package]]
name = "anyhow"
version = "1.0.70"
@@ -173,7 +213,7 @@ dependencies = [
"log",
"parking",
"polling",
- "rustix 0.37.3",
+ "rustix 0.37.6",
"slab",
"socket2 0.4.9",
"waker-fn",
@@ -214,7 +254,7 @@ dependencies = [
"event-listener",
"futures-lite",
"libc",
- "signal-hook 0.3.15",
+ "signal-hook",
"windows-sys 0.42.0",
]
@@ -226,7 +266,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -243,7 +283,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -364,21 +404,21 @@ version = "1.3.2"
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"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "block"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
[[package]]
name = "block-buffer"
version = "0.10.4"
@@ -457,7 +497,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -531,73 +571,127 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "ciborium"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half 1.8.2",
+]
+
[[package]]
name = "clap"
version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"textwrap 0.11.0",
"unicode-width",
]
[[package]]
name = "clap"
-version = "4.1.13"
+version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c911b090850d79fc64fe9ea01e28e465f65e821e08813ced95bced72f7a8a9b"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "clap_lex 0.2.4",
+ "indexmap",
+ "textwrap 0.16.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+dependencies = [
+ "clap_builder",
"clap_derive",
- "clap_lex",
- "is-terminal",
"once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
+ "clap_lex 0.4.1",
"strsim",
- "termcolor",
"terminal_size",
]
[[package]]
name = "clap_complete"
-version = "4.1.5"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1"
+checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd"
dependencies = [
- "clap 4.1.13",
+ "clap 4.2.1",
]
[[package]]
name = "clap_complete_fig"
-version = "4.1.2"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2171bc6242ad7a1801422bff039574449b5bd832b715222e500714ce10f91a54"
+checksum = "f3af28956330989baa428ed4d3471b853715d445c62de21b67292e22cf8a41fa"
dependencies = [
- "clap 4.1.13",
+ "clap 4.2.1",
"clap_complete",
]
[[package]]
name = "clap_derive"
-version = "4.1.12"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a932373bab67b984c790ddf2c9ca295d8e3af3b7ef92de5a5bacdccdee4b09b"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
name = "clap_lex"
-version = "0.3.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
dependencies = [
"os_str_bytes",
]
+[[package]]
+name = "clap_lex"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+
[[package]]
name = "clipboard-win"
version = "2.2.0"
@@ -624,7 +718,7 @@ version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"block",
"core-foundation 0.7.0",
"core-graphics 0.19.2",
@@ -718,6 +812,21 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+[[package]]
+name = "concolor-override"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+
+[[package]]
+name = "concolor-query"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+dependencies = [
+ "windows-sys 0.45.0",
+]
+
[[package]]
name = "concurrent-queue"
version = "2.1.0"
@@ -732,7 +841,7 @@ name = "config"
version = "0.1.0"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"colorgrad",
"dirs-next",
"enum-display-derive",
@@ -744,6 +853,7 @@ dependencies = [
"log",
"luahelper",
"mlua",
+ "nix 0.26.2",
"notify",
"ordered-float",
"portable-pty",
@@ -758,6 +868,7 @@ dependencies = [
"wezterm-config-derive",
"wezterm-dynamic",
"wezterm-input-types",
+ "wezterm-ssh",
"wezterm-term",
"winapi",
]
@@ -778,7 +889,7 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"libc",
]
@@ -790,9 +901,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "core-graphics"
@@ -800,7 +911,7 @@ version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation 0.7.0",
"foreign-types",
"libc",
@@ -812,7 +923,7 @@ version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation 0.9.3",
"core-graphics-types",
"foreign-types",
@@ -825,7 +936,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation 0.9.3",
"foreign-types",
"libc",
@@ -870,7 +981,7 @@ dependencies = [
"atty",
"cast",
"clap 2.34.0",
- "criterion-plot",
+ "criterion-plot 0.4.5",
"csv",
"itertools",
"lazy_static",
@@ -887,6 +998,32 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "criterion"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+dependencies = [
+ "anes",
+ "atty",
+ "cast",
+ "ciborium",
+ "clap 3.2.23",
+ "criterion-plot 0.5.0",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
[[package]]
name = "criterion-plot"
version = "0.4.5"
@@ -897,6 +1034,16 @@ dependencies = [
"itertools",
]
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
[[package]]
name = "crossbeam"
version = "0.8.2"
@@ -987,7 +1134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
dependencies = [
"lab",
- "phf 0.11.1",
+ "phf",
]
[[package]]
@@ -1013,9 +1160,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c00419335c41018365ddf7e4d5f1c12ee3659ddcf3e01974650ba1de73d038"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1025,9 +1172,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb8307ad413a98fff033c8545ecf133e3257747b3bae935e7602aab8aa92d4ca"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -1035,24 +1182,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc52e2eb08915cb12596d29d55f0b5384f00d697a646dbd269b6ecb0fbd9d31"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.93"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631569015d0d8d54e6c241733f944042623ab6df7bc3be7466874b05fcdb1c5f"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -1061,7 +1208,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libloading 0.7.4",
"winapi",
]
@@ -1165,22 +1312,13 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
[[package]]
name = "digest"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
- "block-buffer 0.10.4",
+ "block-buffer",
"crypto-common",
]
@@ -1285,7 +1423,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44fe60b864b6544ad211d4053ced474a9b9d2c8d66b77f01d6c6bcfed10c6bf0"
dependencies = [
- "phf 0.11.1",
+ "phf",
]
[[package]]
@@ -1310,9 +1448,9 @@ dependencies = [
[[package]]
name = "enumflags2"
-version = "0.7.5"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
+checksum = "0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b"
dependencies = [
"enumflags2_derive",
"serde",
@@ -1320,13 +1458,13 @@ dependencies = [
[[package]]
name = "enumflags2_derive"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+checksum = "9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
@@ -1407,9 +1545,9 @@ dependencies = [
[[package]]
name = "euclid"
-version = "0.22.8"
+version = "0.22.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8b5875b64eb55f4b554f9d0e6413da078d96374974d8bb3bed5f02d55451ce"
+checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
dependencies = [
"num-traits",
]
@@ -1448,6 +1586,16 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+[[package]]
+name = "fancy-regex"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+dependencies = [
+ "bit-set",
+ "regex",
+]
+
[[package]]
name = "fastrand"
version = "1.9.0"
@@ -1497,7 +1645,7 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"windows-sys 0.45.0",
]
@@ -1542,7 +1690,7 @@ dependencies = [
"futures-sink",
"nanorand",
"pin-project",
- "spin 0.9.6",
+ "spin 0.9.7",
]
[[package]]
@@ -1611,9 +1759,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -1626,9 +1774,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -1636,15 +1784,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -1653,9 +1801,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
@@ -1674,26 +1822,26 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
name = "futures-sink"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-timer"
@@ -1703,9 +1851,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -1746,9 +1894,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -1808,7 +1956,7 @@ version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"libgit2-sys",
"log",
@@ -1862,7 +2010,7 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"ignore",
"walkdir",
]
@@ -1902,7 +2050,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gpu-alloc-types",
]
@@ -1912,7 +2060,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -1934,7 +2082,7 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gpu-descriptor-types",
"hashbrown 0.12.3",
]
@@ -1945,7 +2093,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
@@ -2033,7 +2181,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"com-rs",
"libc",
"libloading 0.7.4",
@@ -2133,9 +2281,9 @@ dependencies = [
[[package]]
name = "http_req"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2b47a95070b135fd0e17a307ab18af91e15d4df99cc59e046fafb904404926"
+checksum = "5825a38a94c3aff23ea7f60572726829ef055ca02fc64899c3e2e7db2ce4f03f"
dependencies = [
"native-tls",
"unicase",
@@ -2212,7 +2360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d"
dependencies = [
"android_system_properties",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
@@ -2297,7 +2445,7 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"inotify-sys",
"libc",
]
@@ -2351,19 +2499,19 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.7.1"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "is-terminal"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
+checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
- "rustix 0.36.11",
+ "rustix 0.37.6",
"windows-sys 0.45.0",
]
@@ -2470,7 +2618,7 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
]
@@ -2594,10 +2742,11 @@ dependencies = [
[[package]]
name = "libssh-rs"
-version = "0.1.7"
-source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "411ad6d6b81fd5544f9a9b3b25a9da5533112880fff69b3b659d271a70ec4797"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libssh-rs-sys",
"openssl-sys",
"thiserror",
@@ -2606,7 +2755,8 @@ dependencies = [
[[package]]
name = "libssh-rs-sys"
version = "0.1.3"
-source = "git+https://github.com/wez/libssh-rs.git#44a08196acd1a2277ec7ebce2a47618775f3c59c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d592a55d4efe34f3e437e3f74e32b6d60d54aa3270fe2925840173c7d8648a42"
dependencies = [
"cc",
"libz-sys",
@@ -2681,9 +2831,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "linux-raw-sys"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "lock_api"
@@ -2854,7 +3004,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"block",
"core-graphics-types",
"foreign-types",
@@ -2965,11 +3115,12 @@ dependencies = [
"async-trait",
"base64 0.21.0",
"bintree",
- "bitflags",
+ "bitflags 1.3.2",
"chrono",
"config",
"crossbeam",
"downcast-rs",
+ "fancy-regex",
"filedescriptor",
"finl_unicode",
"flume",
@@ -2990,8 +3141,8 @@ dependencies = [
"procinfo",
"promise",
"rangeset",
- "regex",
"serde",
+ "serial",
"shell-words",
"smol",
"terminfo",
@@ -3031,7 +3182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
dependencies = [
"bit-set",
- "bitflags",
+ "bitflags 1.3.2",
"codespan-reporting",
"hexf-parse",
"indexmap",
@@ -3086,7 +3237,7 @@ version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cc",
"cfg-if",
"libc",
@@ -3099,7 +3250,7 @@ version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
@@ -3112,7 +3263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
dependencies = [
"autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.6.5",
@@ -3125,7 +3276,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"libc",
"memoffset 0.7.1",
@@ -3167,7 +3318,7 @@ version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crossbeam-channel",
"filetime",
"fsevent-sys",
@@ -3356,19 +3507,13 @@ version = "11.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
[[package]]
name = "openssl"
version = "0.10.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
@@ -3384,9 +3529,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "300.0.13+3.0.8"
+version = "300.1.0+3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00789a63ec8951fcda9adb0f2258582afdcfe1b2435e332d3a859896f814f0a"
+checksum = "8596d772e98cb74f66ca3e86d7bf90d0464c0eb3da9f7d84798ee841ecfc9322"
dependencies = [
"cc",
]
@@ -3467,7 +3612,7 @@ dependencies = [
"cfg-if",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"winapi",
]
@@ -3480,7 +3625,7 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"windows-sys 0.45.0",
]
@@ -3502,9 +3647,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7"
+checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122"
dependencies = [
"thiserror",
"ucd-trie",
@@ -3512,9 +3657,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7"
+checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15"
dependencies = [
"pest",
"pest_generator",
@@ -3522,35 +3667,26 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b"
+checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
name = "pest_meta"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80"
+checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e"
dependencies = [
"once_cell",
"pest",
- "sha2 0.10.6",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_shared 0.10.0",
+ "sha2",
]
[[package]]
@@ -3560,7 +3696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
dependencies = [
"phf_macros",
- "phf_shared 0.11.1",
+ "phf_shared",
]
[[package]]
@@ -3570,7 +3706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770"
dependencies = [
"phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared",
]
[[package]]
@@ -3579,7 +3715,7 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
dependencies = [
- "phf_shared 0.11.1",
+ "phf_shared",
"rand",
]
@@ -3590,21 +3726,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
dependencies = [
"phf_generator",
- "phf_shared 0.11.1",
+ "phf_shared",
"proc-macro2",
"quote",
"syn 1.0.109",
]
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
[[package]]
name = "phf_shared"
version = "0.11.1"
@@ -3713,7 +3840,7 @@ version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crc32fast",
"flate2",
"miniz_oxide 0.6.2",
@@ -3726,7 +3853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa"
dependencies = [
"autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if",
"concurrent-queue",
"libc",
@@ -3740,7 +3867,7 @@ name = "portable-pty"
version = "0.8.1"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"downcast-rs",
"filedescriptor",
"futures",
@@ -3807,9 +3934,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.53"
+version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
+checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564"
dependencies = [
"unicode-ident",
]
@@ -3863,7 +3990,7 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"getopts",
"memchr",
"unicase",
@@ -3967,7 +4094,7 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
name = "rangeset"
version = "0.1.0"
dependencies = [
- "criterion",
+ "criterion 0.3.6",
"num",
]
@@ -3985,14 +4112,14 @@ version = "10.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
name = "raw-window-handle"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rayon"
@@ -4034,7 +4161,16 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
@@ -4044,7 +4180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"thiserror",
]
@@ -4079,9 +4215,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
[[package]]
name = "reqwest"
-version = "0.11.15"
+version = "0.11.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949"
+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
dependencies = [
"base64 0.21.0",
"bytes",
@@ -4185,7 +4321,7 @@ version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
@@ -4221,7 +4357,7 @@ version = "0.36.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno 0.2.8",
"io-lifetimes",
"libc",
@@ -4231,15 +4367,15 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.3"
+version = "0.37.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2"
+checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno 0.3.0",
"io-lifetimes",
"libc",
- "linux-raw-sys 0.3.0",
+ "linux-raw-sys 0.3.1",
"windows-sys 0.45.0",
]
@@ -4297,9 +4433,9 @@ version = "2.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"libc",
"security-framework-sys",
]
@@ -4310,7 +4446,7 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
dependencies = [
- "core-foundation-sys 0.8.3",
+ "core-foundation-sys 0.8.4",
"libc",
]
@@ -4340,9 +4476,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.158"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
dependencies = [
"serde_derive",
]
@@ -4359,20 +4495,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.158"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
name = "serde_json"
-version = "1.0.94"
+version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
dependencies = [
"itoa",
"ryu",
@@ -4387,7 +4523,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -4502,20 +4638,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "digest",
]
[[package]]
@@ -4526,7 +4649,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.6",
+ "digest",
]
[[package]]
@@ -4563,16 +4686,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-[[package]]
-name = "signal-hook"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
[[package]]
name = "signal-hook"
version = "0.3.15"
@@ -4640,7 +4753,7 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"dlib",
"lazy_static",
"log",
@@ -4742,9 +4855,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
-version = "0.9.6"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34"
+checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef"
dependencies = [
"lock_api",
]
@@ -4755,7 +4868,7 @@ version = "0.2.0+1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"num-traits",
]
@@ -4787,7 +4900,7 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"libssh2-sys",
"parking_lot 0.11.2",
@@ -4826,7 +4939,7 @@ checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1"
name = "strip-ansi-escapes"
version = "0.1.0"
dependencies = [
- "clap 4.1.13",
+ "clap 4.2.1",
"termwiz",
]
@@ -4855,9 +4968,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.10"
+version = "2.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
dependencies = [
"proc-macro2",
"quote",
@@ -4925,15 +5038,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall",
- "rustix 0.36.11",
- "windows-sys 0.42.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.37.6",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -4974,7 +5087,7 @@ dependencies = [
"dirs",
"fnv",
"nom",
- "phf 0.11.1",
+ "phf",
"phf_codegen",
]
@@ -5008,10 +5121,11 @@ version = "0.22.0"
dependencies = [
"anyhow",
"base64 0.21.0",
- "bitflags",
+ "bitflags 2.0.2",
"cassowary",
- "criterion",
+ "criterion 0.4.0",
"env_logger",
+ "fancy-regex",
"filedescriptor",
"finl_unicode",
"fixedbitset",
@@ -5023,18 +5137,17 @@ dependencies = [
"libc",
"log",
"memmem",
- "nix 0.24.3",
+ "nix 0.26.2",
"num-derive",
"num-traits",
"ordered-float",
"pest",
"pest_derive",
- "phf 0.10.1",
- "regex",
+ "phf",
"semver 0.11.0",
"serde",
- "sha2 0.9.9",
- "signal-hook 0.1.17",
+ "sha2",
+ "signal-hook",
"siphasher",
"tempfile",
"terminfo",
@@ -5063,6 +5176,7 @@ dependencies = [
"terminfo",
"termwiz",
"wezterm-dynamic",
+ "wezterm-input-types",
]
[[package]]
@@ -5102,7 +5216,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.10",
+ "syn 2.0.13",
]
[[package]]
@@ -5236,14 +5350,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.26.0"
+version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
@@ -5254,13 +5367,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.13",
]
[[package]]
@@ -5673,7 +5786,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"downcast-rs",
"libc",
"nix 0.24.3",
@@ -5722,7 +5835,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"wayland-client",
"wayland-commons",
"wayland-scanner",
@@ -5770,12 +5883,14 @@ name = "wezterm"
version = "0.1.0"
dependencies = [
"anyhow",
+ "cc",
"chrono",
- "clap 4.1.13",
+ "clap 4.2.1",
"clap_complete",
"clap_complete_fig",
"codec",
"config",
+ "embed-resource",
"env-bootstrap",
"filedescriptor",
"hostname",
@@ -5820,7 +5935,7 @@ dependencies = [
"mac_address",
"once_cell",
"serde",
- "sha2 0.9.9",
+ "sha2",
"tempfile",
"thiserror",
"uuid",
@@ -5945,11 +6060,11 @@ version = "0.1.0"
dependencies = [
"anyhow",
"benchmarking",
- "bitflags",
+ "bitflags 1.3.2",
"bytemuck",
"cc",
"chrono",
- "clap 4.1.13",
+ "clap 4.2.1",
"codec",
"colorgrad",
"config",
@@ -5991,7 +6106,6 @@ dependencies = [
"regex",
"serde",
"serde_json",
- "serial",
"shared_library",
"shlex",
"smol",
@@ -6033,7 +6147,7 @@ name = "wezterm-gui-subcommands"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.1.13",
+ "clap 4.2.1",
"config",
]
@@ -6041,7 +6155,7 @@ dependencies = [
name = "wezterm-input-types"
version = "0.1.0"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"euclid",
"lazy_static",
"serde",
@@ -6054,8 +6168,10 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async_ossl",
- "clap 4.1.13",
+ "cc",
+ "clap 4.2.1",
"config",
+ "embed-resource",
"env-bootstrap",
"libc",
"log",
@@ -6112,9 +6228,9 @@ dependencies = [
"assert_fs",
"async_ossl",
"base64 0.21.0",
- "bitflags",
+ "bitflags 1.3.2",
"camino",
- "clap 4.1.13",
+ "clap 4.2.1",
"dirs-next",
"env_logger",
"filedescriptor",
@@ -6144,8 +6260,9 @@ name = "wezterm-term"
version = "0.1.0"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"csscolorparser",
+ "downcast-rs",
"env_logger",
"finl_unicode",
"hex",
@@ -6217,7 +6334,7 @@ checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
dependencies = [
"arrayvec",
"bit-vec",
- "bitflags",
+ "bitflags 1.3.2",
"codespan-reporting",
"fxhash",
"log",
@@ -6242,7 +6359,7 @@ dependencies = [
"arrayvec",
"ash",
"bit-set",
- "bitflags",
+ "bitflags 1.3.2",
"block",
"core-graphics-types",
"d3d12",
@@ -6280,7 +6397,7 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"js-sys",
"web-sys",
]
@@ -6341,7 +6458,7 @@ dependencies = [
"async-io",
"async-task",
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"bytes",
"cgl",
"clipboard-win",
@@ -6616,7 +6733,7 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0faeb4d7e2d54fff4a0584f61297e86b106914af2029778de7b427f72564d6c5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"quick-xml 0.22.0",
"x11",
@@ -6627,7 +6744,7 @@ name = "xcb-imdkit"
version = "0.2.0"
source = "git+https://github.com/wez/xcb-imdkit-rs.git?branch=hangfix#c6859ab2b8a233ca5dda5e8e4f1634d34ce9c85c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cc",
"lazy_static",
"pkg-config",
@@ -6774,9 +6891,9 @@ dependencies = [
[[package]]
name = "zune-inflate"
-version = "0.2.52"
+version = "0.2.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ca8ee3897e213bf74d46641942575fb9b4bd9933cbce0b40eb320836da67e0"
+checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
dependencies = [
"simd-adler32",
]
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix
index 899c599c23..26c35d50d2 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix
@@ -31,14 +31,14 @@
rustPlatform.buildRustPackage rec {
pname = "wezterm";
- version = "20230326-111934-3666303c";
+ version = "20230408-112425-69ae8472";
src = fetchFromGitHub {
owner = "wez";
repo = pname;
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-tgJUnQKVdLJKohda9oy9dwz53OiK4O0A9YlsI0o+meY=";
+ hash = "sha256-Uk6I/JtSkGCQGG95DDD1hsu40X00/k5d44WP3OJ+rn4=";
};
postPatch = ''
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"image-0.24.5" = "sha256-fTajVwm88OInqCPZerWcSAm1ga46ansQ3EzAmbT58Js=";
- "libssh-rs-0.1.7" = "sha256-pLaWKk/iGy7FfoVafpPYzErnKudxeIWzssWv2Zlm58s=";
"xcb-imdkit-0.2.0" = "sha256-QOT9HLlA26DVPUF4ViKH2ckexUsu45KZMdJwoUhW+hA=";
};
};
@@ -136,6 +135,6 @@ rustPlatform.buildRustPackage rec {
description = "GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
homepage = "https://wezfurlong.org/wezterm";
license = licenses.mit;
- maintainers = with maintainers; [ SuperSandro2000 ];
+ maintainers = with maintainers; [ SuperSandro2000 mimame ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix
index 4dfddf3e5b..5bd4f169fc 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/cz-cli/node-composition.nix
@@ -2,7 +2,7 @@
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix
index dfbb4e7db9..f5920d198a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git, git-annex }:
python3.pkgs.buildPythonApplication rec {
pname = "datalad";
- version = "0.16.5";
+ version = "0.18.3";
src = fetchFromGitHub {
owner = "datalad";
repo = pname;
rev = version;
- hash = "sha256-F5UFW0/XqntrHclpj3TqoAwuHJbiiv5a7/4MnFoJ1dE=";
+ hash = "sha256-vqO37o5NxQk+gHfvhM1I2ea9/q9ZaLWkDEyPYJKEPcs";
};
nativeBuildInputs = [ installShellFiles git ];
@@ -24,6 +24,9 @@ python3.pkgs.buildPythonApplication rec {
patool
tqdm
annexremote
+ looseversion
+ setuptools
+ git-annex
# downloaders-extra
# requests-ftp # not in nixpkgs yet
@@ -66,11 +69,14 @@ python3.pkgs.buildPythonApplication rec {
installShellCompletion --cmd datalad \
--bash <($out/bin/datalad shell-completion) \
--zsh <($out/bin/datalad shell-completion)
+ wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH"
'';
# no tests
doCheck = false;
+ pythonImportsCheck = [ "datalad" ];
+
meta = with lib; {
description = "Keep code, data, containers under control with git and git-annex";
homepage = "https://www.datalad.org";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
index 25cce789bc..b955d2081f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix
@@ -1,17 +1,11 @@
{ bash
, brotli
, buildGoModule
-, common-updater-scripts
-, coreutils
-, curl
-, fetchurl
, forgejo
, git
, gzip
-, jq
, lib
, makeWrapper
-, nix
, nixosTests
, openssh
, pam
@@ -20,19 +14,42 @@
, xorg
, runCommand
, stdenv
+, fetchFromGitea
+, buildNpmPackage
, writeShellApplication
}:
+let
+ frontend = buildNpmPackage rec {
+ pname = "forgejo-frontend";
+ inherit (forgejo) src version;
+
+ npmDepsHash = "sha256-dB/uBuS0kgaTwsPYnqklT450ejLHcPAqBdDs3JT8Uxg=";
+
+ patches = [
+ ./package-json-npm-build-frontend.patch
+ ];
+
+ # override npmInstallHook
+ installPhase = ''
+ mkdir $out
+ cp -R ./public $out/
+ '';
+ };
+in
buildGoModule rec {
pname = "forgejo";
- version = "1.19.0-3";
+ version = "1.19.2-0";
- src = fetchurl {
- url = "https://codeberg.org/forgejo/forgejo/releases/download/v${version}/forgejo-src-${version}.tar.gz";
- hash = "sha256-u27DDw3JUtVJ2nvkKfaGzpYP8bpRnwc1LUVra8Epkjc=";
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "forgejo";
+ repo = "forgejo";
+ rev = "v${version}";
+ hash = "sha256-JRCEHaqRzJNRTu5OS43UmCg+vW8G/1Xwweuo5vuFO+s=";
};
- vendorHash = null;
+ vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec=";
subPackages = [ "." ];
@@ -59,15 +76,25 @@ buildGoModule rec {
"-X 'main.Tags=${lib.concatStringsSep " " tags}'"
];
+ preBuild = ''
+ go run build/merge-forgejo-locales.go
+ '';
+
postInstall = ''
mkdir $data
- cp -R ./{public,templates,options} $data
+ cp -R ./{templates,options} ${frontend}/public $data
mkdir -p $out
cp -R ./options/locale $out/locale
wrapProgram $out/bin/gitea \
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]}
'';
+ # $data is not available in go-modules.drv and preBuild isn't needed
+ overrideModAttrs = (_: {
+ postPatch = null;
+ preBuild = null;
+ });
+
passthru = {
data-compressed = runCommand "forgejo-data-compressed" {
nativeBuildInputs = [ brotli xorg.lndir ];
@@ -82,44 +109,6 @@ buildGoModule rec {
'';
tests = nixosTests.forgejo;
-
- updateScript = lib.getExe (writeShellApplication {
- name = "update-forgejo";
- runtimeInputs = [
- common-updater-scripts
- coreutils
- curl
- jq
- nix
- ];
- text = ''
- releases=$(curl "https://codeberg.org/api/v1/repos/forgejo/forgejo/releases?draft=false&pre-release=false&limit=1" \
- --silent \
- --header "accept: application/json")
-
- stable=$(jq '.[0]
- | .tag_name[1:] as $version
- | ("forgejo-src-\($version).tar.gz") as $filename
- | { $version, html_url } + (.assets | map(select(.name | startswith($filename)) | {(.name | split(".") | last): .browser_download_url}) | add)' \
- <<< "$releases")
-
- checksum_url=$(jq -r .sha256 <<< "$stable")
- release_url=$(jq -r .html_url <<< "$stable")
- version=$(jq -r .version <<< "$stable")
-
- if [[ "${version}" = "$version" ]]; then
- echo "No new version found (already at $version)"
- exit 0
- fi
-
- echo "Release: $release_url"
-
- sha256=$(curl "$checksum_url" --silent | cut --delimiter " " --fields 1)
- sri_hash=$(nix hash to-sri --type sha256 "$sha256")
-
- update-source-version "${pname}" "$version" "$sri_hash"
- '';
- });
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch
new file mode 100644
index 0000000000..57e2b7ec69
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/package-json-npm-build-frontend.patch
@@ -0,0 +1,14 @@
+diff --git a/package.json b/package.json
+index 57dcfc2f7..c9f23dbf7 100644
+--- a/package.json
++++ b/package.json
+@@ -79,5 +79,8 @@
+ "defaults",
+ "not ie > 0",
+ "not ie_mob > 0"
+- ]
++ ],
++ "scripts": {
++ "build": "node_modules/.bin/webpack"
++ }
+ }
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix
index a01dc126cd..2f79120759 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "2.27.0";
+ version = "2.28.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- hash = "sha256-WjKHV/GfoPFRTKUJy7ht1H6zbt+EqJk6e9ysjaAkelw=";
+ hash = "sha256-FceyGNQwA6SFg97FtX4ATlevpLzG/FPVSoKBznWIfC8=";
};
- vendorHash = "sha256-+8/cA0UxyVu7nyLhHYBWmn8Vs0O/EYepqTAOVU4gwt4=";
+ vendorHash = "sha256-iTPdOolvWINUSSYiPZAwn5ZF44x/x1tIWnKUHAn8ITA=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix
index 22d9ada544..ebf123d415 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "ghorg";
- version = "1.9.1";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "gabrie30";
repo = "ghorg";
rev = "v${version}";
- sha256 = "sha256-1wtpbwTO8MdEvcdo5ImNuiNOtyPfaKFpr2Rezac4ofU=";
+ sha256 = "sha256-J/oZrtm/Bs4SU/Wl9LEH0kMxkOEXR2g/Bod5QFoCudU=";
};
doCheck = false;
- vendorSha256 = null;
+ vendorHash = null;
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix
index b9bfc6f745..80704e49a2 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "sha256-dUW5eZODHkhhzC21uA9jFnwb9Q+9/t7o0K/nGbsZH84=";
+ sha256 = "sha256-ggTx5Kz9cRqOqxxzERv4altf7m1GlreGgOiYCnHyJks=";
};
- vendorHash = "sha256-Q3sIXt8srGI1ZFUdQ+x6I6Tc07HqyH0Hyu4kBe64uRs=";
+ vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix
index 18d4d58fd6..1e935a900e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cinnabar/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-cinnabar";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "glandium";
repo = "git-cinnabar";
rev = version;
- sha256 = "IV7K/49IN2HMek247GWr5ybZRozHsnCm8RItC9sqFXc=";
+ sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY=";
fetchSubmodules = true;
};
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- sha256 = "YWhGAp64GAlySgUvDrD6qaNlc09swe1xCkvEpFR1ytg=";
+ sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw=";
};
ZSTD_SYS_USE_PKG_CONFIG = true;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix
index 06cf6b3c28..a843b52433 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-dive/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-dive";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "gitext-rs";
repo = "git-dive";
rev = "v${version}";
- hash = "sha256-LOvrPId/GBWPq73hdCdaMNKH7K7cmGmlkepkQiwGC60=";
+ hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso=";
};
- cargoHash = "sha256-JDybjIUjj9ivJ5hJJB9bvGB18TdwEXQZfKfXPkyopK0=";
+ cargoHash = "sha256-Z3TgVunC/qNzUe0X9xIg3fTFXFk2w9yDA+EskSCg0Qo=";
nativeBuildInputs = [
pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix
index b6595a7278..b6b8b6f941 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-ignore/default.nix
@@ -1,36 +1,43 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, installShellFiles
+, stdenv
+, darwin
+}:
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
pname = "git-ignore";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "sondr3";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Bfr+4zDi6QqirlqccW1jU95eb4q82ZFG9LtT2mCPYLc=";
+ hash = "sha256-kIRuoY0dM2t+aY4iYdik9gUpG+81sDiJLD11Bmx68FI=";
};
- cargoSha256 = "sha256-ehEUI4M2IxqS6QhyqOncwP+w6IGbIlSFNIP/FEVH/JI=";
+ cargoHash = "sha256-6sb+OW5VtA6vY6fDtsaZePZD53ehH7QawxJJlUNsrnM=";
- nativeBuildInputs = [ pkg-config installShellFiles ];
- buildInputs = [ openssl ]
- ++ lib.optionals stdenv.isDarwin [
+ nativeBuildInputs = [
+ installShellFiles
+ ];
+
+ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
postInstall = ''
- installManPage assets/git-ignore.1
- # There's also .elv and .ps1 completion files but I don't know where to install those
- installShellCompletion assets/git-ignore.{bash,fish} --zsh assets/_git-ignore
+ assets=$releaseDir/../assets
+ installManPage $assets/git-ignore.1
+ installShellCompletion $assets/git-ignore.{bash,fish} --zsh $assets/_git-ignore
'';
meta = with lib; {
description = "Quickly and easily fetch .gitignore templates from gitignore.io";
homepage = "https://github.com/sondr3/git-ignore";
+ changelog = "https://github.com/sondr3/git-ignore/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
- maintainers = [ ];
+ maintainers = with maintainers; [ figsoda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix
index d449e7f44e..f1b40267d0 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-machete/default.nix
@@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.16.3";
+ version = "3.17.1";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
- hash = "sha256-pd+ZK34dPSCwl8bOwH388NZ6QNIlU5TqL7EabsWw7kk=";
+ hash = "sha256-UpByKN2L0g42ProwHNRxPw6ggxyDVTUZfWRF+TpUVKc=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix
index 69b1f299f5..ec86a344fb 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-stack/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-stack";
- version = "0.10.14";
+ version = "0.10.15";
src = fetchFromGitHub {
owner = "gitext-rs";
repo = "git-stack";
rev = "v${version}";
- hash = "sha256-DAvvVI3npHM7ln/EAr0RjtUCqCoKx9QHsCw69F8C8p4=";
+ hash = "sha256-DUr3kD27wWuWuArVVhGFYHmX7cA5+J1/dGsZIuWh30c=";
};
- cargoHash = "sha256-KDVHSCQx7qIS/Gwx/wlpdIMgirPSfG535dvu33gjF7c=";
+ cargoHash = "sha256-4p6vWVVHzjE66mnoXKbZJrh77q40OM49fHwCFCgE0W4=";
buildInputs = lib.optionals stdenv.isDarwin [
Security
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix
index 23b8fd95cf..39b054d2a3 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-subrepo/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-subrepo";
- version = "0.4.5";
+ version = "0.4.6";
src = fetchFromGitHub {
owner = "ingydotnet";
repo = "git-subrepo";
rev = version;
- sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM=";
+ sha256 = "sha256-83N0Ek6DawUrOc6s2Utzi8776bX4UTGS/a/OffkV44Y=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix
index ef1b8db97b..8cb1faf97f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix
@@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.39.2";
+ version = "2.40.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "R1918Tc7LNTkOHBhhRdZZtXBH2jE2x5IwmJXxD3c8tY=";
+ hash = "sha256-sXpZj79Ycp7xO1d0ZeuTstSE3xIBUYtwi1BE/2I79G0=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -185,12 +185,14 @@ stdenv.mkDerivation (finalAttrs: {
# Fix references to the perl, sed, awk and various coreutil binaries used by
# shell scripts that git calls (e.g. filter-branch)
+ # and completion scripts
SCRIPT="$(cat <<'EOS'
BEGIN{
@a=(
'${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
'${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
- '${coreutils}/bin/wc', '${coreutils}/bin/tr'
+ '${coreutils}/bin/wc', '${coreutils}/bin/tr',
+ '${coreutils}/bin/ls'
${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"}
);
}
@@ -201,7 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
EOS
)"
perl -0777 -i -pe "$SCRIPT" \
- $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}
+ $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} \
+ $out/share/bash-completion/completions/{git,gitk}
# Also put git-http-backend into $PATH, so that we can use smart
@@ -214,8 +217,6 @@ stdenv.mkDerivation (finalAttrs: {
--set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-cvsimport \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
- wrapProgram $out/libexec/git-core/git-add--interactive \
- --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-archimport \
--set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}"
wrapProgram $out/libexec/git-core/git-instaweb \
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
index b7dd682e24..9d78f7793e 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
@@ -19,12 +19,12 @@
buildGoModule rec {
pname = "gitea";
- version = "1.19.0";
+ version = "1.19.2";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz";
- hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ=";
+ hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
index 55ec71fd6a..16fdebe670 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix
@@ -3,6 +3,7 @@
, fetchurl
, autoPatchelfHook
, wrapGAppsHook
+, makeWrapper
, gnome
, libsecret
, git
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
- wrapGAppsHook
+ (wrapGAppsHook.override { inherit makeWrapper; })
];
buildInputs = [
@@ -61,6 +62,12 @@ stdenv.mkDerivation rec {
ln -sf $out/opt/${pname} $out/bin/${pname}
'';
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
+ )
+ '';
+
runtimeDependencies = [
(lib.getLib systemd)
];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 2b7533ded6..d92a126817 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
@@ -10,24 +10,24 @@ with lib;
let
pname = "gitkraken";
- version = "9.2.1";
+ version = "9.3.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "sha256-JyfbCFh76b2ZWQ8J1xhsp8LYeFGdgJcUDgBCJWHf0Rk=";
+ sha256 = "sha256-OX/taX+eYHPWTNNGfZhoiBEG8pFSnjCaTshM+z6MhDU=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
- sha256 = "sha256-sXWgxl+j78r/OhkMkQMQ6iUPz+SY+QDS4pvLErJTeRQ=";
+ sha256 = "sha256-miUcV35HX73b5YnwMnkqYdQtxfSHJaMdMcgVVBkZs6A=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
- sha256 = "sha256-1IsNJMfqpi+s2bHkB6Uo6FacvuRdLpkF+ctmi5b2Lto=";
+ sha256 = "sha256-yAwvuwxtGQh7/bV/7wShdCVHgZCtRCfmXrdT4dI6+cM=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
index 675e1ab619..ddf0c75569 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "15.10.2",
- "repo_hash": "sha256-XjL1D2DschFn64D2KcTQP6pppecIN26LrWMJPUfYvgI=",
- "yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",
+ "version": "15.11.0",
+ "repo_hash": "sha256-oLdw6hDn7DLWvAt2RoHkixXCkzKm0dt7iid65MPH7kM=",
+ "yarn_hash": "0b4k43512p8lm1bmiq5piv8wg1f0x2h9q8pgwnms7b2xb4sfn0g1",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v15.10.2-ee",
+ "rev": "v15.11.0-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "15.10.2",
- "GITLAB_PAGES_VERSION": "15.10.2",
+ "GITALY_SERVER_VERSION": "15.11.0",
+ "GITLAB_PAGES_VERSION": "15.11.0",
"GITLAB_SHELL_VERSION": "14.18.0",
- "GITLAB_WORKHORSE_VERSION": "15.10.2"
+ "GITLAB_WORKHORSE_VERSION": "15.11.0"
}
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
index c83478f05a..8e20cc8a79 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
+, ruby_2_7, tzdata, git, nettools, nixosTests, nodejs, openssl
, gitlabEnterprise ? false, callPackage, yarn
, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config
}:
@@ -17,7 +17,8 @@ let
rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}";
- inherit ruby;
+ # GitLab doesn't support Ruby 3 https://gitlab.com/groups/gitlab-org/-/epics/5149
+ ruby = ruby_2_7;
gemdir = ./rubyEnv;
gemset =
let x = import (gemdir + "/gemset.nix") src;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index e5591cd529..f247c46146 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -18,7 +18,7 @@ gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 9.15'
-gem 'google-protobuf', '~> 3.22.2'
+gem 'google-protobuf', '~> 3.22.3'
gem 'nokogiri', '~> 1.14'
# Rails is currently blocked on the upgrade to the new major version for Redis,
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 43665f1e26..bd66bc20a8 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
with_env (= 1.1.0)
xml-simple (~> 1.1.5)
gitlab-markup (1.8.1)
- google-protobuf (3.22.2)
+ google-protobuf (3.22.3)
googleapis-common-protos-types (1.4.0)
google-protobuf (~> 3.14)
grpc (1.42.0)
@@ -190,7 +190,7 @@ DEPENDENCIES
gitlab-labkit (~> 0.31, >= 0.31.1)
gitlab-license_finder
gitlab-markup (~> 1.8.0)
- google-protobuf (~> 3.22.2)
+ google-protobuf (~> 3.22.3)
grpc (~> 1.42.0)
licensee (~> 9.15)
nokogiri (~> 1.14)
@@ -204,4 +204,4 @@ DEPENDENCIES
sentry-raven (~> 3.1)
BUNDLED WITH
- 2.4.8
+ 2.4.11
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
index dbd5e9bf8a..5a9a542c22 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
- version = "15.10.2";
+ version = "15.11.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-18BmECQqzwwxl7nY5+Bi4oyA2EPd5HqzJdgVPV8J1OM=";
+ sha256 = "sha256-kpqSDtj9ctS5PVWTJv5z/HVXYjIlP6CU/FGgueXwKic=";
};
- vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
+ vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index d95e022a3b..7d37a3af1f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -220,10 +220,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
+ sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9";
type = "gem";
};
- version = "3.22.2";
+ version = "3.22.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index a23599a7c4..2a1ceed97a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
- version = "15.10.2";
+ version = "15.11.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- sha256 = "sha256-h3Q8dOz61sRhDxRlcPTP+yhP/ntTTqggyAFvTgu6m6k=";
+ sha256 = "sha256-nYpDyLg9nhl6EA0nwUzA+DFtyZVDnwplQTi1KJTwFbU=";
};
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 917554c0d8..d673f314be 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "15.10.2";
+ version = "15.11.0";
src = fetchFromGitLab {
owner = data.owner;
@@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
- vendorSha256 = "sha256-HG/QobU1LsFhbNF4lNq9tLwjcLD2l3TXnsJ+tjqc0Q8=";
+ vendorSha256 = "sha256-/snYfip1f0TCVoPk80thanYpbYsGjEd+CAcxIt289As=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 15995b07e1..5c2d39a669 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -20,11 +20,7 @@ gem 'bootsnap', '~> 1.16.0', require: false
# Pin openssl to match the version bundled with our supported Rubies.
# See https://stdgems.org/openssl/#gem-version.
gem 'openssl', '2.2.2'
-# This gem was originally bundled with Ruby 2.7, but is unbundled as of Ruby 3.
-# Since the latest version caused problems with GitLab, we pin this to an older
-# version for now.
-# See https://gitlab.com/gitlab-org/gitlab/-/issues/376417
-gem 'ipaddr', '1.2.2'
+gem 'ipaddr', '~> 1.2.5'
# Responders respond_to and respond_with
gem 'responders', '~> 3.0'
@@ -34,7 +30,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 2.74.1'
# Supported DBs
-gem 'pg', '~> 1.4.5'
+gem 'pg', '~> 1.4.6'
gem 'rugged', '~> 1.5'
gem 'grape-path-helpers', '~> 1.7.1'
@@ -49,12 +45,12 @@ gem 'declarative_policy', '~> 1.1.0'
gem 'devise', '~> 4.8.1'
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
-gem 'doorkeeper', '~> 5.5'
-gem 'doorkeeper-openid_connect', '~> 1.8'
+gem 'doorkeeper', '~> 5.6', '>= 5.6.6'
+gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.5'
gem 'rexml', '~> 3.2.5'
gem 'ruby-saml', '~> 1.13.0'
gem 'omniauth', '~> 2.1.0'
-gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-auth0', '~> 3.1'
gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md
@@ -75,7 +71,7 @@ gem 'openid_connect', '= 1.3.0'
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.21.3'
-gem 'jwt', '~> 2.1.0'
+gem 'jwt', '~> 2.5'
# Kerberos authentication. EE-only
gem 'gssapi', '~> 1.3.1', group: :kerberos
@@ -102,7 +98,7 @@ gem 'acme-client', '~> 2.0'
gem 'browser', '~> 5.3.1'
# OS detection for usage ping
-gem 'ohai', '~> 16.10'
+gem 'ohai', '~> 17.9'
# GPG
gem 'gpgme', '~> 2.0.22'
@@ -166,6 +162,7 @@ gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0'
gem 'google-apis-iam_v1', '~> 0.36.0'
gem 'google-apis-serviceusage_v1', '~> 0.28.0'
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0'
+gem 'google-apis-androidpublisher_v3', '~> 0.34.0'
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -177,9 +174,9 @@ 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.1'
+gem 'aws-sdk-core', '~> 3.171.0'
gem 'aws-sdk-cloudformation', '~> 1'
-gem 'aws-sdk-s3', '~> 1.119.1'
+gem 'aws-sdk-s3', '~> 1.121.0'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
@@ -200,7 +197,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16'
gem 'asciidoctor-kroki', '~> 0.8.0', require: false
gem 'rouge', '~> 4.1.0'
gem 'truncato', '~> 0.7.12'
-gem 'nokogiri', '~> 1.14.2'
+gem 'nokogiri', '~> 1.14.3'
# Calendar rendering
gem 'icalendar'
@@ -210,7 +207,7 @@ gem 'diffy', '~> 3.4'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
-gem 'rack', '~> 2.2.6', '>= 2.2.6.2'
+gem 'rack', '~> 2.2.6', '>= 2.2.6.4'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
@@ -230,7 +227,7 @@ gem 'acts-as-taggable-on', '~> 9.0'
gem 'sidekiq', '~> 6.5.7'
gem 'sidekiq-cron', '~> 1.8.0'
gem 'redis-namespace', '~> 1.9.0'
-gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch'
# Cron Parser
gem 'fugit', '~> 1.8.1'
@@ -252,6 +249,7 @@ gem 're2', '~> 1.6.0'
# Misc
+gem 'semver_dialects', '~> 1.2.1'
gem 'version_sorter', '~> 2.3'
# Export Ruby Regex to Javascript
@@ -289,12 +287,15 @@ gem 'ruby-fogbugz', '~> 0.3.0'
# Kubernetes integration
gem 'kubeclient', '~> 4.11.0'
+# AI
+gem 'ruby-openai', '~> 3.7'
+
# Sanitize user input
gem 'sanitize', '~> 6.0'
gem 'babosa', '~> 1.0.4'
# Sanitizes SVG input
-gem 'loofah', '~> 2.19.1'
+gem 'loofah', '~> 2.20.0'
# Working with license
# Detects the open source license the repository includes
@@ -333,9 +334,9 @@ gem 'rack-attack', '~> 6.6.1'
# Sentry integration
gem 'sentry-raven', '~> 3.1'
-gem 'sentry-ruby', '~> 5.1.1'
-gem 'sentry-rails', '~> 5.1.1'
-gem 'sentry-sidekiq', '~> 5.1.1'
+gem 'sentry-ruby', '~> 5.8.0'
+gem 'sentry-rails', '~> 5.8.0'
+gem 'sentry-sidekiq', '~> 5.8.0'
# PostgreSQL query parsing
#
@@ -347,7 +348,7 @@ gem 'gitlab-labkit', '~> 0.31.1'
gem 'thrift', '>= 0.16.0'
# I18n
-gem 'ruby_parser', '~> 3.19', require: false
+gem 'ruby_parser', '~> 3.20', require: false
gem 'rails-i18n', '~> 7.0'
gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -365,13 +366,13 @@ gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent'
gem 'snowplow-tracker', '~> 0.8.0'
# Metrics
-gem 'webrick', '~> 1.6.1', require: false
+gem 'webrick', '~> 1.8.1', require: false
gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
group :development do
- gem 'lefthook', '~> 1.3.3', require: false
+ gem 'lefthook', '~> 1.3.10', require: false
gem 'rubocop'
gem 'solargraph', '~> 0.47.2', require: false
@@ -451,23 +452,23 @@ end
group :test do
gem 'fuubar', '~> 2.2.0'
- gem 'rspec-retry', '~> 0.6.1'
+ gem 'rspec-retry', '~> 0.6.2'
gem 'rspec_profiling', '~> 0.0.6'
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', '~> 1.0', require: false
- gem 'capybara', '~> 3.35.3'
- gem 'capybara-screenshot', '~> 1.0.22'
- gem 'selenium-webdriver', '~> 3.142'
+ gem 'capybara', '~> 3.39'
+ gem 'capybara-screenshot', '~> 1.0.26'
+ gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7'
gem 'graphlyte', '~> 1.0.0'
gem 'shoulda-matchers', '~> 5.1.0', require: false
gem 'email_spec', '~> 2.2.0'
- gem 'webmock', '~> 3.9.1'
+ gem 'webmock', '~> 3.18.1'
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
- gem 'test-prof', '~> 1.0.7'
+ gem 'test-prof', '~> 1.2.1'
gem 'rspec_junit_formatter'
gem 'guard-rspec'
gem 'axe-core-rspec'
@@ -478,9 +479,7 @@ end
gem 'octokit', '~> 4.15'
-# Updating this gem version here is deprecated. See:
-# https://docs.gitlab.com/ee/development/emails.html#mailroom-gem-updates
-gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@@ -507,7 +506,7 @@ gem 'net-ntp'
gem 'ssh_data', '~> 1.3'
# Spamcheck GRPC protocol definitions
-gem 'spamcheck', '~> 1.0.0'
+gem 'spamcheck', '~> 1.3.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 15.9.0-rc3'
@@ -517,7 +516,7 @@ gem 'kas-grpc', '~> 0.0.2'
gem 'grpc', '~> 1.42.0'
-gem 'google-protobuf', '~> 3.22', '>= 3.22.2'
+gem 'google-protobuf', '~> 3.22', '>= 3.22.3'
gem 'toml-rb', '~> 2.2.0'
@@ -533,7 +532,7 @@ gem 'lograge', '~> 0.5'
gem 'grape_logging', '~> 1.8'
# DNS Lookup
-gem 'gitlab-net-dns', '~> 0.9.1'
+gem 'gitlab-net-dns', '~> 0.9.2'
# Countries list
gem 'countries', '~> 4.0.0'
@@ -546,6 +545,10 @@ gem 'lru_redux'
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
# See https://gitlab.com/gitlab-org/gitlab/issues/197386
+#
+# `config/initializers/mail_starttls_patch.rb` has also been patched to
+# fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is
+# released.
gem 'mail', '= 2.8.1'
gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index b624e39085..2940d61457 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -91,6 +91,13 @@ PATH
nokogiri (>= 1.4.4)
omniauth (~> 2.0)
+PATH
+ remote: vendor/gems/sidekiq-reliable-fetch
+ specs:
+ gitlab-sidekiq-fetcher (0.9.0)
+ json (>= 2.5)
+ sidekiq (~> 6.1)
+
GEM
remote: https://rubygems.org/
specs:
@@ -192,27 +199,27 @@ GEM
asciidoctor-plantuml (0.0.16)
asciidoctor (>= 2.0.17, < 3.0.0)
ast (2.4.2)
- atlassian-jwt (0.2.0)
- jwt (~> 2.1.0)
+ atlassian-jwt (0.2.1)
+ jwt (~> 2.1)
attr_required (1.0.1)
autoprefixer-rails (10.2.5.1)
execjs (> 0)
awesome_print (1.9.2)
awrence (1.2.1)
aws-eventstream (1.2.0)
- aws-partitions (1.730.0)
+ aws-partitions (1.733.0)
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.170.1)
+ aws-sdk-core (3.171.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.62.0)
+ aws-sdk-kms (1.63.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.119.1)
+ aws-sdk-s3 (1.121.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -267,15 +274,16 @@ GEM
bundler (>= 1.2.0, < 3)
thor (>= 0.18, < 2)
byebug (11.1.3)
- capybara (3.35.3)
+ capybara (3.39.0)
addressable
+ matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
- capybara-screenshot (1.0.22)
+ capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
carrierwave (1.3.3)
@@ -308,7 +316,7 @@ GEM
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.23.6)
- concurrent-ruby (1.2.0)
+ concurrent-ruby (1.2.2)
connection_pool (2.3.0)
cork (0.3.0)
colored2 (~> 3.1)
@@ -390,11 +398,11 @@ GEM
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
- doorkeeper (5.5.4)
+ doorkeeper (5.6.6)
railties (>= 5)
- doorkeeper-openid_connect (1.8.3)
+ doorkeeper-openid_connect (1.8.5)
doorkeeper (>= 5.5, < 5.7)
- json-jwt (>= 1.15.0)
+ jwt (>= 2.5)
dotenv (2.7.6)
dry-configurable (0.12.0)
concurrent-ruby (~> 1.0)
@@ -447,7 +455,7 @@ GEM
tzinfo
ethon (0.15.0)
ffi (>= 1.15.0)
- excon (0.90.0)
+ excon (0.99.0)
execjs (2.8.1)
expgen (0.1.1)
parslet
@@ -610,12 +618,12 @@ GEM
pg_query (~> 2.1)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.2.1)
- gitlab-mail_room (0.0.9)
+ gitlab-mail_room (0.0.23)
+ jwt (>= 2.0)
+ net-imap (>= 0.2.1)
+ oauth2 (>= 1.4.4, < 3)
gitlab-markup (1.9.0)
- gitlab-net-dns (0.9.1)
- gitlab-sidekiq-fetcher (0.9.0)
- json (>= 2.5)
- sidekiq (~> 6.1)
+ gitlab-net-dns (0.9.2)
gitlab-styles (10.0.0)
rubocop (~> 1.43.0)
rubocop-graphql (~> 0.18)
@@ -629,13 +637,15 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- globalid (1.0.0)
+ globalid (1.1.0)
activesupport (>= 5.0)
gon (6.4.0)
actionpack (>= 3.0.20)
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
+ google-apis-androidpublisher_v3 (0.34.0)
+ google-apis-core (>= 0.9.1, < 2.a)
google-apis-cloudbilling_v1 (0.21.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-cloudresourcemanager_v1 (0.31.0)
@@ -688,7 +698,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
- google-protobuf (3.22.2)
+ google-protobuf (3.22.3)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
@@ -818,7 +828,7 @@ GEM
parser (>= 2.5, != 2.5.1.1)
invisible_captcha (2.0.0)
rails (>= 5.0)
- ipaddr (1.2.2)
+ ipaddr (1.2.5)
ipaddress (0.8.3)
jaeger-client (1.1.0)
opentracing (~> 0.3)
@@ -847,7 +857,7 @@ GEM
uri_template (~> 0.7)
jsonpath (1.1.2)
multi_json
- jwt (2.1.0)
+ jwt (2.5.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
@@ -875,7 +885,7 @@ GEM
rest-client (~> 2.0)
launchy (2.5.0)
addressable (~> 2.7)
- lefthook (1.3.3)
+ lefthook (1.3.10)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@@ -910,7 +920,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
- loofah (2.19.1)
+ loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lookbook (1.5.3)
@@ -937,6 +947,7 @@ GEM
marginalia (1.11.1)
actionpack (>= 5.2)
activerecord (>= 5.2)
+ matrix (0.4.2)
memoist (0.16.2)
memory_profiler (1.0.1)
method_source (1.0.0)
@@ -993,7 +1004,7 @@ GEM
netrc (0.11.0)
nio4r (2.5.8)
no_proxy_fix (0.1.2)
- nokogiri (1.14.2)
+ nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
notiffany (0.1.3)
@@ -1011,16 +1022,16 @@ GEM
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
- ohai (16.10.6)
- chef-config (>= 12.8, < 17)
- chef-utils (>= 16.0, < 17)
+ ohai (17.9.0)
+ chef-config (>= 14.12, < 18)
+ chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
mixlib-cli (>= 1.7.0)
mixlib-config (>= 2.0, < 4.0)
mixlib-log (>= 2.0.1, < 4.0)
- mixlib-shellout (>= 2.0, < 4.0)
+ mixlib-shellout (~> 3.2, >= 3.2.5)
plist (~> 3.1)
train-core
wmi-lite (~> 1.0)
@@ -1036,8 +1047,9 @@ GEM
omniauth-atlassian-oauth2 (0.2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
- omniauth-auth0 (2.0.0)
- omniauth-oauth2 (~> 1.4)
+ omniauth-auth0 (3.1.0)
+ omniauth (~> 2)
+ omniauth-oauth2 (~> 1)
omniauth-azure-activedirectory-v2 (2.0.0)
omniauth-oauth2 (~> 1.8)
omniauth-dingtalk-oauth2 (1.0.1)
@@ -1122,7 +1134,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
- pg (1.4.5)
+ pg (1.4.6)
pg_query (2.2.1)
google-protobuf (>= 3.19.2)
plist (3.6.0)
@@ -1162,7 +1174,7 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.6.2)
- rack (2.2.6.2)
+ rack (2.2.6.4)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.6.1)
@@ -1307,7 +1319,7 @@ GEM
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
- rspec-retry (0.6.1)
+ rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.12.0)
rspec_junit_formatter (0.6.0)
@@ -1348,13 +1360,15 @@ GEM
multipart-post (~> 2.0)
ruby-magic (0.6.0)
mini_portile2 (~> 2.8)
+ ruby-openai (3.7.0)
+ httparty (>= 0.18.1)
ruby-progressbar (1.11.0)
ruby-saml (1.13.0)
nokogiri (>= 1.10.5)
rexml
ruby-statistics (3.0.0)
ruby2_keywords (0.0.5)
- ruby_parser (3.19.2)
+ ruby_parser (3.20.0)
sexp_processor (~> 4.16)
rubyntlm (0.6.3)
rubypants (0.2.0)
@@ -1389,18 +1403,19 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
- sentry-rails (5.1.1)
+ semver_dialects (1.2.1)
+ pastel (~> 0.8.0)
+ thor (~> 1.2.0)
+ tty-command (~> 0.10.1)
+ sentry-rails (5.8.0)
railties (>= 5.0)
- sentry-ruby-core (~> 5.1.1)
+ sentry-ruby (~> 5.8.0)
sentry-raven (3.1.2)
faraday (>= 1.0)
- sentry-ruby (5.1.1)
+ sentry-ruby (5.8.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
- sentry-ruby-core (= 5.1.1)
- sentry-ruby-core (5.1.1)
- concurrent-ruby
- sentry-sidekiq (5.1.1)
- sentry-ruby-core (~> 5.1.1)
+ sentry-sidekiq (5.8.0)
+ sentry-ruby (~> 5.8.0)
sidekiq (>= 3.0)
set (1.0.1)
settingslogic (2.0.9)
@@ -1455,7 +1470,7 @@ GEM
sorted_set (1.0.3)
rbtree
set (~> 1.0)
- spamcheck (1.0.0)
+ spamcheck (1.3.0)
grpc (~> 1.0)
spring (4.1.0)
spring-commands-rspec (1.0.4)
@@ -1505,7 +1520,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2)
execjs (>= 0.3.0, < 3)
- test-prof (1.0.7)
+ test-prof (1.2.1)
test_file_finder (0.1.4)
faraday (~> 1.0)
text (1.3.1)
@@ -1537,6 +1552,8 @@ GEM
htmlentities (~> 4.3.1)
nokogiri (>= 1.7.0, <= 2.0)
tty-color (0.6.0)
+ tty-command (0.10.1)
+ pastel (~> 0.8)
tty-cursor (0.7.1)
tty-markdown (0.7.2)
kramdown (>= 1.16.2, < 3.0)
@@ -1613,11 +1630,11 @@ GEM
webfinger (1.2.0)
activesupport
httpclient (>= 2.4)
- webmock (3.9.1)
- addressable (>= 2.3.6)
+ webmock (3.18.1)
+ addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
- webrick (1.6.1)
+ webrick (1.8.1)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
@@ -1660,8 +1677,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
- aws-sdk-core (~> 3.170.1)
- aws-sdk-s3 (~> 1.119.1)
+ aws-sdk-core (~> 3.171.0)
+ aws-sdk-s3 (~> 1.121.0)
axe-core-rspec
babosa (~> 1.0.4)
base32 (~> 0.3.0)
@@ -1675,8 +1692,8 @@ DEPENDENCIES
bullet (~> 7.0.2)
bundler-audit (~> 0.7.0.1)
bundler-checksum (~> 0.1.0)!
- capybara (~> 3.35.3)
- capybara-screenshot (~> 1.0.22)
+ capybara (~> 3.39)
+ capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
cloud_profiler_agent (~> 0.0.0)!
@@ -1699,8 +1716,8 @@ DEPENDENCIES
diff_match_patch (~> 0.1.0)
diffy (~> 3.4)
discordrb-webhooks (~> 3.4)
- doorkeeper (~> 5.5)
- doorkeeper-openid_connect (~> 1.8)
+ doorkeeper (~> 5.6, >= 5.6.6)
+ doorkeeper-openid_connect (~> 1.8, >= 1.8.5)
duo_api (~> 1.3)
ed25519 (~> 1.3.0)
elasticsearch-api (= 7.13.3)
@@ -1734,14 +1751,15 @@ DEPENDENCIES
gitlab-fog-azure-rm (~> 1.7.0)
gitlab-labkit (~> 0.31.1)
gitlab-license (~> 2.2.1)
- gitlab-mail_room (~> 0.0.9)
+ gitlab-mail_room (~> 0.0.23)
gitlab-markup (~> 1.9.0)
- gitlab-net-dns (~> 0.9.1)
- gitlab-sidekiq-fetcher (= 0.9.0)
+ gitlab-net-dns (~> 0.9.2)
+ gitlab-sidekiq-fetcher!
gitlab-styles (~> 10.0.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.2.0)
gon (~> 6.4.0)
+ google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
google-apis-cloudresourcemanager_v1 (~> 0.31.0)
google-apis-compute_v1 (~> 0.57.0)
@@ -1752,7 +1770,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.22, >= 3.22.2)
+ google-protobuf (~> 3.22, >= 3.22.3)
gpgme (~> 2.0.22)
grape (~> 1.5.2)
grape-entity (~> 0.10.0)
@@ -1778,27 +1796,27 @@ DEPENDENCIES
httparty (~> 0.20.0)
icalendar
invisible_captcha (~> 2.0.0)
- ipaddr (= 1.2.2)
+ ipaddr (~> 1.2.5)
ipaddress (~> 0.8.3)
ipynbdiff!
jira-ruby (~> 2.1.4)
js_regex (~> 3.8)
json (~> 2.6.3)
json_schemer (~> 0.2.18)
- jwt (~> 2.1.0)
+ jwt (~> 2.5)
kaminari (~> 1.2.2)
kas-grpc (~> 0.0.2)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
- lefthook (~> 1.3.3)
+ lefthook (~> 1.3.10)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.15)
listen (~> 3.7)
lockbox (~> 1.1.1)
lograge (~> 0.5)
- loofah (~> 2.19.1)
+ loofah (~> 2.20.0)
lookbook (~> 1.5, >= 1.5.3)
lru_redux
mail (= 2.8.1)
@@ -1812,16 +1830,16 @@ DEPENDENCIES
net-ldap (~> 0.17.1)
net-ntp
net-protocol (~> 0.1.3)
- nokogiri (~> 1.14.2)
+ nokogiri (~> 1.14.3)
oauth2 (~> 2.0)
octokit (~> 4.15)
- ohai (~> 16.10)
+ ohai (~> 17.9)
oj (~> 3.13.21)
oj-introspect (~> 0.7)
omniauth (~> 2.1.0)
omniauth-alicloud (~> 2.0.1)
omniauth-atlassian-oauth2 (~> 0.2.0)
- omniauth-auth0 (~> 2.0.0)
+ omniauth-auth0 (~> 3.1)
omniauth-azure-activedirectory-v2 (~> 2.0)
omniauth-azure-oauth2 (~> 0.0.9)!
omniauth-cas3 (~> 1.1.4)!
@@ -1843,7 +1861,7 @@ DEPENDENCIES
parallel (~> 1.19)
parslet (~> 1.8)
peek (~> 1.1)
- pg (~> 1.4.5)
+ pg (~> 1.4.6)
pg_query (~> 2.2, >= 2.2.1)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
@@ -1853,7 +1871,7 @@ DEPENDENCIES
pry-shell (~> 0.6.1)
puma (~> 5.6.5)
puma_worker_killer (~> 0.3.1)
- rack (~> 2.2.6, >= 2.2.6.2)
+ rack (~> 2.2.6, >= 2.2.6.4)
rack-attack (~> 6.6.1)
rack-cors (~> 1.1.1)
rack-oauth2 (~> 1.21.3)
@@ -1879,26 +1897,28 @@ DEPENDENCIES
rspec-benchmark (~> 0.6.0)
rspec-parameterized (~> 1.0)
rspec-rails (~> 6.0.1)
- rspec-retry (~> 0.6.1)
+ rspec-retry (~> 0.6.2)
rspec_junit_formatter
rspec_profiling (~> 0.0.6)
rubocop
ruby-fogbugz (~> 0.3.0)
ruby-magic (~> 0.6)
+ ruby-openai (~> 3.7)
ruby-progressbar (~> 1.10)
ruby-saml (~> 1.13.0)
- ruby_parser (~> 3.19)
+ ruby_parser (~> 3.20)
rubyzip (~> 2.3.2)
rugged (~> 1.5)
sanitize (~> 6.0)
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
- selenium-webdriver (~> 3.142)
- sentry-rails (~> 5.1.1)
+ selenium-webdriver (~> 3.142, >= 3.142.7)
+ semver_dialects (~> 1.2.1)
+ sentry-rails (~> 5.8.0)
sentry-raven (~> 3.1)
- sentry-ruby (~> 5.1.1)
- sentry-sidekiq (~> 5.1.1)
+ sentry-ruby (~> 5.8.0)
+ sentry-sidekiq (~> 5.8.0)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 5.1.0)
sidekiq (~> 6.5.7)
@@ -1911,7 +1931,7 @@ DEPENDENCIES
slack-messenger (~> 2.3.4)
snowplow-tracker (~> 0.8.0)
solargraph (~> 0.47.2)
- spamcheck (~> 1.0.0)
+ spamcheck (~> 1.3.0)
spring (~> 4.1.0)
spring-commands-rspec (~> 1.0.4)
sprite-factory (~> 1.7)
@@ -1923,7 +1943,7 @@ DEPENDENCIES
tanuki_emoji (~> 0.6)
telesignenterprise (~> 2.2)
terser (= 1.0.2)
- test-prof (~> 1.0.7)
+ test-prof (~> 1.2.1)
test_file_finder (~> 0.1.3)
thrift (>= 0.16.0)
timfel-krb5-auth (~> 0.8)
@@ -1941,10 +1961,10 @@ DEPENDENCIES
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)
- webmock (~> 3.9.1)
- webrick (~> 1.6.1)
+ webmock (~> 3.18.1)
+ webrick (~> 1.8.1)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
BUNDLED WITH
- 2.4.8
+ 2.4.12
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 4b90619af0..6b38b3f016 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -308,10 +308,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ckfiiwv7dnifra7zhbggj96g0x0kzkv0x9n1is7lb86svlm7rjj";
+ sha256 = "08vqx5s0ax71lwis9l1bzy570sch0hpb53031ha2wgvp31sdilig";
type = "gem";
};
- version = "0.2.0";
+ version = "0.2.1";
};
attr_encrypted = {
dependencies = ["encryptor"];
@@ -379,10 +379,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0awhivg7pr6b06r1jw663q0g7sm3i08n9n8bvry0qjsc03kq9aij";
+ sha256 = "0lmva6m4jjc1vl4mb45ar6jhwzbaw5mb80yc6s2wi729ijlqqhad";
type = "gem";
};
- version = "1.730.0";
+ version = "1.733.0";
};
aws-sdk-cloudformation = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -401,10 +401,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19myd6fkrxmhrp55g2dlnqw0mnz96qv3zpl3zc0cv44zcbmaffsm";
+ sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39";
type = "gem";
};
- version = "3.170.1";
+ version = "3.171.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -412,10 +412,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr";
+ sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
type = "gem";
};
- version = "1.62.0";
+ version = "1.63.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -423,10 +423,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
+ sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8";
type = "gem";
};
- version = "1.119.1";
+ version = "1.121.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -715,26 +715,26 @@ src:
version = "11.1.3";
};
capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
+ dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1viqcpsngy9fqjd68932m43ad6xj656d1x33nx9565q57chgi29k";
+ sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3";
type = "gem";
};
- version = "3.35.3";
+ version = "3.39.0";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
- groups = ["development" "test"];
+ groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q";
+ sha256 = "0xqc7hdiw1ql42mklpfvqd2pyfsxmy55cpx0h9y0jlkpl1q96sw1";
type = "gem";
};
- version = "1.0.22";
+ version = "1.0.26";
};
carrierwave = {
dependencies = ["activemodel" "activesupport" "mime-types" "ssrf_filter"];
@@ -921,10 +921,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5";
+ sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
- version = "1.2.0";
+ version = "1.2.2";
};
connection_pool = {
groups = ["default"];
@@ -1279,21 +1279,21 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz";
+ sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13";
type = "gem";
};
- version = "5.5.4";
+ version = "5.6.6";
};
doorkeeper-openid_connect = {
- dependencies = ["doorkeeper" "json-jwt"];
+ dependencies = ["doorkeeper" "jwt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vhbw2la2hx9dm0jg14hfah6blwhifrrg7k6nkyl67wga0afgwhd";
+ sha256 = "1xi70vfh121an0gjpi388kqdvkaqqycy7kj8r51jhh25g5l5gvnl";
type = "gem";
};
- version = "1.8.3";
+ version = "1.8.5";
};
dotenv = {
groups = ["default"];
@@ -1573,10 +1573,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bkh80zzjpfglm14rhz116qgz0nb5gvk3ydfjpg14av5407srgh1";
+ sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
- version = "0.90.0";
+ version = "0.99.0";
};
execjs = {
groups = ["default"];
@@ -2206,14 +2206,15 @@ src:
version = "2.2.1";
};
gitlab-mail_room = {
+ dependencies = ["jwt" "net-imap" "oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0745kls2bazgk6kbmlq1dmd42z8bgxkyn6ki9snxka8abi5kf037";
+ sha256 = "15wrq4v6xsfql4k6l10gbcfk0a02zh0shr2c3l0wakmjvaj4ymi3";
type = "gem";
};
- version = "0.0.9";
+ version = "0.0.23";
};
gitlab-markup = {
groups = ["default"];
@@ -2230,19 +2231,18 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jylfc47477imjmzc4jq7zsxklhrws6q4bb0zzl33drirf6s1ldw";
+ sha256 = "1785yfzgpzwkwsxi3wadwc3mlxvdj304aapi34482hwx8xwdj9pp";
type = "gem";
};
- version = "0.9.1";
+ version = "0.9.2";
};
gitlab-sidekiq-fetcher = {
dependencies = ["json" "sidekiq"];
groups = ["default"];
platforms = [];
source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15rqw4rx7fwall9ajbgkrv3skh70c0dlwfffvzkch84z0pn1l12l";
- type = "gem";
+ path = "${src}/vendor/gems/sidekiq-reliable-fetch";
+ type = "path";
};
version = "0.9.0";
};
@@ -2285,10 +2285,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj";
+ sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.0";
};
gon = {
dependencies = ["actionpack" "i18n" "multi_json" "request_store"];
@@ -2301,6 +2301,17 @@ src:
};
version = "6.4.0";
};
+ google-apis-androidpublisher_v3 = {
+ dependencies = ["google-apis-core"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09almff2kzdkciai63365q18wy0dfjhj48h8wa7lk77pjbfxgqfp";
+ type = "gem";
+ };
+ version = "0.34.0";
+ };
google-apis-cloudbilling_v1 = {
dependencies = ["google-apis-core"];
groups = ["default"];
@@ -2514,10 +2525,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
+ sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9";
type = "gem";
};
- version = "3.22.2";
+ version = "3.22.3";
};
googleapis-common-protos = {
dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"];
@@ -3026,10 +3037,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ycz5z25dykxy4sqdifgw6xszpgiy4hc0nv7sd89hm3x6vk6x497";
+ sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf";
type = "gem";
};
- version = "1.2.2";
+ version = "1.2.5";
};
ipaddress = {
groups = ["default"];
@@ -3152,10 +3163,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky";
+ sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq";
type = "gem";
};
- version = "2.1.0";
+ version = "2.5.0";
};
kaminari = {
dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"];
@@ -3271,10 +3282,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pfwsag1zm990mk8sgagnzkanaf7c6k6dnwf32pnmbdbs2csfsc2";
+ sha256 = "1csrkaaqxczq2gc9rmi1524l06wc9bxmivjy9vnlwj5hi4v5ikb8";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.10";
};
letter_opener = {
dependencies = ["launchy"];
@@ -3389,10 +3400,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
+ sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8";
type = "gem";
};
- version = "2.19.1";
+ version = "2.20.0";
};
lookbook = {
dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"];
@@ -3467,6 +3478,16 @@ src:
};
version = "1.11.1";
};
+ matrix = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+ type = "gem";
+ };
+ version = "0.4.2";
+ };
memoist = {
groups = ["default"];
platforms = [];
@@ -3870,10 +3891,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7";
+ sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v";
type = "gem";
};
- version = "1.14.2";
+ version = "1.14.3";
};
notiffany = {
dependencies = ["nenv" "shellany"];
@@ -3934,10 +3955,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08pc5l9p741g08x7xzbkkyi2kz5m5xr8rdj6hfna9bjzb1p80ddq";
+ sha256 = "01jlkb75ic3aw39q5mxyd8dnb65kqmzfq4shp0gli9n04ihz3765";
type = "gem";
};
- version = "16.10.6";
+ version = "17.9.0";
};
oj = {
groups = ["default"];
@@ -3994,15 +4015,15 @@ src:
version = "0.2.0";
};
omniauth-auth0 = {
- dependencies = ["omniauth-oauth2"];
+ dependencies = ["omniauth" "omniauth-oauth2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
+ sha256 = "1g24cnisa3ic3kilx1is2h0wq303qlmx2q5a92yxaal1cgwxlzg7";
type = "gem";
};
- version = "2.0.0";
+ version = "3.1.0";
};
omniauth-azure-activedirectory-v2 = {
dependencies = ["omniauth-oauth2"];
@@ -4360,10 +4381,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1";
+ sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr";
type = "gem";
};
- version = "1.4.5";
+ version = "1.4.6";
};
pg_query = {
dependencies = ["google-protobuf"];
@@ -4561,10 +4582,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb";
+ sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
type = "gem";
};
- version = "2.2.6.2";
+ version = "2.2.6.4";
};
rack-accept = {
dependencies = ["rack"];
@@ -5154,14 +5175,14 @@ src:
};
rspec-retry = {
dependencies = ["rspec-core"];
- groups = ["development" "test"];
+ groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6";
+ sha256 = "0n6qc0d16h6bgh1xarmc8vc58728mgjcsjj8wcd822c8lcivl0b1";
type = "gem";
};
- version = "0.6.1";
+ version = "0.6.2";
};
rspec-support = {
groups = ["default" "development" "test"];
@@ -5294,6 +5315,17 @@ src:
};
version = "0.6.0";
};
+ ruby-openai = {
+ dependencies = ["httparty"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0l0q3f2sks2i0mdd9p8c1shsh1acjij9iasc4vg2la2y0m65swzv";
+ type = "gem";
+ };
+ version = "3.7.0";
+ };
ruby-progressbar = {
groups = ["default" "development" "test"];
platforms = [];
@@ -5341,10 +5373,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15pqbxh15djxpcfkschkwdfhmb3xz7a10zv61qpc7rk3jbfwxbda";
+ sha256 = "1qybplg87pv6kxwyh4nkfn7pa4cisiajbfvh22dzkkbzxyxwil0p";
type = "gem";
};
- version = "3.19.2";
+ version = "3.20.0";
};
rubyntlm = {
groups = ["default"];
@@ -5505,16 +5537,27 @@ src:
};
version = "3.142.7";
};
- sentry-rails = {
- dependencies = ["railties" "sentry-ruby-core"];
+ semver_dialects = {
+ dependencies = ["pastel" "thor" "tty-command"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zv5db0wrvs4gjgrqz7fzpihgil1p9b8hm4bmf25ihyxfskz0vlh";
+ sha256 = "08zb8rlr20f1985hyakd9z7f9hc9n34qx1g8cyk5377pb5vgd8b0";
type = "gem";
};
- version = "5.1.1";
+ version = "1.2.1";
+ };
+ sentry-rails = {
+ dependencies = ["railties" "sentry-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06vklzpziqryd25k71k8qia4sy7xh10zci9wg7dbzhp2kn82s6y1";
+ type = "gem";
+ };
+ version = "5.8.0";
};
sentry-raven = {
dependencies = ["faraday"];
@@ -5528,37 +5571,26 @@ src:
version = "3.1.2";
};
sentry-ruby = {
- dependencies = ["concurrent-ruby" "sentry-ruby-core"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "09f1zkc99m1z89qf40bd2ik4fdkchm5h5rb77bz2zhn1f8xmcjaf";
- type = "gem";
- };
- version = "5.1.1";
- };
- sentry-ruby-core = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "012xra6f9b9y00wvnd2vks5kw3wrjaz3flm692j8sd3qxs8xhbhm";
+ sha256 = "043isdlj6x9rymj74gh8m6li6yr8b8k4a6lr9swrydxy6ca15sya";
type = "gem";
};
- version = "5.1.1";
+ version = "5.8.0";
};
sentry-sidekiq = {
- dependencies = ["sentry-ruby-core" "sidekiq"];
+ dependencies = ["sentry-ruby" "sidekiq"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1byig501hvjyc3y0x5x0w3h0k3c6lw9j10f3kxx7z8zvfy2n3hz4";
+ sha256 = "0yf7fwc4wczi87bdmb9bksprw66xcsvr1ldskpcmzz592qyi5lch";
type = "gem";
};
- version = "5.1.1";
+ version = "5.8.0";
};
set = {
groups = ["default"];
@@ -5785,10 +5817,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "177wcssfjp63vwr4rxma6sx7rc0lszrx4afp2wz3b4a0322s1vnz";
+ sha256 = "1xclr7qk6fwpbwx2hlfcbpw9ki4y61p76i68hj28v0sp49sq4q54";
type = "gem";
};
- version = "1.0.0";
+ version = "1.3.0";
};
spring = {
groups = ["development" "test"];
@@ -6059,10 +6091,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vg0zjfgibdcgkzb4c25v0f4v6v8mvpzvgcag194rwglmkkyrwkx";
+ sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa";
type = "gem";
};
- version = "1.0.7";
+ version = "1.2.1";
};
test_file_finder = {
dependencies = ["faraday"];
@@ -6240,6 +6272,17 @@ src:
};
version = "0.6.0";
};
+ tty-command = {
+ dependencies = ["pastel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "14hi8xiahfrrnydw6g3i30lxvvz90wp4xsrlhx8mabckrcglfv0c";
+ type = "gem";
+ };
+ version = "0.10.1";
+ };
tty-cursor = {
groups = ["default" "development" "test"];
platforms = [];
@@ -6574,20 +6617,20 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z9k677j9f6jrsj6nkxl2h969q0zyfzqj2ibxldznd5jaqj85xmw";
+ sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal";
type = "gem";
};
- version = "3.9.1";
+ version = "3.18.1";
};
webrick = {
- groups = ["metrics"];
+ groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z6nv626lzfl7wx407l5x5688layh9qd82k97hrm6pwgj6miwk8b";
+ sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
- version = "1.6.1";
+ version = "1.8.1";
};
websocket-driver = {
dependencies = ["websocket-extensions"];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix
index 708703b64d..5e150e2572 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
- version = "0.22.1";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
- sha256 = "sha256-PetU/cUWFZWl1OoSObI7wwqJLexWPTP6ynNSyPXjvMc=";
+ sha256 = "sha256-HmynsnlTj08vwYwckFdq+0u1nquC7bDOGcq2vCeqdhA=";
};
- cargoHash = "sha256-A7gwC9EQ+5GVciGsL9uPbZ6nThPfku3ZNH8qQwfI0QQ=";
+ cargoHash = "sha256-5JvDqp3dZ9rcOS17YzwgNwJYQGQ021cpd0ClrR+1+5Y=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix
index 09e5525e22..847a25f3be 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
- version = "1.26.0";
+ version = "1.28.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
- hash = "sha256-k0wkHw12MyVsAudaihoymGkP4y5y98cR7LKa+hEC1Mc=";
+ hash = "sha256-e3tblY/lf25TJrsLeQdaPcgVlsaEimkjQxO0P9X1o6w=";
};
- vendorHash = "sha256-FZ1CiR8Rj/sMoCnQm6ArGQfRTlvmD14EZDmufnlTSTk=";
+ vendorHash = "sha256-PH0PJujdRtnVS0s6wWtS6kffQBQduqb2KJYru9ePatw=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix
index be57a4cf5b..610deabd0d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
- version = "0.86";
+ version = "0.87";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
- hash = "sha256-FHjLEkxsvkYz4tK1k/pEUfDT9rfvN+K68gRc8fPVp7A=";
+ hash = "sha256-fG8UihNXCxc0j01ImAAI3N0ViNrd9gnTUhRKs7Il5R4=";
};
nativeBuildInputs = [ pkg-config bison ]
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix
index f2623d326d..ef188ba68d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/hut/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hut";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromSourcehut {
owner = "~emersion";
repo = "hut";
rev = "v${version}";
- sha256 = "sha256-g9KbOtZaBAgy/iBBh/Tv5ULJNnNzwzZpA6DOynl+dnk=";
+ sha256 = "sha256-kr5EWQ3zHUp/oNPZV2d3j9AyoEmHEX8/rETiMKTBi3s=";
};
- vendorSha256 = "sha256-vuAx8B34Za+GEtekFOUaY07hBk3O2OaJ1JmulbIhwbs=";
+ vendorHash = "sha256-aoqGb7g8UEC/ydmL3GbWGy3HDD1kfDJOMeUP4nO9waA=";
nativeBuildInputs = [
scdoc
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix
index 7f4affc34f..b1ab249748 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix
@@ -6,7 +6,7 @@
let
pname = "lefthook";
- version = "1.3.9";
+ version = "1.3.10";
in
buildGoModule rec {
inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule rec {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
- hash = "sha256-6XsSnFrYRsVNzp5Kr1+GghbNh2uOOyT4BQm9yBw3jRU=";
+ hash = "sha256-dV8Zs62I61SXTX3NQs0n1P0LKNfyfZNHvdKzvJ3r5Z8=";
};
- vendorHash = "sha256-cMRl+TqSLlfoAja+JNaNKfHDR9fkvMTWdB1FT3XxPd4=";
+ vendorHash = "sha256-UMT39If9Oa7vgpkW2oltCUkaNQ0Qf1nCO5Z8F8SaajA=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index f284274203..5f2f9837cc 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
@@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
- version = "6.4";
+ version = "6.4.2";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
- sha256 = "sha256-6Iv7y5kR52kEoxuXLlf4bajmzliSuYw53VHTuVmcE0c=";
+ sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU=";
};
format = "other";
@@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
- sha256 = "sha256-jgB9UMuZ9v+euGN2LPzg0vNK0KeEa8GpQxLJYgQzzbw=";
+ sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;
@@ -110,22 +110,6 @@ let
gnupg
];
- patches = [
- # remove dependency over packaging for test runner
- # https://bz.mercurial-scm.org/show_bug.cgi?id=6805
- (fetchpatch {
- url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/5e5e3733082a25856038f0fde66d4e08d8881539.patch";
- hash = "sha256-JNxESWpWZW3AENz57tNJTV/ALnJjkmG1ZnTWSvTr4qY=";
- })
-
- # sligthly different test output matching
- # https://bz.mercurial-scm.org/show_bug.cgi?id=6807
- (fetchpatch {
- url = "https://foss.heptapod.net/mercurial/mercurial-devel/-/commit/2231f7d8a60266bb6907b1708400c970ed799017.patch";
- hash = "sha256-Lm5qXvM9nbmTpuMuvDoWhY4cQQQN7PFZtmu5e7mQVw4=";
- })
- ];
-
postPatch = ''
patchShebangs .
@@ -168,10 +152,6 @@ let
# Python 3.10-3.12 deprecation warning: asyncore
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
test-patchbomb-tls.t
-
- # Test wanting TLS 1.0 and 1.1, not available with OpenSSL v3.
- # https://bz.mercurial-scm.org/show_bug.cgi?id=6760
- test-https.t
EOF
export HGTEST_REAL_HG="${mercurial}/bin/hg"
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix
index 25168d7519..3f40739451 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix
@@ -38,6 +38,9 @@ rustPlatform.buildRustPackage rec {
};
};
+ # Otherwise, there are errors due to the `abigen` macro from `ethers`.
+ auditable = false;
+
nativeBuildInputs = [
pkg-config
cmake
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock
index c18683f532..9a466c45f1 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/Cargo.lock
@@ -48,7 +48,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
"once_cell",
"version_check",
]
@@ -97,18 +97,18 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
dependencies = [
"backtrace",
]
[[package]]
name = "arbitrary"
-version = "1.2.3"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
[[package]]
name = "arc-swap"
@@ -153,22 +153,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 1.0.0",
"concurrent-queue",
"futures-lite",
- "libc",
"log",
"parking",
"polling",
+ "rustix",
"slab",
"socket2",
"waker-fn",
- "windows-sys 0.42.0",
]
[[package]]
@@ -184,7 +184,7 @@ dependencies = [
name = "async-runtime"
version = "0.1.0"
dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
"num_cpus",
"once_cell",
"tokio",
@@ -192,13 +192,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.65"
+version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "095183a3539c7c7649b2beb87c2d3f0591f3a7fed07761cc546d244e27e0238c"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -263,7 +263,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -395,6 +395,7 @@ dependencies = [
"pymanifest",
"pymetalog",
"pymutationstore",
+ "pynodeipc",
"pynodemap",
"pypathhistory",
"pypathmatcher",
@@ -481,9 +482,9 @@ dependencies = [
[[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",
]
@@ -511,9 +512,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
dependencies = [
"memchr",
"serde",
@@ -580,15 +581,6 @@ dependencies = [
"pkg-config",
]
-[[package]]
-name = "camino"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "cassowary"
version = "0.3.0"
@@ -654,7 +646,7 @@ dependencies = [
"async-trait",
"configmodel",
"fail",
- "futures 0.3.26",
+ "futures 0.3.28",
"io",
"manifest",
"manifest-tree",
@@ -682,9 +674,9 @@ dependencies = [
[[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",
"js-sys",
@@ -726,7 +718,7 @@ dependencies = [
"regex",
"strsim 0.10.0",
"termcolor",
- "terminal_size 0.2.5",
+ "terminal_size 0.2.6",
"textwrap 0.16.0",
"unicase",
]
@@ -741,7 +733,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -822,12 +814,12 @@ dependencies = [
[[package]]
name = "cloned"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
[[package]]
name = "codegen_includer_proc_macro"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"quote",
]
@@ -871,7 +863,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"filetime",
- "futures 0.3.26",
+ "futures 0.3.28",
"hostcaps",
"identity",
"lazy_static",
@@ -907,9 +899,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
dependencies = [
"crossbeam-utils 0.8.15",
]
@@ -923,7 +915,7 @@ dependencies = [
"codegen_includer_proc_macro",
"const-cstr",
"fbthrift",
- "futures 0.3.26",
+ "futures 0.3.28",
"once_cell",
"ref-cast",
"serde",
@@ -943,7 +935,7 @@ dependencies = [
"codegen_includer_proc_macro",
"const-cstr",
"fbthrift",
- "futures 0.3.26",
+ "futures 0.3.28",
"once_cell",
"ref-cast",
"serde",
@@ -959,6 +951,7 @@ name = "configloader"
version = "0.1.0"
dependencies = [
"anyhow",
+ "base64 0.11.0",
"configmodel",
"configset",
"dirs 2.0.2",
@@ -1051,8 +1044,16 @@ name = "copytrace"
version = "0.1.0"
dependencies = [
"anyhow",
+ "async-trait",
"dag",
"git2",
+ "manifest",
+ "manifest-tree",
+ "pathhistory",
+ "pathmatcher",
+ "storemodel",
+ "thiserror",
+ "tracing",
"types",
]
@@ -1068,15 +1069,15 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
dependencies = [
"libc",
]
@@ -1102,7 +1103,7 @@ dependencies = [
"async-runtime",
"cpython",
"cpython_ext",
- "futures 0.3.26",
+ "futures 0.3.28",
"itertools 0.10.5",
"tokio",
]
@@ -1190,7 +1191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-channel 0.5.7",
+ "crossbeam-channel 0.5.8",
"crossbeam-deque 0.8.3",
"crossbeam-epoch 0.9.14",
"crossbeam-queue 0.3.8",
@@ -1218,9 +1219,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils 0.8.15",
@@ -1384,9 +1385,9 @@ dependencies = [
[[package]]
name = "csv"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359"
+checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
dependencies = [
"csv-core",
"itoa 1.0.6",
@@ -1410,7 +1411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1440,9 +1441,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.60+curl-7.88.1"
+version = "0.4.61+curl-8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f"
+checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79"
dependencies = [
"cc",
"libc",
@@ -1456,9 +1457,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1468,9 +1469,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -1478,24 +1479,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -1511,7 +1512,7 @@ dependencies = [
"drawdag",
"fail",
"fs2",
- "futures 0.3.26",
+ "futures 0.3.28",
"indexedlog",
"indexmap",
"mincode",
@@ -1567,12 +1568,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "data-encoding"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
-
[[package]]
name = "debugtop"
version = "0.1.0"
@@ -1584,9 +1579,9 @@ dependencies = [
[[package]]
name = "deltae"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e412cd91a4ec62fcc739ea50c40babe21e3de60d69f36393cce377c7c04ead5a"
+checksum = "3ef311e2c0a388b9ba56c839ac68d33b92d18ce7104d0acc4375cb479e2b9a53"
[[package]]
name = "dev-logger"
@@ -1624,7 +1619,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
"crypto-common",
]
@@ -1683,10 +1678,13 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
+ "configloader",
+ "configmodel",
"dag",
"edenapi_trait",
"fail",
- "futures 0.3.26",
+ "futures 0.3.28",
+ "hgstore",
"http",
"identity",
"manifest-tree",
@@ -1730,7 +1728,7 @@ dependencies = [
"configmodel",
"edenapi_trait",
"edenapi_types",
- "futures 0.3.26",
+ "futures 0.3.28",
"hg-http",
"http-client",
"itertools 0.10.5",
@@ -1763,7 +1761,7 @@ dependencies = [
"crossbeam 0.8.2",
"edenapi",
"edenapi_types",
- "futures 0.3.26",
+ "futures 0.3.28",
"itertools 0.10.5",
"minibytes",
"tokio",
@@ -1779,7 +1777,7 @@ dependencies = [
"async-trait",
"configmodel",
"edenapi_types",
- "futures 0.3.26",
+ "futures 0.3.28",
"http",
"http-client",
"minibytes",
@@ -1863,18 +1861,6 @@ dependencies = [
"cfg-if 1.0.0",
]
-[[package]]
-name = "enum-as-inner"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "enum_dispatch"
version = "0.3.11"
@@ -1884,7 +1870,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1912,13 +1898,13 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi 0.3.9",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1972,7 +1958,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2004,14 +1990,14 @@ dependencies = [
[[package]]
name = "fb303_core"
version = "0.0.0"
-source = "git+https://github.com/facebook/fb303.git?branch=main#5d78ac1eb00320cb53f4333c5c55fecf51177393"
+source = "git+https://github.com/facebook/fb303.git?branch=main#55c736fe6b9f42458d39211ae236cc59412c8424"
dependencies = [
"anyhow",
"async-trait",
"codegen_includer_proc_macro",
"const-cstr",
"fbthrift",
- "futures 0.3.26",
+ "futures 0.3.28",
"once_cell",
"ref-cast",
"serde",
@@ -2025,7 +2011,7 @@ dependencies = [
[[package]]
name = "fbinit"
version = "0.1.2"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"fbinit_macros",
"quickcheck",
@@ -2034,25 +2020,24 @@ dependencies = [
[[package]]
name = "fbinit_macros"
version = "0.1.2"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "fbthrift"
version = "0.0.1+unstable"
-source = "git+https://github.com/facebook/fbthrift.git?branch=main#a8ffeb94383c4c6dbdff5997a49851e830a18984"
+source = "git+https://github.com/facebook/fbthrift.git?branch=main#1e7f13644729f1f71434fa06395267db723ad4e0"
dependencies = [
"anyhow",
"async-trait",
"base64 0.11.0",
"bufsize",
"bytes 1.4.0",
- "camino",
- "futures 0.3.26",
+ "futures 0.3.28",
"ghost",
"num-derive",
"num-traits",
@@ -2065,7 +2050,7 @@ dependencies = [
[[package]]
name = "fbthrift_framed"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"byteorder",
"bytes 1.4.0",
@@ -2075,14 +2060,14 @@ dependencies = [
[[package]]
name = "fbthrift_socket"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"anyhow",
"bytes 1.4.0",
"fbthrift",
"fbthrift_framed",
"fbthrift_util",
- "futures 0.3.26",
+ "futures 0.3.28",
"tokio",
"tokio-tower",
"tokio-util 0.6.10",
@@ -2092,11 +2077,22 @@ dependencies = [
[[package]]
name = "fbthrift_util"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"tokio",
]
+[[package]]
+name = "filedescriptor"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70cb4dda2f343f3b7a98a6536559d04a700136cada190822e5d6a99e4184c06"
+dependencies = [
+ "anyhow",
+ "libc",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "filedescriptor"
version = "0.8.2"
@@ -2110,14 +2106,14 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.20"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
- "windows-sys 0.45.0",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2239,9 +2235,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
[[package]]
name = "futures"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -2254,9 +2250,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -2264,15 +2260,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -2281,15 +2277,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
"fastrand",
"futures-core",
@@ -2302,26 +2298,26 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-timer"
@@ -2331,9 +2327,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
[[package]]
name = "futures-util"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures 0.1.31",
"futures-channel",
@@ -2350,9 +2346,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -2380,9 +2376,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -2391,13 +2387,13 @@ dependencies = [
[[package]]
name = "ghost"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3"
+checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -2439,7 +2435,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
- "futures 0.3.26",
+ "futures 0.3.28",
"git2",
"minibytes",
"storemodel",
@@ -2467,9 +2463,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
dependencies = [
"bytes 1.4.0",
"fnv",
@@ -2541,6 +2537,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -2575,6 +2577,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-runtime",
+ "atexit",
"bindings",
"blackbox",
"checkout",
@@ -2587,6 +2590,7 @@ dependencies = [
"configmodel",
"cpython",
"cpython_ext",
+ "ctrlc",
"dag",
"debugtop",
"eagerepo",
@@ -2609,6 +2613,7 @@ dependencies = [
"mincode",
"minibytes",
"network-doctor",
+ "nodeipc",
"once_cell",
"parking_lot 0.11.2",
"pathmatcher",
@@ -2649,7 +2654,7 @@ dependencies = [
"async-trait",
"dag",
"edenapi",
- "futures 0.3.26",
+ "futures 0.3.28",
"gitdag",
"metalog",
"minibytes",
@@ -2673,7 +2678,6 @@ dependencies = [
"atexit",
"clidispatch",
"configloader",
- "ctrlc",
"dirs 2.0.2",
"encoding",
"hgcommands",
@@ -2694,6 +2698,15 @@ dependencies = [
name = "hgrc-parser"
version = "0.1.0"
+[[package]]
+name = "hgstore"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "minibytes",
+ "types",
+]
+
[[package]]
name = "hgtime"
version = "0.1.0"
@@ -2705,7 +2718,7 @@ dependencies = [
[[package]]
name = "hostcaps"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"lazy_static",
]
@@ -2713,7 +2726,7 @@ dependencies = [
[[package]]
name = "hostname"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"anyhow",
"hostname 0.3.1",
@@ -2764,7 +2777,7 @@ dependencies = [
"curl",
"curl-sys",
"env_logger 0.7.1",
- "futures 0.3.26",
+ "futures 0.3.28",
"http",
"lru-cache",
"maplit",
@@ -2816,9 +2829,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.24"
+version = "0.14.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
dependencies = [
"bytes 1.4.0",
"futures-channel",
@@ -2866,16 +2879,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi 0.3.9",
+ "windows",
]
[[package]]
@@ -2900,17 +2913,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
[[package]]
name = "idna"
version = "0.3.0"
@@ -2963,9 +2965,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 = [
"arbitrary",
"autocfg",
@@ -2976,9 +2978,9 @@ dependencies = [
[[package]]
name = "insta"
-version = "1.28.0"
+version = "1.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099"
+checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972"
dependencies = [
"console",
"lazy_static",
@@ -3021,12 +3023,13 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
+ "hermit-abi 0.3.1",
"libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3038,23 +3041,11 @@ dependencies = [
"libc",
]
-[[package]]
-name = "ipconfig"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
-dependencies = [
- "socket2",
- "widestring",
- "winapi 0.3.9",
- "winreg",
-]
-
[[package]]
name = "ipnet"
-version = "2.7.1"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
[[package]]
name = "itertools"
@@ -3145,9 +3136,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.141"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]]
name = "libgit2-sys"
@@ -3225,9 +3216,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
[[package]]
name = "local-encoding"
@@ -3354,12 +3345,6 @@ dependencies = [
"regex-automata",
]
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
[[package]]
name = "maybe-uninit"
version = "2.0.0"
@@ -3440,7 +3425,7 @@ dependencies = [
name = "metrics"
version = "0.1.0"
dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
"once_cell",
]
@@ -3465,9 +3450,9 @@ dependencies = [
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
@@ -3618,7 +3603,7 @@ dependencies = [
"bitflags",
"dag",
"drawdag",
- "futures 0.3.26",
+ "futures 0.3.28",
"indexedlog",
"rand 0.8.5",
"rand_chacha 0.3.1",
@@ -3685,6 +3670,18 @@ dependencies = [
"static_assertions",
]
+[[package]]
+name = "nodeipc"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "filedescriptor 0.7.3",
+ "libc",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "nodemap"
version = "0.1.0"
@@ -3721,7 +3718,7 @@ dependencies = [
name = "nonblocking"
version = "0.1.0"
dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
]
[[package]]
@@ -3762,7 +3759,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3832,9 +3829,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.45"
+version = "0.10.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -3847,13 +3844,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -3864,11 +3861,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0"
dependencies = [
- "autocfg",
"cc",
"libc",
"pkg-config",
@@ -3887,9 +3883,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",
]
@@ -3906,9 +3902,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.4.1"
+version = "6.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
[[package]]
name = "output_vt100"
@@ -3933,9 +3929,9 @@ checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d"
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
[[package]]
name = "parking_lot"
@@ -3967,7 +3963,7 @@ dependencies = [
"cfg-if 1.0.0",
"instant",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"winapi 0.3.9",
]
@@ -3980,16 +3976,16 @@ checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"smallvec",
"windows-sys 0.45.0",
]
[[package]]
name = "paste"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "pathhistory"
@@ -4044,9 +4040,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7"
+checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122"
dependencies = [
"thiserror",
"ucd-trie",
@@ -4054,9 +4050,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7"
+checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15"
dependencies = [
"pest",
"pest_generator",
@@ -4064,22 +4060,22 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b"
+checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "pest_meta"
-version = "2.5.6"
+version = "2.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80"
+checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e"
dependencies = [
"once_cell",
"pest",
@@ -4135,7 +4131,7 @@ dependencies = [
"phf_shared 0.11.1",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4182,7 +4178,7 @@ checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4193,7 +4189,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -4251,16 +4247,18 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.5.2"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa"
dependencies = [
"autocfg",
+ "bitflags",
"cfg-if 1.0.0",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -4298,7 +4296,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -4315,9 +4313,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
@@ -4483,10 +4481,15 @@ dependencies = [
name = "pycopytrace"
version = "0.1.0"
dependencies = [
+ "anyhow",
+ "async-runtime",
"copytrace",
"cpython",
"cpython_ext",
+ "dag",
"parking_lot 0.11.2",
+ "pymanifest",
+ "storemodel",
"types",
]
@@ -4499,7 +4502,7 @@ dependencies = [
"cpython",
"cpython_ext",
"dag",
- "futures 0.3.26",
+ "futures 0.3.28",
"hgcommits",
"minibytes",
"parking_lot 0.11.2",
@@ -4554,6 +4557,7 @@ dependencies = [
"dag",
"eagerepo",
"edenapi_types",
+ "pyconfigloader",
"pydag",
"pyedenapi",
"storemodel",
@@ -4573,7 +4577,8 @@ dependencies = [
"edenapi",
"edenapi_ext",
"edenapi_types",
- "futures 0.3.26",
+ "futures 0.3.28",
+ "hgstore",
"minibytes",
"progress-model",
"pyconfigloader",
@@ -4752,6 +4757,16 @@ dependencies = [
"vlqencoding",
]
+[[package]]
+name = "pynodeipc"
+version = "0.1.0"
+dependencies = [
+ "cpython",
+ "cpython_ext",
+ "nodeipc",
+ "serde_json",
+]
+
[[package]]
name = "pynodemap"
version = "0.1.0"
@@ -4870,7 +4885,7 @@ dependencies = [
"configmodel",
"cpython",
"cpython_ext",
- "futures 0.3.26",
+ "futures 0.3.28",
"io",
"minibytes",
"parking_lot 0.11.2",
@@ -5049,12 +5064,12 @@ dependencies = [
[[package]]
name = "quickcheck_arbitrary_derive"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"proc-macro2",
"quickcheck",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -5065,14 +5080,14 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@@ -5175,7 +5190,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
]
[[package]]
@@ -5203,7 +5218,7 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
- "crossbeam-channel 0.5.7",
+ "crossbeam-channel 0.5.8",
"crossbeam-deque 0.8.3",
"crossbeam-utils 0.8.15",
"num_cpus",
@@ -5227,35 +5242,44 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.9",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "ref-cast"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9af2cf09ef80e610097515e80095b7f76660a92743c4185aff5406cd5ce3dd5"
+checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
-version = "1.0.15"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c501201393982e275433bc55de7d6ae6f00e7699cd5572c5b57581cd69c881b"
+checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -5267,9 +5291,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",
@@ -5287,9 +5311,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "remove_dir_all"
@@ -5328,6 +5352,7 @@ dependencies = [
"identity",
"manifest-tree",
"metalog",
+ "once_cell",
"parking_lot 0.11.2",
"refencode",
"repolock",
@@ -5368,10 +5393,11 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.11.11"
-source = "git+https://github.com/vmagro/reqwest?rev=f9490c06756a9d35ab874c44657db790a87af80b#f9490c06756a9d35ab874c44657db790a87af80b"
+version = "0.11.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
"bytes 1.4.0",
"encoding_rs",
"futures-core",
@@ -5384,11 +5410,11 @@ dependencies = [
"hyper-tls",
"ipnet",
"js-sys",
- "lazy_static",
"log",
"mime",
"mime_guess",
"native-tls",
+ "once_cell",
"percent-encoding",
"pin-project-lite",
"rustls",
@@ -5402,10 +5428,10 @@ dependencies = [
"tokio-rustls",
"tokio-util 0.7.7",
"tower-service",
- "trust-dns-resolver",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
+ "wasm-streams",
"web-sys",
"webpki-roots",
"winreg",
@@ -5427,16 +5453,6 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "resolv-conf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname 0.3.1",
- "quick-error",
-]
-
[[package]]
name = "revisionstore"
version = "0.1.0"
@@ -5453,10 +5469,11 @@ dependencies = [
"edenapi",
"edenapi_types",
"fbinit",
- "futures 0.3.26",
+ "futures 0.3.28",
"hex",
"hg-http",
"hg-metrics",
+ "hgstore",
"hgtime",
"http",
"http-client",
@@ -5591,9 +5608,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_version"
@@ -5601,21 +5618,21 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.16",
+ "semver 1.0.17",
]
[[package]]
name = "rustix"
-version = "0.36.9"
+version = "0.37.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -5705,9 +5722,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5e082f6ea090deaf0e6dd04b68360fd5cddb152af6ce8927c9d25db299f98c"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "sct"
@@ -5753,9 +5770,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.16"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "semver-parser"
@@ -5768,9 +5785,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.152"
+version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
dependencies = [
"serde_derive",
]
@@ -5782,7 +5799,7 @@ version = "0.1.0"
[[package]]
name = "serde_bser"
version = "0.3.1"
-source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90"
+source = "git+https://github.com/facebook/watchman.git?branch=main#efc891b9f64a7b560b9e06f62fb8767343501729"
dependencies = [
"anyhow",
"byteorder",
@@ -5813,20 +5830,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.152"
+version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
name = "serde_json"
-version = "1.0.93"
+version = "1.0.96"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
dependencies = [
"itoa 1.0.6",
"ryu",
@@ -6023,7 +6040,7 @@ dependencies = [
[[package]]
name = "sorted_vector_map"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"itertools 0.10.5",
"quickcheck",
@@ -6034,7 +6051,7 @@ name = "sparse"
version = "0.1.0"
dependencies = [
"anyhow",
- "futures 0.3.26",
+ "futures 0.3.28",
"globset",
"once_cell",
"pathmatcher",
@@ -6097,7 +6114,7 @@ dependencies = [
"anyhow",
"async-trait",
"auto_impl",
- "futures 0.3.26",
+ "futures 0.3.28",
"minibytes",
"types",
]
@@ -6133,7 +6150,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
- "futures 0.3.26",
+ "futures 0.3.28",
"pin-project 0.4.30",
"tokio",
]
@@ -6171,7 +6188,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6189,7 +6206,7 @@ dependencies = [
"heck 0.3.3",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6215,6 +6232,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn"
+version = "2.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "synstructure"
version = "0.12.6"
@@ -6223,7 +6251,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"unicode-xid",
]
@@ -6239,15 +6267,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if 1.0.0",
"fastrand",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -6271,12 +6299,12 @@ dependencies = [
[[package]]
name = "terminal_size"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
+checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
dependencies = [
"rustix",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -6333,7 +6361,7 @@ dependencies = [
"bitflags",
"cassowary",
"cfg-if 1.0.0",
- "filedescriptor",
+ "filedescriptor 0.8.2",
"finl_unicode",
"fixedbitset",
"fnv",
@@ -6345,7 +6373,7 @@ dependencies = [
"nix 0.24.3",
"num-derive",
"num-traits",
- "ordered-float 3.4.0",
+ "ordered-float 3.6.0",
"pest",
"pest_derive",
"phf 0.10.1",
@@ -6381,28 +6409,28 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
dependencies = [
- "terminal_size 0.2.5",
+ "terminal_size 0.2.6",
"unicode-width",
]
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -6426,7 +6454,7 @@ dependencies = [
"const-cstr",
"fb303_core",
"fbthrift",
- "futures 0.3.26",
+ "futures 0.3.28",
"once_cell",
"ref-cast",
"serde",
@@ -6447,7 +6475,7 @@ dependencies = [
"config_thrift",
"fb303_core",
"fbthrift",
- "futures 0.3.26",
+ "futures 0.3.28",
"thiserror",
"thrift",
]
@@ -6455,7 +6483,7 @@ dependencies = [
[[package]]
name = "thrift_compiler"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"anyhow",
"clap 2.34.0",
@@ -6529,14 +6557,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.26.0"
+version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg",
"bytes 1.4.0",
"libc",
- "memchr",
"mio 0.8.6",
"num_cpus",
"parking_lot 0.12.1",
@@ -6561,13 +6588,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "1.8.2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.15",
]
[[package]]
@@ -6623,10 +6650,10 @@ dependencies = [
[[package]]
name = "tokio-uds-compat"
version = "0.1.0"
-source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#fda41b401e251976b4a645650a3f429c6ef28f1a"
+source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc"
dependencies = [
"async-io",
- "futures 0.3.26",
+ "futures 0.3.28",
"tokio",
"tracing",
"uds_windows",
@@ -6726,7 +6753,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6759,6 +6786,8 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
dependencies = [
+ "futures 0.3.28",
+ "futures-task",
"pin-project 1.0.12",
"tracing",
]
@@ -6868,51 +6897,6 @@ dependencies = [
"vlqencoding",
]
-[[package]]
-name = "trust-dns-proto"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
-dependencies = [
- "async-trait",
- "cfg-if 1.0.0",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "log",
- "rand 0.8.5",
- "smallvec",
- "thiserror",
- "tinyvec",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
-dependencies = [
- "cfg-if 1.0.0",
- "futures-util",
- "ipconfig",
- "lazy_static",
- "log",
- "lru-cache",
- "parking_lot 0.12.1",
- "resolv-conf",
- "smallvec",
- "thiserror",
- "tokio",
- "trust-dns-proto",
-]
-
[[package]]
name = "try-lock"
version = "0.2.4"
@@ -6936,7 +6920,7 @@ version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -6997,15 +6981,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775c11906edafc97bc378816b94585fbd9a054eabaf86fdd0ced94af449efab7"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-normalization"
@@ -7056,15 +7040,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
dependencies = [
"form_urlencoded",
- "idna 0.3.0",
+ "idna",
"percent-encoding",
]
[[package]]
name = "utf8parse"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "util"
@@ -7089,12 +7073,12 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.3.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
+checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb"
dependencies = [
"atomic",
- "getrandom 0.2.8",
+ "getrandom 0.2.9",
"serde",
"sha1_smol",
]
@@ -7151,7 +7135,9 @@ dependencies = [
"minibytes",
"once_cell",
"tempfile",
+ "thiserror",
"tokio",
+ "tracing",
"types",
"util",
]
@@ -7186,12 +7172,11 @@ 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 0.3.9",
"winapi-util",
]
@@ -7244,7 +7229,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
@@ -7278,7 +7263,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -7289,14 +7274,27 @@ 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 = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
[[package]]
name = "watchman_client"
version = "0.8.0"
-source = "git+https://github.com/facebook/watchman.git?branch=main#12a12d48d21300a67ce900d434aa3172ee9fbd90"
+source = "git+https://github.com/facebook/watchman.git?branch=main#efc891b9f64a7b560b9e06f62fb8767343501729"
dependencies = [
"anyhow",
"bytes 1.4.0",
- "futures 0.3.26",
+ "futures 0.3.28",
"maplit",
"serde",
"serde_bser",
@@ -7335,15 +7333,6 @@ dependencies = [
"webpki",
]
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "wezterm-bidi"
version = "0.2.2"
@@ -7373,7 +7362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa"
dependencies = [
"log",
- "ordered-float 3.4.0",
+ "ordered-float 3.6.0",
"strsim 0.10.0",
"thiserror",
"wezterm-dynamic-derive",
@@ -7387,7 +7376,7 @@ checksum = "0c9f5ef318442d07b3d071f9f43ea40b80992f87faee14bb4d017b6991c307f0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -7401,12 +7390,6 @@ dependencies = [
"once_cell",
]
-[[package]]
-name = "widestring"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
-
[[package]]
name = "winapi"
version = "0.2.8"
@@ -7450,19 +7433,28 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
@@ -7471,65 +7463,131 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
]
[[package]]
name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winreg"
@@ -7547,10 +7605,11 @@ dependencies = [
"anyhow",
"async-runtime",
"async-trait",
+ "bitflags",
"configmodel",
"crossbeam 0.8.2",
"edenfs_client",
- "futures 0.3.26",
+ "futures 0.3.28",
"identity",
"io",
"manifest",
@@ -7634,9 +7693,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.7+zstd.1.5.4"
+version = "2.0.8+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
dependencies = [
"cc",
"libc",
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix
index 222d77ca71..825394c38f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/default.nix
@@ -43,7 +43,7 @@ let
owner = "facebook";
repo = "sapling";
rev = version;
- hash = "sha256-e+S5gyyJF3bu6Yo+KjG2lLfjToYzzFj10GTcrPfzxDE=";
+ hash = "sha256-rZLLRcZNeYP7yKAgBujqEJ9TwwDPAct060pZ4aj/7PM=";
};
addonsSrc = "${src}/addons";
@@ -51,7 +51,7 @@ let
# Fetches the Yarn modules in Nix to to be used as an offline cache
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${addonsSrc}/yarn.lock";
- sha256 = "sha256-bJpfa1i3G5Ym5CLVpCt+7q5FNv34CoJBefXaf4qlxNA=";
+ sha256 = "sha256-cEIij7hocCSPw1Q1ESI/t9IFmLM0Nbr/IjSz3HzBdzU=";
};
# Builds the NodeJS server that runs with `sl web`
@@ -101,11 +101,10 @@ python3Packages.buildPythonApplication {
lockFile = ./Cargo.lock;
outputHashes = {
"abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM=";
- "cloned-0.1.0" = "sha256-WHsvgnbAYrFx22p3rbMzlCIaZ8+BTsMswiTv4h+A/ZI=";
- "fb303_core-0.0.0" = "sha256-bg4+4kdHfgaEbLzkCftdLH++QKherIAfM7IzlWeOWKI=";
- "fbthrift-0.0.1+unstable" = "sha256-0qvab0a3PdvlOq2teXKjYrB9UbWLKzMbHgv/3LSsT+4=";
- "reqwest-0.11.11" = "sha256-uhc8XhkGW22XDNo0qreWdXeFF2cslOOZHfTRQ30IBcE=";
- "serde_bser-0.3.1" = "sha256-Sk3prRcLr2ExXvq7Px4+NRXbY8ZaRWOYexnaUAqQ4ao=";
+ "cloned-0.1.0" = "sha256-54XxXSeGoS0j0+dDUC15xn1Hvpvl2T7NJ0dZ6/ZSd9s=";
+ "fb303_core-0.0.0" = "sha256-YVPObJaxb5Giu3s70YP5syRSCmtijUK6y9g3UOzgrQU=";
+ "fbthrift-0.0.1+unstable" = "sha256-sfn8EB1hbJGq/jFjgCrf9OyBpXmIBv5qlIsiao071Os=";
+ "serde_bser-0.3.1" = "sha256-mrY6K6hoRo4exyZlStEIh8vuQdzd8XGkaR1MCEgKIP8=";
};
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json b/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json
index a40543fde8..78e4b81adb 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json
+++ b/third_party/nixpkgs/pkgs/applications/version-management/sapling/deps.json
@@ -73,6 +73,6 @@
"url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz"
}
],
- "version": "0.2.20230228-144002-h9440b05e",
- "versionHash": "6463510610610398322"
+ "version": "0.2.20230330-193452-h69692651",
+ "versionHash": "16853369111871393994"
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix
index a1238ed01d..79e1cb1a29 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/scriv/default.nix
@@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "scriv";
- version = "1.2.1";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- hash = "sha256-le39dmQs965rXNQJdVRdivWPY5jKv+g/91Xo7tuN3U4=";
+ hash = "sha256-TfWX7gp7PcwNUxXXZJ3wke/LGz/wjwtRppg0ByfRcRg=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix
index 532e046713..cb01990b60 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "srvc";
- version = "0.17.0";
+ version = "0.17.1";
src = fetchFromGitHub {
owner = "insilica";
repo = "rs-srvc";
rev = "v${version}";
- hash = "sha256-6cullXcSnFlGM5O/g/J5WwBBUPfg1cbvjyPcIZ6yjRE=";
+ hash = "sha256-WpzJzjGzYX1IxC9Vz//JhRYCPZyLchv+iv+kuKkw2Os=";
};
- cargoHash = "sha256-xmHCm4kH4y0ph0ssMXZn+TvLAciYrsggyjmar85zF74=";
+ cargoHash = "sha256-WhmcJQRh2x6DZRXwzy/KtK81XXIDmNMnUtq7ylCpwTw=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix
index 25e3983c2b..6f03b139cf 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix
@@ -61,6 +61,8 @@ let
(lib.withFeatureAs httpSupport "serf" serf)
"--with-zlib=${zlib.dev}"
"--with-sqlite=${sqlite.dev}"
+ "--with-apr=${apr.dev}"
+ "--with-apr-util=${aprutil.dev}"
] ++ lib.optionals javahlBindings [
"--enable-javahl"
"--with-jdk=${jdk}"
diff --git a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
index c519d5254c..0b7cec3477 100644
--- a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
@@ -8,7 +8,7 @@
, addOpenGLRunpath
, libGLU
, xorg
-, buildFHSUserEnv
+, buildFHSEnv
, bash
, writeText
, ocl-icd
@@ -133,7 +133,7 @@ let
}
);
in
-buildFHSUserEnv {
+buildFHSEnv {
name = "davinci-resolve";
targetPkgs = pkgs: with pkgs; [
librsvg
diff --git a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
index 014e009f24..09f99f400a 100644
--- a/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/filebot/default.nix
@@ -1,14 +1,19 @@
-{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook
+{ lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook
, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib
}:
-stdenv.mkDerivation rec {
+let
+ lanterna = fetchurl {
+ url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
+ hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
+ };
+in stdenv.mkDerivation rec {
pname = "filebot";
- version = "5.0.1";
+ version = "5.0.2";
src = fetchurl {
- url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
- sha256 = "sha256-0d0+o8ZiF1m83AasjoxUDNtUSquy69wFY1m1oYeybFw=";
+ url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
+ hash = "sha256-XnzBXZy/gNA8qf7XairoviRmdQiXHbW19BgbHL52SP0=";
};
unpackPhase = "tar xvf $src";
@@ -17,6 +22,11 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ];
+ postPatch = ''
+ # replace lanterna.jar to be able to specify `com.googlecode.lanterna.terminal.UnixTerminal.sttyCommand`
+ cp ${lanterna} jar/lanterna.jar
+ '';
+
dontBuild = true;
installPhase = ''
mkdir -p $out/opt $out/bin
@@ -25,7 +35,8 @@ stdenv.mkDerivation rec {
# Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
substituteInPlace $out/opt/filebot.sh \
--replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
- --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
+ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' \
+ --replace '-jar "$FILEBOT_HOME/jar/filebot.jar"' '-Dcom.googlecode.lanterna.terminal.UnixTerminal.sttyCommand=${coreutils}/bin/stty -jar "$FILEBOT_HOME/jar/filebot.jar"'
wrapProgram $out/opt/filebot.sh \
--prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
# Expose the binary in bin to make runnable.
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix
index d6379550e8..e781f80e45 100644
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix
@@ -28,18 +28,18 @@
mkDerivation rec {
pname = "jellyfin-media-player";
- version = "1.8.1";
+ version = "1.9.1";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-media-player";
rev = "v${version}";
- sha256 = "sha256-/FqxZd0cFSfkeBQmZ2gU+5FUZZ+WbQ8c2IjaZ4/uGt8=";
+ sha256 = "sha256-97/9UYXOsg8v7QoRqo5rh0UGhjjS85K9OvUwtlG249c=";
};
patches = [
- # the webclient-files are not copied in the regular build script. Copy them just like the linux build
- ./fix-osx-resources.patch
+ # fix the location of the jellyfin-web path
+ ./fix-web-path.patch
# disable update notifications since the end user can't simply download the release artifacts to update
./disable-update-notifications.patch
];
@@ -79,9 +79,9 @@ mkDerivation rec {
"-DLINUX_X11POWER=ON"
];
- preBuild = ''
- # link the jellyfin-web files to the expected "dist" directory
- ln -s ${jellyfin-web}/share/jellyfin-web dist
+ preConfigure = ''
+ # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch)
+ ln -s ${jellyfin-web}/share/jellyfin-web .
'';
postInstall = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
deleted file mode 100644
index 5c562295b4..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-osx-resources.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 780c0d3..d9c2341 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -108,8 +108,8 @@ endif()
- set(RESOURCE_ROOT .)
- if(APPLE)
- set(RESOURCE_ROOT Resources)
-- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
-- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
-+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
- endif()
-
- if(NOT APPLE)
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
new file mode 100644
index 0000000000..250a5c0695
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch
@@ -0,0 +1,28 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5abca9b..d09176b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -107,10 +107,8 @@ endif()
+ set(RESOURCE_ROOT .)
+ if(APPLE)
+ set(RESOURCE_ROOT Resources)
+- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop)
+- endif()
+- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension)
++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop)
++ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension)
+ endif()
+
+ if(NOT APPLE)
+@@ -123,9 +121,7 @@ if(NOT APPLE)
+ install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources)
+ endif()
+ endforeach()
+- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/)
+- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+- endif()
++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension)
+ endif()
+
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix
index 7d58625d2d..35bfc7e8c5 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix
@@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "arteplussept";
namespace = "plugin.video.arteplussept";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip";
- hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI=";
+ hash = "sha256-B4IIYwWrQ5U+aPl9nzAN3HWaQjHX1G+hxpicBgBAwiA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix
index 0e0699752a..8dd9c5702a 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:
+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, cacert }:
buildKodiAddon rec {
pname = "certifi";
namespace = "script.module.certifi";
@@ -9,6 +9,21 @@ buildKodiAddon rec {
sha256 = "sha256-kIPGEjmnHlgVb11W2RKBlrMy3/+kUOcQZiLCcnHCcno=";
};
+ patches = [
+ # Add support for NIX_SSL_CERT_FILE
+ ./env.patch
+ ];
+
+ postPatch = ''
+ # Use our system-wide ca-bundle instead of the bundled one
+ ln -snvf "${cacert}/etc/ssl/certs/ca-bundle.crt" "lib/certifi/cacert.pem"
+ '';
+
+ propagatedNativeBuildInputs = [
+ # propagate cacerts setup-hook to set up `NIX_SSL_CERT_FILE`
+ cacert
+ ];
+
passthru = {
pythonPath = "lib";
updateScript = addonUpdateScript {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/env.patch b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/env.patch
new file mode 100644
index 0000000000..087ab58e44
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/certifi/env.patch
@@ -0,0 +1,86 @@
+diff --git a/lib/certifi/core.py b/lib/certifi/core.py
+index de02898..c033d20 100644
+--- a/lib/certifi/core.py
++++ b/lib/certifi/core.py
+@@ -4,15 +4,25 @@ certifi.py
+
+ This module returns the installation location of cacert.pem or its contents.
+ """
++import os
+ import sys
+
+
++def get_cacert_path_from_environ():
++ path = os.environ.get("NIX_SSL_CERT_FILE", None)
++
++ if path == "/no-cert-file.crt":
++ return None
++
++ return path
++
++
+ if sys.version_info >= (3, 11):
+
+ from importlib.resources import as_file, files
+
+ _CACERT_CTX = None
+- _CACERT_PATH = None
++ _CACERT_PATH = get_cacert_path_from_environ()
+
+ def where() -> str:
+ # This is slightly terrible, but we want to delay extracting the file
+@@ -39,14 +49,16 @@ if sys.version_info >= (3, 11):
+ return _CACERT_PATH
+
+ def contents() -> str:
+- return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii")
++ if _CACERT_PATH is not None:
++ return open(_CACERT_PATH, encoding="utf-8").read()
++ return files("certifi").joinpath("cacert.pem").read_text(encoding="utf-8")
+
+ elif sys.version_info >= (3, 7):
+
+ from importlib.resources import path as get_path, read_text
+
+ _CACERT_CTX = None
+- _CACERT_PATH = None
++ _CACERT_PATH = get_cacert_path_from_environ()
+
+ def where() -> str:
+ # This is slightly terrible, but we want to delay extracting the
+@@ -74,7 +86,9 @@ elif sys.version_info >= (3, 7):
+ return _CACERT_PATH
+
+ def contents() -> str:
+- return read_text("certifi", "cacert.pem", encoding="ascii")
++ if _CACERT_PATH is not None:
++ return open(_CACERT_PATH, encoding="utf-8").read()
++ return read_text("certifi", "cacert.pem", encoding="utf-8")
+
+ else:
+ import os
+@@ -84,6 +98,8 @@ else:
+ Package = Union[types.ModuleType, str]
+ Resource = Union[str, "os.PathLike"]
+
++ _CACERT_PATH = get_cacert_path_from_environ()
++
+ # This fallback will work for Python versions prior to 3.7 that lack the
+ # importlib.resources module but relies on the existing `where` function
+ # so won't address issues with environments like PyOxidizer that don't set
+@@ -102,7 +118,14 @@ else:
+ def where() -> str:
+ f = os.path.dirname(__file__)
+
++ if _CACERT_PATH is not None:
++ return _CACERT_PATH
++
+ return os.path.join(f, "cacert.pem")
+
+ def contents() -> str:
+- return read_text("certifi", "cacert.pem", encoding="ascii")
++ if _CACERT_PATH is not None:
++ with open(_CACERT_PATH, encoding="utf-8") as data:
++ return data.read()
++
++ return read_text("certifi", "cacert.pem", encoding="utf-8")
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
index fbace20ac6..652dd3a402 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
- version = "20.6.0";
+ version = "20.6.2";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
- sha256 = "sha256-D6t61/KUEQBMw5WrCfiWyFHnGbnpHWVKzzdgiRpviig=";
+ sha256 = "sha256-AQI7s6PAro+CZ6IoKGm8ii1ZKibfNc2oVVeCCZP+DTg=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
index b01af67cd6..fab7d8a443 100644
--- a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
+{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSEnv
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2
}:
@@ -73,7 +73,7 @@ let
};
# Lightworks expects some files in /usr/share/lightworks
-in buildFHSUserEnv {
+in buildFHSEnv {
name = lightworks.name;
targetPkgs = pkgs: [
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
index d36e2b6774..5fdb7d24f3 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
@@ -82,7 +82,7 @@ let
inherit (darwin.apple_sdk_11_0.frameworks)
AVFoundation CoreFoundation CoreMedia Cocoa CoreAudio MediaPlayer Accelerate;
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
-in stdenv.mkDerivation (self: {
+in stdenv.mkDerivation (finalAttrs: {
pname = "mpv";
version = "0.35.1";
@@ -91,7 +91,7 @@ in stdenv.mkDerivation (self: {
src = fetchFromGitHub {
owner = "mpv-player";
repo = "mpv";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM=";
};
@@ -233,7 +233,7 @@ in stdenv.mkDerivation (self: {
mpv is a free and open-source general-purpose video player, based on the
MPlayer and mplayer2 projects, with great improvements above both.
'';
- changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}";
+ changelog = "https://github.com/mpv-player/mpv/releases/tag/v${finalAttrs.version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ];
platforms = platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix
index af033781ac..2ba2b80cbd 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mpvacious";
- version = "0.20";
+ version = "0.23";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
- sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8=";
+ sha256 = "sha256-b0JUT5Y0u/H9p5whuFTU8EgQnKzFCUR2HA9NO+mxe04=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix
index 1a486dbf55..b88cd2c5b9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/uosc.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "uosc";
- version = "4.6.0";
+ version = "4.7.0";
src = fetchFromGitHub {
owner = "tomasklaen";
repo = "uosc";
rev = finalAttrs.version;
- hash = "sha256-AxApKlSaRLPl6VsXsARfaT3kWDK6AB2AAEmIHYiuFaM=";
+ hash = "sha256-JqlBjhwRgmXl6XfHYTwtNWZj656EDHjcdWOlCgihF5I=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix
index 7a9b5bd48f..fdb2b43d97 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -32,8 +32,12 @@
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
+ obs-source-clone = callPackage ./obs-source-clone.nix { };
+
obs-source-record = callPackage ./obs-source-record.nix { };
+ obs-teleport = callPackage ./obs-teleport { };
+
obs-vaapi = callPackage ./obs-vaapi { };
obs-vkcapture = callPackage ./obs-vkcapture.nix {
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
index 131817a258..a1cf5f2e7e 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "droidcam-obs";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "dev47apps";
repo = "droidcam-obs-plugin";
rev = version;
- sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50=";
+ sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix
new file mode 100644
index 0000000000..e0db31ae19
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, obs-studio
+}:
+
+stdenv.mkDerivation rec {
+ pname = "obs-source-clone";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "exeldro";
+ repo = "obs-source-clone";
+ rev = version;
+ sha256 = "sha256-cgqv2QdeGz4Aeoy4Dncw03l7NWGsZN1lsrZH7uHxGxw=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ obs-studio ];
+
+ cmakeFlags = [
+ "-DBUILD_OUT_OF_TREE=On"
+ ];
+
+ postInstall = ''
+ rm -rf $out/obs-plugins $out/data
+ '';
+
+ meta = with lib; {
+ description = "Plugin for OBS Studio to clone sources";
+ homepage = "https://github.com/exeldro/obs-source-clone";
+ maintainers = with maintainers; [ flexiondotorg ];
+ license = licenses.gpl2Plus;
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
new file mode 100644
index 0000000000..7aa0739a93
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix
@@ -0,0 +1,54 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+, libjpeg
+, nix-update-script
+, obs-studio
+}:
+
+buildGoModule rec {
+ pname = "obs-teleport";
+ version = "0.6.5";
+
+ src = fetchFromGitHub {
+ owner = "fzwoch";
+ repo = "obs-teleport";
+ rev = version;
+ sha256 = "sha256-J3Q0AQV21jh+Pth5wXbGbryrx7Mg65rAQVapyGBls7Y=";
+ };
+
+ vendorHash = "sha256-2rlEMkdcD+46EpQhUpLIGMzqvlyMFYK/XQYV9DJZxao=";
+
+ buildInputs = [
+ libjpeg
+ obs-studio
+ ];
+
+ ldflags = [ "-s" "-w" ];
+
+ CGO_CFLAGS = "-I${obs-studio}/include/obs";
+ CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api";
+
+ buildPhase = ''
+ runHook preBuild
+
+ go build -buildmode=c-shared -o obs-teleport.so .
+
+ runHook postBuild
+ '';
+
+ postInstall = ''
+ mkdir -p $out/lib/obs-plugins
+ mv obs-teleport.so $out/lib/obs-plugins
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "An OBS Studio plugin for an open NDI-like replacement";
+ homepage = "https://github.com/fzwoch/obs-teleport";
+ maintainers = [ lib.maintainers.paveloom ];
+ license = lib.licenses.gpl2Plus;
+ platforms = obs-studio.meta.platforms;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
index a3acd60b43..2c987d5ca9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix
@@ -7,7 +7,10 @@
, wayland
, wayland-scanner
, obs-studio
+, libffi
, libX11
+, libXau
+, libXdmcp
, libxcb
, vulkan-headers
, vulkan-loader
@@ -17,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "obs-vkcapture";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "nowrep";
repo = pname;
rev = "v${version}";
- hash = "sha256-4rEUA8V5WgAVyBeUT0ALVmj14HaAgeASYd2YiBn8MC0=";
+ hash = "sha256-UQQ8oBEnOxmSN4ZyW4LdPZYvd5eB9EmdR0UvE1wgMZw=";
};
cmakeFlags = lib.optionals stdenv.isi686 [
@@ -35,7 +38,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules ninja wayland-scanner ];
buildInputs = [
libGL
+ libffi
libX11
+ libXau
+ libXdmcp
libxcb
vulkan-headers
vulkan-loader
diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 0c028a4a04..5526c8b417 100644
--- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -13,6 +13,7 @@
, libXrandr
, pkg-config
, zlib
+, Accelerate
, AGL
, Cocoa
, Foundation
@@ -20,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "libopenshot-audio";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
- sha256 = "sha256-b3BZ275oJTxWfBWtdZetUQw0t7QznL0Q0lP7cKy/avg=";
+ sha256 = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw=";
};
patches = [
@@ -43,18 +44,19 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.isLinux [
alsa-lib
] ++ (if stdenv.isDarwin then [
- AGL
- Cocoa
- Foundation
- zlib
- ] else [
- libX11
- libXcursor
- libXext
- libXft
- libXinerama
- libXrandr
- ]);
+ Accelerate
+ AGL
+ Cocoa
+ Foundation
+ zlib
+ ] else [
+ libX11
+ libXcursor
+ libXext
+ libXft
+ libXinerama
+ libXrandr
+ ]);
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
index 904f039758..8335e01e2d 100644
--- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "libopenshot";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
- sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA=";
+ sha256 = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix
index d4da46cfc8..72dd596134 100644
--- a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix
@@ -21,14 +21,14 @@
, wrapQtAppsHook
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "qmplay2";
version = "23.02.05";
src = fetchFromGitHub {
owner = "zaps166";
repo = "QMPlay2";
- rev = self.version;
+ rev = finalAttrs.version;
sha256 = "sha256-ZDpUgD9qTvjopGFVrwTBSEmrXn+4aKq2zeqoTnXwmI8=";
fetchSubmodules = true;
};
@@ -71,7 +71,7 @@ stdenv.mkDerivation (self: {
files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3
browser.
'';
- changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${self.version}";
+ changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}";
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch b/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch
deleted file mode 100644
index f3b31ed958..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001
-From: ckie
-Date: Tue, 8 Feb 2022 19:18:49 +0200
-Subject: [PATCH] remove printer support
-
----
- app/src/CMakeLists.txt | 4 ++--
- guilib/src/CMakeLists.txt | 4 ++--
- guilib/src/GraphViewer.cpp | 12 +-----------
- guilib/src/ImageView.cpp | 16 ----------------
- guilib/src/utilite/UPlot.cpp | 9 ---------
- 5 files changed, 5 insertions(+), 40 deletions(-)
-
-diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
-index b20a07d4..2cad8c1e 100644
---- a/app/src/CMakeLists.txt
-+++ b/app/src/CMakeLists.txt
-@@ -63,9 +63,9 @@ ENDIF()
- TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES})
- IF(Qt5_FOUND)
- IF(Qt5Svg_FOUND)
-- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport)
-+ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg)
- ELSE()
-- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport)
-+ QT5_USE_MODULES(rtabmap Widgets Core Gui)
- ENDIF()
- ENDIF(Qt5_FOUND)
-
-diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt
-index 3711205b..a393aa25 100644
---- a/guilib/src/CMakeLists.txt
-+++ b/guilib/src/CMakeLists.txt
-@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES})
- TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES})
- IF(Qt5_FOUND)
- IF(Qt5Svg_FOUND)
-- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport)
-+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg)
- ELSE()
-- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport)
-+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui)
- ENDIF()
- ENDIF(Qt5_FOUND)
-
-diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp
-index 58907c34..7b41061f 100644
---- a/guilib/src/GraphViewer.cpp
-+++ b/guilib/src/GraphViewer.cpp
-@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include
- #include
- #include
--#include
- #include
- #ifdef QT_SVG_LIB
- #include
-@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)
- this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents
- QSize sceneSize = this->scene()->sceneRect().size().toSize();
-
-- if(QFileInfo(filePath).suffix().compare("pdf") == 0)
-- {
-- QPrinter printer(QPrinter::HighResolution);
-- printer.setOrientation(QPrinter::Portrait);
-- printer.setOutputFileName( filePath );
-- QPainter p(&printer);
-- scene()->render(&p);
-- p.end();
-- }
-- else if(QFileInfo(filePath).suffix().compare("svg") == 0)
-+ if(QFileInfo(filePath).suffix().compare("svg") == 0)
- {
- #ifdef QT_SVG_LIB
- QSvgGenerator svgGen;
-diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp
-index 714f2d36..887e7bdc 100644
---- a/guilib/src/ImageView.cpp
-+++ b/guilib/src/ImageView.cpp
-@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include
- #include
- #include
--#include
- #include
- #include "rtabmap/utilite/ULogger.h"
- #include "rtabmap/gui/KeypointItem.h"
-@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)
- }
-
- _savedFileName = text;
-- if(QFileInfo(text).suffix().compare("pdf") == 0)
-- {
-- QPrinter printer(QPrinter::HighResolution);
-- printer.setOrientation(QPrinter::Portrait);
-- printer.setOutputFileName( text );
-- QPainter p(&printer);
-- p.begin(&printer);
-- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width());
-- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height());
-- double scale = qMin(xscale, yscale);
-- p.scale(scale, scale);
-- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect());
-- p.end();
-- }
-- else
- {
- QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied);
- QPainter p(&img);
-diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp
-index 1b11c65e..8bf94841 100644
---- a/guilib/src/utilite/UPlot.cpp
-+++ b/guilib/src/utilite/UPlot.cpp
-@@ -42,7 +42,6 @@
- #include
- #include
- #include
--#include
- #include
- #include
- #ifdef QT_SVG_LIB
-@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)
- else
- {
- #endif
-- if(QFileInfo(text).suffix().compare("pdf") == 0)
-- {
-- QPrinter printer;
-- printer.setOutputFormat(QPrinter::PdfFormat);
-- printer.setOutputFileName(text);
-- this->render(&printer);
-- }
-- else
- {
- QPixmap figure = QPixmap::grabWidget(this);
- figure.save(text);
---
-2.34.1
-
diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix
index cecf6a3e4d..ecfd8a676b 100644
--- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix
@@ -1,24 +1,40 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen
-, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect
-, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack
-, xorg }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, cmake
+, opencv
+, pcl
+, libusb1
+, eigen
+, wrapQtAppsHook
+, qtbase
+, g2o
+, ceres-solver
+, libpointmatcher
+, octomap
+, freenect
+, libdc1394
+, librealsense
+, libGL
+, libGLU
+, vtkWithQt5
+, wrapGAppsHook
+, liblapack
+, xorg
+}:
stdenv.mkDerivation rec {
pname = "rtabmap";
- version = "unstable-2022-09-24";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
- rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e";
- sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI";
};
- patches = [
- # Our Qt5 seems to be missing PrintSupport.. I think?
- ./0001-remove-printer-support.patch
- ];
-
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ];
buildInputs = [
## Required
@@ -41,25 +57,17 @@ stdenv.mkDerivation rec {
qtbase
libGL
libGLU
- vtk_8_withQt5
+ vtkWithQt5
];
# Disable warnings that are irrelevant to us as packagers
cmakeFlags = [ "-Wno-dev" ];
- # We run one of the executables we build while the build is
- # still running (and patchelf hasn't been invoked) which means
- # the RPATH is not set correctly. This hacks around that error:
- #
- # build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory
- LD_LIBRARY_PATH = "/build/source/build/bin";
-
meta = with lib; {
description = "Real-Time Appearance-Based 3D Mapping";
homepage = "https://introlab.github.io/rtabmap/";
license = licenses.bsd3;
maintainers = with maintainers; [ ckie ];
platforms = with platforms; linux;
- broken = true;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix
index 70e335192d..de2b6898dd 100644
--- a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "ustreamer";
- version = "5.36";
+ version = "5.37";
src = fetchFromGitHub {
owner = "pikvm";
repo = "ustreamer";
rev = "v${version}";
- sha256 = "sha256-VnqCiEPaBzGN2TL7oXO4T7dcNdGneac/5nFPwRPiJ9c=";
+ sha256 = "sha256-Ervzk5TNYvo7nHyt0cBN8BMjgJKu2sqeXCltero3AnE=";
};
buildInputs = [ libbsd libevent libjpeg ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
index 457aa7a0da..fd263557d4 100644
--- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix
@@ -71,7 +71,7 @@
, onlyLibVLC ? false
, skins2Support ? !onlyLibVLC, freetype
, waylandSupport ? true, wayland, wayland-protocols
-, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook
+, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook, wrapGAppsHook
}:
# chromecastSupport requires TCP port 8010 to be open for it to work.
@@ -177,6 +177,7 @@ stdenv.mkDerivation rec {
pkg-config
removeReferencesTo
unzip
+ wrapGAppsHook
]
++ optionals withQt5 [ wrapQtAppsHook ]
++ optionals waylandSupport [ wayland wayland-protocols ];
@@ -209,6 +210,14 @@ stdenv.mkDerivation rec {
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
'';
+
+ # to prevent double wrapping of Qtwrap and Gwrap
+ dontWrapGApps = true;
+
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
# - Touch plugins (plugins cache keyed off mtime and file size:
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
# - Remove references to the Qt development headers (used in error messages)
diff --git a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix
index b20d73d7c0..75c8fbf982 100644
--- a/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/vokoscreen-ng/default.nix
@@ -22,13 +22,13 @@
mkDerivation rec {
pname = "vokoscreen-ng";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "vkohaupt";
repo = "vokoscreenNG";
rev = version;
- sha256 = "sha256-4VEIQj9/rSzXM5EQFt2I+cKKOM1URKlblf+6vlWEuO0=";
+ sha256 = "sha256-Du/Dq7AUH5CeEKYr0kxcqguAyRVI5Ame41nU3FGvG+U=";
};
qmakeFlags = [ "src/vokoscreenNG.pro" ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
index 8f1353fa83..47d22267c6 100644
--- a/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -2,7 +2,7 @@
## - export ELECTRON_SKIP_BINARY_DOWNLOAD=1
## - jq "del(.scripts.preinstall)" node_modules/shellcheck/package.json | sponge node_modules/shellcheck/package.json
{
- lib, stdenv, buildFHSUserEnvBubblewrap, runCommand, writeScript, fetchurl, fetchzip
+ lib, stdenv, buildFHSEnv, runCommand, writeScript, fetchurl, fetchzip
}:
let
pname = "webtorrent-desktop";
@@ -20,7 +20,7 @@ runCommand "${pname}-${version}" rec {
else
throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}";
- fhs = buildFHSUserEnvBubblewrap rec {
+ fhs = buildFHSEnv rec {
name = "fhsEnterWebTorrent";
runScript = "${src}/WebTorrent";
## use the trampoline, if you need to shell into the fhsenv
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix
index 7350765ab5..5499d7c2fd 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/OVMF/default.nix
@@ -48,6 +48,8 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments";
+ env.PYTHON_COMMAND = "python3";
+
postPatch = lib.optionalString csmSupport ''
cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
'';
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
index 65175bd35a..5351b6c442 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
@@ -179,7 +179,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cloud-hypervisor"
-version = "31.0.0"
+version = "31.1.0"
dependencies = [
"anyhow",
"api_client",
@@ -545,8 +545,7 @@ dependencies = [
[[package]]
name = "kvm-ioctls"
version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f8dc9c1896e5f144ec5d07169bc29f39a047686d29585a91f30489abfaeb6b"
+source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#23a3bb045a467e60bb00328a0b13cea13b5815d0"
dependencies = [
"kvm-bindings",
"libc",
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 7991b86c69..abfa0b02d3 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
- version = "31.0";
+ version = "31.1";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- sha256 = "RDHrBu8ePpFkN7BkTbqe2EXNNW7q96zNrjo269K1Zdo=";
+ sha256 = "vQa43ic3pRzRfT8S9LQIO+VIo6AS2tEMT16CDrMw8R0=";
};
cargoLock = {
@@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"acpi_tables-0.1.0" = "sha256-hP9Fi1K6hX0PkOuomjIzY+oOiPO/5YSNzo0Z98Syz2A=";
"kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM=";
+ "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE=";
"micro_http-0.1.0" = "sha256-w2witqKXE60P01oQleujmHSnzMKxynUGKWyq5GEh1Ew=";
"mshv-bindings-0.1.1" = "sha256-NwLPzX23nOe00qGoj1rLCWsJ5xEMmPUEtPVZNAYorWQ=";
"versionize_derive-0.1.4" = "sha256-BPl294UqjVl8tThuvylXUFjFNjJx8OSfBGJLg8jIkWw=";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
index cd27ceef5a..7b5a26975f 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,15 +15,15 @@
buildGoModule rec {
pname = "cri-o";
- version = "1.26.3";
+ version = "1.27.0";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw=";
+ sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY=";
};
- vendorSha256 = null;
+ vendorHash = null;
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix
index 5d15847d9c..c8af1b909c 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/wrapper.nix
@@ -4,6 +4,7 @@
, lib
, extraPackages ? []
, runc # Default container runtime
+, conntrack-tools
, crun # Container runtime (default with cgroups v2 for podman/buildah)
, conmon # Container runtime monitor
, util-linux # nsenter
@@ -13,6 +14,7 @@
let
binPath = lib.makeBinPath ([
runc
+ conntrack-tools
crun
conmon
util-linux
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
index c209fee634..ae4896e357 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix
@@ -38,13 +38,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- hash = "sha256-to4DP8cJakqLSjrMm6Y2vfYBZ9KgSMHxOULTF3vzu0g=";
+ hash = "sha256-wJ9V47X3tofFiwOzYignycm3PTRQWcAJ9iR2r5rJeJA=";
fetchSubmodules = true;
};
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
index 7cc4f13d79..311e486484 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
- version = "2.17.2";
+ version = "2.17.3";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
- sha256 = "sha256-cPvbPvrTUMN/JYGXLat2obsulicCn0uasPdiRxtuJRg=";
+ sha256 = "sha256-9P6WpTefcyKtpPGbe+nxoatG/i8v8C/vOX28j9Cu1Hc=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
- vendorHash = "sha256-XQZZEfS9ZrR/JKa11YWowsWhO8f4MVBmGkDhptMs43E=";
+ vendorHash = "sha256-YnGO5ccl1W3Q6DQ+6cEw7AEZTSbPcvJdQIWzWbQJ9Yo=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
index 58c303a46c..494d33ec87 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "amazon-ecs-agent";
- version = "1.67.2";
+ version = "1.70.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aws";
repo = pname;
- hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q=";
+ hash = "sha256-52Ty7g8SnhYAgYsE9mpmRmg4T6QifjWDIwNnJZBSPMk=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix
index 189105ab54..7924d7f70f 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "lima";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-jmVgrrbxkvzDkUYpNivz3jOOEEkr90iS5W4aY3L7Cug=";
+ sha256 = "sha256-uZE827dc79i7JPxHDI3kmAANN9XUIuhR0c9BUe92DyQ=";
};
- vendorHash = "sha256-8YmApeijOmWFfLu4UJTa1Ufn0RbaO4TKe7QHvjluMRg=";
+ vendorHash = "sha256-CysPzlup8TVVR4rCm3cWTjnxwJznMv0wbaeCC0ofWSU=";
nativeBuildInputs = [ makeWrapper installShellFiles ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix
index 4143c21218..097b9a657a 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-q+NMV0GagcGeUb+WD8BoFjAKJWgzBSq/POqwPUADAUI=";
+ sha256 = "sha256-ldX1V2QCqeCWkBT3qolkw6rYfuawnxE0ERMzgrjFmUQ=";
};
- cargoHash = "sha256-m9CvMorM7uX6OOfVCtM2pZPgRcKm7fVoTk/SCt8FXyU=";
+ cargoHash = "sha256-DEXVoG3uWXPiNVBaSdl/523MFXC21EtXZD8PFs+3rmQ=";
# skip test due FHS dependency
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix
index a05ff32e39..df73860dda 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-compose/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml }:
buildPythonApplication rec {
- version = "1.0.3";
+ version = "1.0.6";
pname = "podman-compose";
src = fetchFromGitHub {
repo = "podman-compose";
owner = "containers";
rev = "v${version}";
- sha256 = "sha256-Si/O4dx9bqqRp/hTv3WbTXj46OM+PpyPBnQQWUqcZfs=";
+ sha256 = "sha256-TsNM5xORqwWge+UCijKptwbAcIz1uZFN9BuIOl28vIU=";
};
propagatedBuildInputs = [ pyyaml python-dotenv ];
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix
index e574bb32ba..30dd54ba85 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-desktop/default.nix
@@ -12,19 +12,19 @@
, makeDesktopItem
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "podman-desktop";
version = "0.12.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-desktop";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
sha256 = "sha256-gEjcI+bfETYZB/pHDXRcNxNVDsbwuqQL1E22fMkIJHI=";
};
offlineCache = fetchYarnDeps {
- yarnLock = "${self.src}/yarn.lock";
+ yarnLock = "${finalAttrs.src}/yarn.lock";
sha256 = "sha256-x0hqNxi6r1i3vBe1tJQl+Oht2St9VIH3Eq27MZLkojA=";
};
@@ -103,7 +103,7 @@ stdenv.mkDerivation (self: {
icon = "podman-desktop";
desktopName = "Podman Desktop";
genericName = "Desktop client for podman";
- comment = self.meta.description;
+ comment = finalAttrs.meta.description;
categories = [ "Utility" ];
startupWMClass = "Podman Desktop";
})
@@ -112,7 +112,7 @@ stdenv.mkDerivation (self: {
meta = with lib; {
description = "A graphical tool for developing on containers and Kubernetes";
homepage = "https://podman-desktop.io";
- changelog = "https://github.com/containers/podman-desktop/releases/tag/v${self.version}";
+ changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}";
license = licenses.asl20;
maintainers = with maintainers; [ panda2134 ];
inherit (electron.meta) platforms;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index 52a20bb57f..e9bd284e83 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
@@ -15,6 +15,7 @@
, nixosTests
, python3
, makeWrapper
+, runtimeShell
, symlinkJoin
, extraPackages ? [ ]
, runc
@@ -61,13 +62,13 @@ let
in
buildGoModule rec {
pname = "podman";
- version = "4.4.4";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman";
rev = "v${version}";
- hash = "sha256-rLXq+sveSxeoD3gyXSnfgGFx6alOBKSRCdDHGwwvPm4=";
+ hash = "sha256-udvvTdkpL8xvY0iIMBgBFQk5sybpn9vCFFXP0ZqOajM=";
};
patches = [
@@ -99,6 +100,7 @@ buildGoModule rec {
buildPhase = ''
runHook preBuild
patchShebangs .
+ substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}"
${if stdenv.isDarwin then ''
make podman-remote # podman-mac-helper uses FHS paths
'' else ''
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock
index 47a9d426bc..bab595a2aa 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/pods/Cargo.lock
@@ -28,15 +28,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "ashpd"
-version = "0.4.0-alpha.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "974f7451ac6438b57257de542be1ffc7a7c725b6f51c47dc19351e49f1c24687"
+checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41"
dependencies = [
"enumflags2",
"futures-channel",
@@ -63,75 +63,26 @@ dependencies = [
"futures-core",
]
-[[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-io"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
-dependencies = [
- "async-lock",
- "autocfg",
- "concurrent-queue",
- "futures-lite",
- "libc",
- "log",
- "parking",
- "polling",
- "slab",
- "socket2",
- "waker-fn",
- "windows-sys 0.42.0",
-]
-
-[[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-recursion"
-version = "1.0.2"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796"
+checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
]
-[[package]]
-name = "async-task"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
-
[[package]]
name = "async-trait"
-version = "0.1.64"
+version = "0.1.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
]
[[package]]
@@ -160,9 +111,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[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",
]
@@ -193,9 +144,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
[[package]]
name = "cairo-rs"
-version = "0.16.7"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
+checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871"
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -207,9 +158,9 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
+checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e"
dependencies = [
"glib-sys",
"libc",
@@ -224,9 +175,9 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"
dependencies = [
"smallvec",
]
@@ -239,9 +190,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",
"js-sys",
@@ -263,19 +214,11 @@ dependencies = [
"unicode-width",
]
-[[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 = "containers-api"
-version = "0.7.0"
-source = "git+https://github.com/vv9k/containers-api#200805805981b2bbe7154922fa0da675e93acbfc"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef94b0ff8338282b35bafb408eb0a3e53ba05bdb3b36840589ab9a67a6682593"
dependencies = [
"chrono",
"flate2",
@@ -303,9 +246,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",
]
@@ -319,15 +262,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
-dependencies = [
- "cfg-if",
-]
-
[[package]]
name = "crypto-common"
version = "0.1.6"
@@ -340,9 +274,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -352,9 +286,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
dependencies = [
"cc",
"codespan-reporting",
@@ -362,24 +296,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 2.0.11",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.91"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
]
[[package]]
@@ -390,7 +324,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -441,18 +375,18 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys",
]
[[package]]
@@ -491,11 +425,11 @@ dependencies = [
[[package]]
name = "field-offset"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
dependencies = [
- "memoffset",
+ "memoffset 0.8.0",
"rustc_version",
]
@@ -507,8 +441,8 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
- "windows-sys 0.45.0",
+ "redox_syscall 0.2.16",
+ "windows-sys",
]
[[package]]
@@ -538,9 +472,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
dependencies = [
"futures-channel",
"futures-core",
@@ -553,9 +487,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
dependencies = [
"futures-core",
"futures-sink",
@@ -563,15 +497,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
[[package]]
name = "futures-executor"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
dependencies = [
"futures-core",
"futures-task",
@@ -580,53 +514,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
-
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
+checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
[[package]]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "futures-sink"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
[[package]]
name = "futures-task"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
[[package]]
name = "futures-util"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
dependencies = [
"futures-channel",
"futures-core",
@@ -654,22 +573,23 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.16.7"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
+checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf"
dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
"glib",
"libc",
+ "once_cell",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
+checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b"
dependencies = [
"gio-sys",
"glib-sys",
@@ -680,9 +600,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9"
+checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff"
dependencies = [
"bitflags",
"cairo-rs",
@@ -696,9 +616,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db"
+checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -713,9 +633,9 @@ dependencies = [
[[package]]
name = "gdk4-wayland"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9998dedfee371c33356809f24790a1593c4751367ace7f66256dd759173701a"
+checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd"
dependencies = [
"gdk4",
"gdk4-wayland-sys",
@@ -726,9 +646,9 @@ dependencies = [
[[package]]
name = "gdk4-wayland-sys"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7017f59dc8c3a0c25756d617be038540642be64b9f229a531507b8f8e3e645ea"
+checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c"
dependencies = [
"glib-sys",
"libc",
@@ -737,9 +657,9 @@ dependencies = [
[[package]]
name = "gdk4-x11"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d739e89b1be52f2216a6fe81a8ed7225c882b7c4f67a44c13506cc028ec48e62"
+checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee"
dependencies = [
"gdk4",
"gdk4-x11-sys",
@@ -750,9 +670,9 @@ dependencies = [
[[package]]
name = "gdk4-x11-sys"
-version = "0.5.4"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5493c6af80cdc84b284714b3313af45788a8f1afd34b020f915f6e7cd65f502"
+checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72"
dependencies = [
"gdk4-sys",
"glib-sys",
@@ -762,9 +682,9 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -803,9 +723,9 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.16.7"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
+checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125"
dependencies = [
"bitflags",
"futures-channel",
@@ -823,9 +743,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
+checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -836,9 +756,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.16.7"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f"
+checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773"
dependencies = [
"bitflags",
"futures-channel",
@@ -851,6 +771,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
+ "memchr",
"once_cell",
"smallvec",
"thiserror",
@@ -858,9 +779,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.16.3"
+version = "0.17.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf"
+checksum = "32e73a9790e243f6d55d8e302426419f6084a1de7a84cd07f7268300408a19de"
dependencies = [
"anyhow",
"heck",
@@ -868,14 +789,14 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "glib-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
+checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5"
dependencies = [
"libc",
"system-deps",
@@ -883,9 +804,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.16.3"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
+checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0"
dependencies = [
"glib-sys",
"libc",
@@ -894,9 +815,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.16.3"
+version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b"
+checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256"
dependencies = [
"glib",
"graphene-sys",
@@ -905,9 +826,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6"
+checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9"
dependencies = [
"glib-sys",
"libc",
@@ -917,9 +838,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491"
+checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c"
dependencies = [
"bitflags",
"cairo-rs",
@@ -933,9 +854,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5"
+checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -949,9 +870,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.5.5"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e"
+checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed"
dependencies = [
"bitflags",
"cairo-rs",
@@ -972,23 +893,23 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.5.5"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832687a415d9d8bc11fe9c17dda1bf13ee262c41b995dd4df1d1cce33cead405"
+checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0"
dependencies = [
"anyhow",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "gtk4-sys"
-version = "0.5.5"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605"
+checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1024,6 +945,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -1077,9 +1004,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "hyper"
-version = "0.14.24"
+version = "0.14.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
dependencies = [
"bytes 1.4.0",
"futures-channel",
@@ -1113,16 +1040,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "716f12fbcfac6ffab0a5e9ec51d0a0ff70503742bb2dc7b99396394c9dc323f0"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows",
]
[[package]]
@@ -1147,9 +1074,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",
@@ -1167,19 +1094,20 @@ dependencies = [
[[package]]
name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
dependencies = [
+ "hermit-abi 0.3.1",
"libc",
- "windows-sys 0.45.0",
+ "windows-sys",
]
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "js-sys"
@@ -1198,9 +1126,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libadwaita"
-version = "0.2.1"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48"
+checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700"
dependencies = [
"bitflags",
"futures-channel",
@@ -1217,9 +1145,9 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
-version = "0.2.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b"
+checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -1233,15 +1161,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
[[package]]
name = "libpanel"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1ec3283c330f31d070da43c360ab23a43f13a88a2c9f1897161d3358d27fec"
+checksum = "a5313f06d37cb94e7a54ce3eb8a706e0263c8ed718671d6c775e3935f23abd7a"
dependencies = [
"futures-core",
"gdk4",
@@ -1254,9 +1182,9 @@ dependencies = [
[[package]]
name = "libpanel-sys"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57246fd0e698fac89bd794371e7a7db705d09ead1473cfb7f9976ddcfc215776"
+checksum = "3a80572ca80bb4d578cbc1ffe4d848c59815fc567fd67c5a64f2bf53ad78dc0e"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -1279,9 +1207,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
[[package]]
name = "locale_config"
@@ -1328,18 +1256,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
dependencies = [
"autocfg",
]
[[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 = "miniz_oxide"
@@ -1359,7 +1296,7 @@ dependencies = [
"libc",
"log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys",
]
[[package]]
@@ -1373,16 +1310,16 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.25.1"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "autocfg",
"bitflags",
"cfg-if",
"libc",
- "memoffset",
+ "memoffset 0.7.1",
"pin-utils",
+ "static_assertions",
]
[[package]]
@@ -1410,7 +1347,7 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
"libc",
]
@@ -1470,9 +1407,9 @@ dependencies = [
[[package]]
name = "pango"
-version = "0.16.5"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
+checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37"
dependencies = [
"bitflags",
"gio",
@@ -1484,9 +1421,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.16.3"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
+checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1494,17 +1431,11 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
[[package]]
name = "paste"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
[[package]]
name = "percent-encoding"
@@ -1512,16 +1443,6 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
[[package]]
name = "pin-project"
version = "0.4.30"
@@ -1548,7 +1469,7 @@ checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1559,7 +1480,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1582,8 +1503,8 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "podman-api"
-version = "0.8.0"
-source = "git+https://github.com/vv9k/podman-api-rs.git#34c8f52c6a6096debe03668026d26585b02263e4"
+version = "0.10.0-dev"
+source = "git+https://github.com/vv9k/podman-api-rs.git#33cf4bf6723f269f632115c9c165d54c501e1890"
dependencies = [
"base64",
"byteorder",
@@ -1605,8 +1526,8 @@ dependencies = [
[[package]]
name = "podman-api-stubs"
-version = "0.8.0"
-source = "git+https://github.com/vv9k/podman-api-rs.git#34c8f52c6a6096debe03668026d26585b02263e4"
+version = "0.10.0-dev"
+source = "git+https://github.com/vv9k/podman-api-rs.git#33cf4bf6723f269f632115c9c165d54c501e1890"
dependencies = [
"chrono",
"serde",
@@ -1615,7 +1536,7 @@ dependencies = [
[[package]]
name = "pods"
-version = "1.0.6"
+version = "1.1.0"
dependencies = [
"anyhow",
"ashpd",
@@ -1640,20 +1561,6 @@ dependencies = [
"vte4",
]
-[[package]]
-name = "polling"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
-dependencies = [
- "autocfg",
- "cfg-if",
- "libc",
- "log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
-]
-
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -1679,7 +1586,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -1696,18 +1603,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@@ -1751,6 +1658,15 @@ dependencies = [
"bitflags",
]
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "redox_users"
version = "0.4.3"
@@ -1758,15 +1674,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.7.1"
+version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
@@ -1775,88 +1691,76 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rustc_version"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]]
name = "rustix"
-version = "0.36.8"
+version = "0.37.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys",
]
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
[[package]]
name = "scratch"
-version = "1.0.3"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
-version = "1.0.152"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.152"
+version = "1.0.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
]
[[package]]
name = "serde_json"
-version = "1.0.93"
+version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
dependencies = [
"itoa",
"ryu",
@@ -1865,13 +1769,22 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.10"
+version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+dependencies = [
+ "serde",
]
[[package]]
@@ -1911,9 +1824,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",
@@ -1921,9 +1834,9 @@ dependencies = [
[[package]]
name = "sourceview5"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922cc28db6bec169868319262dd932f6403e5ce95dad0d2bb6fcc9ac03be7f10"
+checksum = "850a255e21be2bfd5db5ae76f90b1748f7b397440912031eab5e10b5cab2bde8"
dependencies = [
"bitflags",
"futures-channel",
@@ -1940,9 +1853,9 @@ dependencies = [
[[package]]
name = "sourceview5-sys"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73277b2a53923aeecd212a89379dce7e6c687fe35fe6dd41d9b0d7b3d4c2eb0b"
+checksum = "e7a23462cd3d696199b56317d35e69b240d655b8c70c12bd8f443b672313776c"
dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys",
@@ -1972,6 +1885,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "syslog"
version = "6.0.1"
@@ -1987,9 +1911,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"
dependencies = [
"cfg-expr",
"heck",
@@ -2017,15 +1941,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
[[package]]
name = "tempfile"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.42.0",
+ "windows-sys",
]
[[package]]
@@ -2039,22 +1963,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.11",
]
[[package]]
@@ -2114,21 +2038,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.26.0"
+version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg",
"bytes 1.4.0",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tracing",
- "windows-sys 0.45.0",
+ "windows-sys",
]
[[package]]
@@ -2151,7 +2074,7 @@ dependencies = [
"filetime",
"futures-core",
"libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"tokio",
"tokio-stream",
"xattr",
@@ -2159,11 +2082,14 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.11"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
dependencies = [
"serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
]
[[package]]
@@ -2171,14 +2097,19 @@ name = "toml_datetime"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+dependencies = [
+ "serde",
+]
[[package]]
name = "toml_edit"
-version = "0.19.4"
+version = "0.19.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825"
+checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
dependencies = [
"indexmap",
+ "serde",
+ "serde_spanned",
"toml_datetime",
"winnow",
]
@@ -2209,7 +2140,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2233,12 +2164,6 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "uds_windows"
version = "1.0.2"
@@ -2251,15 +2176,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-normalization"
@@ -2290,9 +2215,9 @@ dependencies = [
[[package]]
name = "utf8parse"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "version-compare"
@@ -2319,14 +2244,14 @@ dependencies = [
[[package]]
name = "vte4"
version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4520ffebab5e51521768dd986c52079cec892ab92818f9c99dcad85816bd4fb8"
+source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#b8d3b182e9c28235961741e1d3d311d9689f07ff"
dependencies = [
"bitflags",
"gdk4",
"gio",
"glib",
"gtk4",
+ "io-lifetimes",
"libc",
"pango",
"vte4-sys",
@@ -2335,8 +2260,7 @@ dependencies = [
[[package]]
name = "vte4-sys"
version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6cafdaaf6768a31d96fbd80f1e29506c21ab53d1eae1c6d803d2c48f788b63"
+source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#b8d3b182e9c28235961741e1d3d311d9689f07ff"
dependencies = [
"gdk4-sys",
"gio-sys",
@@ -2357,12 +2281,6 @@ dependencies = [
"quote",
]
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
[[package]]
name = "want"
version = "0.3.0"
@@ -2406,7 +2324,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
@@ -2428,7 +2346,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -2439,15 +2357,6 @@ version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "winapi"
version = "0.3.9"
@@ -2480,18 +2389,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows"
+version = "0.47.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "2649ff315bee4c98757f15dac226efe3d81927adbb6e882084bb1ee3e0c330a7"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows-targets 0.47.0",
]
[[package]]
@@ -2500,71 +2403,128 @@ version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
]
[[package]]
name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f8996d3f43b4b2d44327cd71b7b0efd1284ab60e6e9d0e8b630e18555d87d3e"
+dependencies = [
+ "windows_aarch64_gnullvm 0.47.0",
+ "windows_aarch64_msvc 0.47.0",
+ "windows_i686_gnu 0.47.0",
+ "windows_i686_msvc 0.47.0",
+ "windows_x86_64_gnu 0.47.0",
+ "windows_x86_64_gnullvm 0.47.0",
+ "windows_x86_64_msvc 0.47.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7acaa0c2cf0d2ef99b61c308a0c3dbae430a51b7345dedec470bd8f53f5a3642"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7"
[[package]]
name = "winnow"
-version = "0.3.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658"
+checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
dependencies = [
"memchr",
]
@@ -2580,16 +2540,12 @@ dependencies = [
[[package]]
name = "zbus"
-version = "3.10.0"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f770930448dd412a4a7131dd968a8e6df0064db4d7916fbbd2d6c3f26b566938"
+checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848"
dependencies = [
"async-broadcast",
- "async-executor",
- "async-io",
- "async-lock",
"async-recursion",
- "async-task",
"async-trait",
"byteorder",
"derivative",
@@ -2620,15 +2576,16 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "3.10.0"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4832059b438689017db7340580ebabba07f114eab91bf990c6e55052408b40d8"
+checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"regex",
- "syn",
+ "syn 1.0.109",
+ "zvariant_utils",
]
[[package]]
@@ -2644,9 +2601,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "3.11.0"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "903169c05b9ab948ee93fefc9127d08930df4ce031d46c980784274439803e51"
+checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8"
dependencies = [
"byteorder",
"enumflags2",
@@ -2659,12 +2616,24 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "3.11.0"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce76636e8fab7911be67211cf378c252b115ee7f2bae14b18b84821b39260b5"
+checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix
index c10cfa3be0..7ae492b860 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix
@@ -17,20 +17,20 @@
stdenv.mkDerivation rec {
pname = "pods";
- version = "1.0.6";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "marhkb";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZryzNlEj/2JTp5FJiDzXN9v1DvczfebqEOrJP+dKaRw=";
+ sha256 = "sha256-BvSDFWmIQ55kbZtWybemZXT7lSDwxSCpPAsqwElZOBM=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "containers-api-0.7.0" = "sha256-S6uDIjxFxHNqt1GK4Z+ZSTxjChNP1R5ASrO24/2oDi0=";
- "podman-api-0.8.0" = "sha256-Gq1xcqqQZPqQ3+VEyfbdiBxeiaYiluXIa6E0el/sUIo=";
+ "podman-api-0.10.0-dev" = "sha256-6xpPdssfgXY5sDyZOzApaZPjzDLqq734UEl9FTkZyQQ=";
+ "vte4-0.5.0" = "sha256-7yXIcvMNAAeyK57O5l42ndBI+Ij55KFwClhBeLM5Zlo=";
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index c882493d8c..0761d58c72 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages
-, perl, pixman, vde2, alsa-lib, texinfo, flex
+, pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
, makeWrapper, runtimeShell, removeReferencesTo
, attr, libcap, libcap_ng, socat, libslirp
, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet
-, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows
+, guestAgentSupport ? with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
, seccompSupport ? stdenv.isLinux, libseccomp
, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner
@@ -27,6 +27,7 @@
, tpmSupport ? true
, uringSupport ? stdenv.isLinux, liburing
, canokeySupport ? false, canokey-qemu
+, enableDocs ? true
, hostCpuOnly ? false
, hostCpuTargets ? (if hostCpuOnly
then (lib.optional stdenv.isx86_64 "i386-softmmu"
@@ -37,31 +38,37 @@
, qemu # for passthru.tests
}:
+let
+ hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;
+in
+
stdenv.mkDerivation rec {
pname = "qemu"
+ lib.optionalString xenSupport "-xen"
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests";
- version = "7.2.1";
+ version = "8.0.0";
src = fetchurl {
url = "https://download.qemu.org/qemu-${version}.tar.xz";
- sha256 = "jIVpms+dekOl/immTN1WNwsMLRrQdLr3CYqCTReq1zs=";
+ sha256 = "u2DwNBUxGB1sw5ad0ZoBPQQnqH+RgZOXDZrbkRMeVtA=";
};
- depsBuildBuild = [ buildPackages.stdenv.cc ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ]
+ ++ lib.optionals hexagonSupport [ pkg-config ];
nativeBuildInputs = [
makeWrapper removeReferencesTo
- pkg-config flex bison meson ninja perl
+ pkg-config flex bison meson ninja
# Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme
]
++ lib.optionals gtkSupport [ wrapGAppsHook ]
+ ++ lib.optionals hexagonSupport [ glib ]
++ lib.optionals stdenv.isDarwin [ sigtool ];
- buildInputs = [ zlib glib perl pixman
+ buildInputs = [ zlib glib pixman
vde2 texinfo lzo snappy libtasn1
gnutls nettle curl libslirp
]
@@ -117,15 +124,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E=";
revert = true;
})
- # glibc >=2.37 compat, see https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/
- (fetchpatch {
- url = "https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a.patch";
- sha256 = "sha256-1iWOWkLH0WP1Hk23fmrRVdX7YZWUXOvWRMTt8QM93BI=";
- })
- (fetchpatch {
- url = "https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e.patch";
- sha256 = "sha256-DKGCbR+VDIFLp6FhER78gyJ3Rn1dD47pMtkcIIMd0B8=";
- })
]
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
@@ -150,7 +148,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-strip" # We'll strip ourselves after separating debug info.
- "--enable-docs"
+ (lib.enableFeature enableDocs "docs")
"--enable-tools"
"--localstatedir=/var"
"--sysconfdir=/etc"
@@ -241,8 +239,6 @@ stdenv.mkDerivation rec {
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
postInstall = ''
ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm
- '' + lib.optionalString stdenv.isLinux ''
- ln -s $out/libexec/virtiofsd $out/bin
'';
passthru = {
@@ -262,6 +258,5 @@ stdenv.mkDerivation rec {
mainProgram = "qemu-kvm";
maintainers = with maintainers; [ eelco qyliss ];
platforms = platforms.unix;
- priority = 10; # Prefer virtiofsd from the virtiofsd package.
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch
index 98cc09d720..dc4f4abb27 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch
@@ -1,4 +1,4 @@
-From 747a741772cde6bb340eb8bdb493390280de8d16 Mon Sep 17 00:00:00 2001
+From 2ec149ea3f0046fa83e3be74aca192649a60be47 Mon Sep 17 00:00:00 2001
From: Keno Fischer
Date: Sat, 16 Jun 2018 20:56:54 -0400
Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat
@@ -29,23 +29,23 @@ Signed-off-by: Will Cohen
4 files changed, 111 insertions(+), 1 deletion(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index d42ce6d8b8..b2c1fa42e1 100644
+index 9d07620235..9c77a431d5 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
-@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path,
+@@ -1081,7 +1081,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path,
goto out;
}
-- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW);
+- ret = qemu_utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW);
+ ret = utimensat_nofollow(dirfd, name, buf);
close_preserve_errno(dirfd);
out:
g_free(dirpath);
diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c
-index bec0253474..2fc0475292 100644
+index 95146e7354..74ab2a7f99 100644
--- a/hw/9pfs/9p-util-darwin.c
+++ b/hw/9pfs/9p-util-darwin.c
-@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
+@@ -145,3 +145,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
}
#endif
@@ -160,12 +160,12 @@ index db451b0784..320697f347 100644
+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW);
+}
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
-index 97e681e167..fd50d6243a 100644
+index c314cf381d..12d57f3398 100644
--- a/hw/9pfs/9p-util.h
+++ b/hw/9pfs/9p-util.h
-@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name,
- #define qemu_lsetxattr lsetxattr
- #endif
+@@ -101,6 +101,12 @@ static inline int errno_to_dotl(int err) {
+ #define qemu_utimensat utimensat
+ #define qemu_unlinkat unlinkat
+/* Compatibility with old SDK Versions for Darwin */
+#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW)
@@ -176,7 +176,7 @@ index 97e681e167..fd50d6243a 100644
static inline void close_preserve_errno(int fd)
{
int serrno = errno;
-@@ -98,6 +104,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename,
+@@ -163,6 +169,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename,
char *list, size_t size);
ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,
const char *name);
@@ -186,5 +186,4 @@ index 97e681e167..fd50d6243a 100644
/*
* Darwin has d_seekoff, which appears to function similarly to d_off.
--
-2.35.1
-
+2.39.2
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix
index c1cdf18d85..b23c35c513 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "runc";
- version = "1.1.6";
+ version = "1.1.7";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
- hash = "sha256-vcOOkpUywDqHW+ZZO0tSsMmJp3gSvyRy/nVrn1deLY0=";
+ hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
};
vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
index 54f3cf7700..1c5a20d8b8 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
@@ -1,35 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, SDL_compat }:
+{ lib, stdenv, fetchFromGitHub, SDL_compat, libX11, libXext }:
stdenv.mkDerivation rec {
pname = "rvvm";
- version = "unstable-2023-01-25";
+ version = "0.5";
src = fetchFromGitHub {
owner = "LekKit";
repo = "RVVM";
- rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10";
- sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4=";
+ rev = "v${version}";
+ sha256 = "sha256-1wAKijRYB0FGBe4cSHUynkO4ePVG4QvVIgSoWzNbqtE=";
};
- buildInputs = [ SDL_compat ];
+ buildInputs = if stdenv.isDarwin then [ SDL_compat ] else [ libX11 libXext ];
- makeFlags =
- [ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ]
+ buildFlags = [ "all" "lib" ];
+
+ makeFlags = [ "PREFIX=$(out)" ]
# work around https://github.com/NixOS/nixpkgs/issues/19098
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
- installPhase = ''
- runHook preInstall
-
- install -d $out/{bin,lib,include/devices}
- install -m755 out/rvvm -t $out/bin
- install -m755 out/librvvm.{a,so} -t $out/lib
- install -m644 src/rvvmlib.h -t $out/include
- install -m644 src/devices/*.h -t $out/include/devices
-
- runHook postInstall
- '';
-
meta = with lib; {
homepage = "https://github.com/LekKit/RVVM";
description = "The RISC-V Virtual Machine";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix
index b952b0f189..9a1f650132 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/sail-riscv/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, lib
, arch
, ocamlPackages
@@ -24,14 +25,24 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [ zlib linksem ];
strictDeps = true;
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/riscv/sail-riscv/pull/250/commits/8bd37c484b83a8ce89c8bb7a001b8ae34dc4d77f.patch";
+ hash = "sha256-tDgkGhcbT6phoCAvilxMI56YUuUqQFgvh+2QduOjdMg=";
+ })
+ ];
+
postPatch = ''
rm -r prover_snapshots
+ '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace Makefile --replace "-flto" ""
'';
makeFlags = [
"SAIL=sail"
"ARCH=${arch}"
"SAIL_DIR=${ocamlPackages.sail}/share/sail"
+ "LEM_DIR=${ocamlPackages.sail}/share/lem"
];
installPhase = ''
@@ -50,6 +61,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/riscv/sail-riscv";
description = "A formal specification of the RISC-V architecture, written in Sail";
maintainers = with maintainers; [ genericnerdyusername ];
+ broken = stdenv.isDarwin && stdenv.isAarch64;
license = licenses.bsd2;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix
index 5312dbdda0..ab9f1d1ce7 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/generic.nix
@@ -36,7 +36,9 @@ in
, conmon
, coreutils
, cryptsetup
+, e2fsprogs
, fakeroot
+, fuse2fs ? e2fsprogs.fuse2fs
, go
, gpgme
, libseccomp
@@ -46,6 +48,10 @@ in
, openssl
, squashfsTools
, squashfuse
+ # Test dependencies
+, singularity-tools
+, cowsay
+, hello
# Overridable configurations
, enableNvidiaContainerCli ? true
# Compile with seccomp support
@@ -83,7 +89,7 @@ let
ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap"
'');
in
-buildGoModule {
+(buildGoModule {
inherit pname version src;
# Override vendorHash with the output got from
@@ -113,6 +119,12 @@ buildGoModule {
which
];
+ # Search inside the project sources
+ # and see the `control` file of the Debian package from upstream repos
+ # for build-time dependencies and run-time utilities
+ # apptainer/apptainer: https://github.com/apptainer/apptainer/blob/main/dist/debian/control
+ # sylabs/singularity: https://github.com/sylabs/singularity/blob/main/debian/control
+
buildInputs = [
bash # To patch /bin/sh shebangs.
conmon
@@ -120,8 +132,7 @@ buildGoModule {
gpgme
libuuid
openssl
- squashfsTools
- squashfuse
+ squashfsTools # Required at build time by SingularityCE
]
++ lib.optional enableNvidiaContainerCli nvidia-docker
++ lib.optional enableSeccomp libseccomp
@@ -144,6 +155,8 @@ buildGoModule {
bash
coreutils
cryptsetup # cryptsetup
+ fakeroot
+ fuse2fs # Mount ext3 filesystems
go
privileged-un-utils
squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image
@@ -191,10 +204,7 @@ buildGoModule {
substituteInPlace "$out/bin/run-singularity" \
--replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}"
wrapProgram "$out/bin/${projectName}" \
- --prefix PATH : "${lib.makeBinPath [
- fakeroot
- squashfsTools # Singularity (but not Apptainer) expects unsquashfs from the host PATH
- ]}"
+ --prefix PATH : "''${defaultPathInputs// /\/bin:}"
# Make changes in the config file
${lib.optionalString enableNvidiaContainerCli ''
substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \
@@ -235,4 +245,14 @@ buildGoModule {
maintainers = with maintainers; [ jbedo ShamrockLee ];
mainProgram = projectName;
} // extraMeta;
-}
+}).overrideAttrs (finalAttrs: prevAttrs: {
+ passthru = prevAttrs.passthru or { } // {
+ tests = {
+ image-hello-cowsay = singularity-tools.buildImage {
+ name = "hello-cowsay";
+ contents = [ hello cowsay ];
+ singularity = finalAttrs.finalPackage;
+ };
+ };
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
index a21066d775..73bed19fb7 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/packages.nix
@@ -7,20 +7,20 @@ let
apptainer = callPackage
(import ./generic.nix rec {
pname = "apptainer";
- version = "1.1.5";
+ version = "1.1.7";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "v${version}";
- hash = "sha256-onJkpHJNsO0cQO2m+TmdMuMkuvH178mDhOeX41bYFic=";
+ hash = "sha256-3F8qwP27IXcnnEYMnLzkCOxQDx7yej6QIZ40Wb5pk34=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).go-modules"
# at the root directory of the Nixpkgs repository
- vendorHash = "sha256-tAnh7A8Lw5KtY7hq+sqHMEUlgXvgeeCKKIfRZFoRtug=";
+ vendorHash = "sha256-PfFubgR/W1WBXIsRO+Kg7hA6ebeAcRiJlTlAZbnl19A=";
extraDescription = " (previously known as Singularity)";
extraMeta.homepage = "https://apptainer.org";
@@ -38,20 +38,20 @@ let
singularity = callPackage
(import ./generic.nix rec {
pname = "singularity-ce";
- version = "3.10.4";
+ version = "3.11.1";
projectName = "singularity";
src = fetchFromGitHub {
owner = "sylabs";
repo = "singularity";
rev = "v${version}";
- hash = "sha256-bUnQXQVwaVA3Lkw3X9TBWqNBgiPxAVCHnkq0vc+CIsM=";
+ hash = "sha256-gdgg6VN3Ily+2Remz6dZBhhfWIxyaBa4bIlFcgrA/uY=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).go-modules"
# at the root directory of the Nixpkgs repository
- vendorHash = "sha256-K8helLcOuz3E4LzBE9y3pnZqwdwhO/iMPTN1o22ipVg=";
+ vendorHash = "sha256-mBhlH6LSmcJuc6HbU/3Q9ii7vJkW9jcikBWCl8oeMOk=";
# Do not build conmon from the Git submodule source,
# Use Nixpkgs provided version
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix
index 035fc9ceb2..f15bc91634 100755
--- a/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/vmware-workstation/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, buildFHSUserEnv
+, buildFHSEnv
, fetchurl
, lib
, zlib
@@ -64,7 +64,7 @@ let
'';
});
- vmware-unpack-env = buildFHSUserEnv rec {
+ vmware-unpack-env = buildFHSEnv rec {
name = "vmware-unpack-env";
targetPkgs = pkgs: [ zlib ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix
index 8a687d45e2..dd84f642e3 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix
@@ -244,10 +244,21 @@ stdenv.mkDerivation (rec {
+ "\nIncludes:\n"
+ withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}.");
platforms = [ "x86_64-linux" ];
- maintainers = with lib.maintainers; [ eelco oxij ];
+ maintainers = [ ];
license = lib.licenses.gpl2;
+ knownVulnerabilities = [
+ # https://www.openwall.com/lists/oss-security/2023/03/21/1
+ # Affects 3.2 (at *least*) - 4.17
+ "CVE-2022-42332"
+ # https://www.openwall.com/lists/oss-security/2023/03/21/2
+ # Affects 4.11 - 4.17
+ "CVE-2022-42333"
+ "CVE-2022-42334"
+ # https://www.openwall.com/lists/oss-security/2023/03/21/3
+ # Affects 4.15 - 4.17
+ "CVE-2022-42331"
# https://xenbits.xen.org/docs/unstable/support-matrix.html
- knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [
+ ] ++ lib.optionals (lib.versionOlder version "4.15") [
"This version of Xen has reached its end of life. See https://xenbits.xen.org/docs/unstable/support-matrix.html"
];
} // (config.meta or {});
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
index 6e2e45e8b9..581dab562e 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
@@ -9,6 +9,7 @@
, pixman
, pkg-config
, substituteAll
+, wayland-scanner
, wayland
, wayland-protocols
, wlroots_0_16
@@ -22,20 +23,21 @@
let
wlroots = wlroots_0_16;
in
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "dwl";
version = "0.4";
src = fetchFromGitHub {
owner = "djpohly";
repo = "dwl";
- rev = "v${self.version}";
+ rev = "v${finalAttrs.version}";
hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4=";
};
nativeBuildInputs = [
installShellFiles
pkg-config
+ wayland-scanner
];
buildInputs = [
@@ -61,6 +63,13 @@ stdenv.mkDerivation (self: {
else writeText "config.def.h" conf;
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
+ makeFlags = [
+ "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
+ "WAYLAND_SCANNER=wayland-scanner"
+ "PREFIX=$(out)"
+ "MANDIR=$(man)/share/man/man1"
+ ];
+
preBuild = ''
makeFlagsArray+=(
XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
@@ -68,11 +77,6 @@ stdenv.mkDerivation (self: {
)
'';
- installFlags = [
- "PREFIX=$(out)"
- "MANDIR=$(man)/share/man/man1"
- ];
-
meta = {
homepage = "https://github.com/djpohly/dwl/";
description = "Dynamic window manager for Wayland";
@@ -87,7 +91,7 @@ stdenv.mkDerivation (self: {
- Limited to 2000 SLOC to promote hackability
- Tied to as few external dependencies as possible
'';
- changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}";
+ changelog = "https://github.com/djpohly/dwl/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.AndersonTorres ];
inherit (wayland.meta) platforms;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 292894b47a..18aa5e3226 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -20,7 +20,7 @@
, xmodmap
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "hypr";
version = "unstable-2023-01-26";
@@ -72,7 +72,7 @@ stdenv.mkDerivation (self: {
'';
meta = with lib; {
- inherit (self.src.meta) homepage;
+ inherit (finalAttrs.src.meta) homepage;
description = "A tiling X11 window manager written in modern C++";
license = licenses.bsd3;
maintainers = with maintainers; [ AndersonTorres ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix
index 29bd81fe87..7060a502f1 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix
@@ -1,16 +1,18 @@
{ lib, stdenv, fetchFromGitHub, xorg, i3lock }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "i3lock-fancy-rapid";
- version = "2019-10-09";
+ version = "unstable-2021-04-21";
+
src = fetchFromGitHub {
owner = "yvbbrjdr";
repo = "i3lock-fancy-rapid";
- rev = "c67f09bc8a48798c7c820d7d4749240b10865ce0";
- sha256 = "0jhvlj6v6wx70239pgkjxd42z1s2bzfg886ra6n1rzsdclf4rkc6";
+ rev = "6eeebd4caa177b82fa5010b5e8828cce3f89fb97";
+ hash = "sha256-EoX8ts0yV/zkb4wgEh4P8noU+UraRS4w9pp+76v+Nm0=";
};
buildInputs = [ xorg.libX11 ];
+
propagatedBuildInputs = [ i3lock ];
postPatch = ''
@@ -19,8 +21,12 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
+ runHook preInstall
+
install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid
ln -s $out/bin/i3lock-fancy-rapid $out/bin/i3lock
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
index 52e6f7667a..7c403c6740 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.30.5";
+ version = "0.30.7";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-7Fjz6Q/f6jocMPAcgeodzdImILKuRmF6V0zo00ZPfjI=";
+ hash = "sha256-mxkwAKfra2btUa/l3TjJac68SmzyGwjmz4HD2yN/U8U=";
};
- cargoHash = "sha256-cHG3wUlk0AotfrQ8pYZNQDualhKSp6aNpY2mbjgnqzU=";
+ cargoHash = "sha256-jJ9JrpEJyk3Cg7YCZadESR0+9vB+ZdTQhG2affoCdx4=";
nativeBuildInputs = [ pkg-config makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
index 20f73952ee..8e2e3c9d12 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix
@@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
- version = "3.3.2";
+ version = "3.3.3";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
- hash = "sha256-9fw3vqcorWZZROYm1vbDOrlkzEbuk7X2dOO/Edo3AOg=";
+ hash = "sha256-VcUc1T3uTj8fhSZ+/XWRzgoenjqA/gguxuNsj+PYzB0=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix
index 4c75b08250..27ac9d75e8 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/katriawm/default.nix
@@ -7,13 +7,13 @@
, pkg-config
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "katriawm";
version = "22.12";
src = fetchzip {
- name = self.pname + "-" + self.version;
- url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${self.version}.tar.gz";
+ name = finalAttrs.pname + "-" + finalAttrs.version;
+ url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
hash = "sha256-xFKr4PxqvnQEAWplhRsaL5rhmSJpnImpk1eXFX0N1tc=";
};
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix
index db8230e41c..2ae2d63f21 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix
@@ -8,11 +8,13 @@
, libxcb
, libxkbcommon
, libxml2
+, gettext
, meson
, ninja
, pango
, pkg-config
, scdoc
+, wayland-scanner
, wayland
, wayland-protocols
, wlroots_0_16
@@ -23,22 +25,24 @@
let
wlroots = wlroots_0_16;
in
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "labwc";
version = "0.6.2";
src = fetchFromGitHub {
owner = "labwc";
repo = "labwc";
- rev = self.version;
+ rev = finalAttrs.version;
hash = "sha256-yZ1tXx7AA9pFc5C6c/J3B03/TfXw1PsAunNNiee3BGU=";
};
nativeBuildInputs = [
+ gettext
meson
ninja
pkg-config
scdoc
+ wayland-scanner
];
buildInputs = [
@@ -64,7 +68,7 @@ stdenv.mkDerivation (self: {
meta = with lib; {
homepage = "https://github.com/labwc/labwc";
description = "A Wayland stacking compositor, similar to Openbox";
- changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md";
+ changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
inherit (wayland.meta) platforms;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/owl/default.nix
new file mode 100644
index 0000000000..fa9ea8e8b6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/owl/default.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gnustep
+, libxkbcommon
+, makeWrapper
+, wayland
+, wayland-scanner
+, darwin
+}:
+
+assert wayland.withLibraries;
+
+let
+ mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation;
+in
+mkDerivation {
+ pname = "owl-compositor";
+ version = "unstable-2021-11-10";
+
+ src = fetchFromGitHub {
+ owner = "owl-compositor";
+ repo = "owl";
+ rev = "91abf02613cd2ddb97be58b5b6703240320233a0";
+ hash = "sha256-a+TznasOVEzSNrs66/y91AeMRDEfyd+WO5mO811hLj0=";
+ };
+
+ # use pregenerated nib files because generating them requires Xcode
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ sed -i "/ibtool/d" configure
+ mkdir -p build/Owl.app/Contents/Resources/English.lproj
+ cp ${./mac/MainMenu.nib} build/Owl.app/Contents/Resources/English.lproj/MainMenu.nib
+ cp ${./mac/OwlPreferences.nib} build/Owl.app/Contents/Resources/English.lproj/OwlPreferences.nib
+ '';
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ makeWrapper
+ wayland-scanner
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.DarwinTools
+ darwin.bootstrap_cmds
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+ gnustep.make
+ ];
+
+ buildInputs = [
+ libxkbcommon
+ wayland
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Cocoa
+ ] ++ lib.optionals (!stdenv.isDarwin) [
+ gnustep.back
+ gnustep.base
+ gnustep.gui
+ ];
+
+ preConfigure = ''
+ mkdir -p build
+ cd build
+ '';
+
+ configureScript = "../configure";
+
+ # error: "Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now."
+ env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-fobjc-runtime=gnustep-2.0";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{Applications,bin}
+ mv Owl.app $out/Applications
+ makeWrapper $out/{Applications/Owl.app${lib.optionalString stdenv.isDarwin "/Contents/MacOS"},bin}/Owl
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A portable Wayland compositor in Objective-C";
+ homepage = "https://github.com/owl-compositor/owl";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ wegank ];
+ platforms = platforms.unix;
+ mainProgram = "Owl";
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/MainMenu.nib b/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/MainMenu.nib
new file mode 100644
index 0000000000..ea5c6f8fe3
Binary files /dev/null and b/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/MainMenu.nib differ
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib b/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib
new file mode 100644
index 0000000000..14f187d144
Binary files /dev/null and b/third_party/nixpkgs/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib differ
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix
index f2d0e1d484..dcd2bb27a7 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix
@@ -16,14 +16,14 @@
, pkg-config
}:
-stdenv.mkDerivation (self: {
+stdenv.mkDerivation (finalAttrs: {
pname = "pekwm";
version = "0.3.0";
src = fetchFromGitHub {
owner = "pekdon";
repo = "pekwm";
- rev = "release-${self.version}";
+ rev = "release-${finalAttrs.version}";
hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ=";
};
@@ -65,7 +65,7 @@ stdenv.mkDerivation (self: {
they should when starting applications.
- Chainable Keygrabber, usability for everyone.
'';
- changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md";
+ changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.AndersonTorres ];
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
index 32c8cf1b86..01506b391d 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
+{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg
, meson, ninja, pkg-config, wayland-scanner, scdoc
, wayland, libxkbcommon, pcre2, json_c, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
@@ -38,6 +38,12 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit swaybg;
})
+
+ (fetchpatch {
+ name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch";
+ url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
+ hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
+ })
] ++ lib.optionals (!isNixOS) [
# References to /nix/store/... will get GC'ed which causes problems when
# copying the default configuration:
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/fx.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/fx.nix
new file mode 100644
index 0000000000..27c440a38c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/fx.nix
@@ -0,0 +1,29 @@
+{ fetchFromGitHub, lib, sway-unwrapped }:
+
+sway-unwrapped.overrideAttrs (oldAttrs: rec {
+ pname = "swayfx";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "WillPower3309";
+ repo = "swayfx";
+ rev = version;
+ sha256 = "sha256-nVy7GdAnheWhjevcCPE407xWSLN8F4Le0uq2RDwv/Zc=";
+ };
+
+ meta = with lib; {
+ description = "A Beautiful Sway Fork";
+ homepage = "https://github.com/WillPower3309/swayfx";
+ maintainers = with maintainers; [ ricarch97 ];
+ license = licenses.mit;
+ platforms = platforms.linux;
+
+ longDescription = ''
+ Fork of Sway, an incredible and one of the most well established Wayland
+ compositors, and a drop-in replacement for the i3 window manager for X11.
+ SwayFX adds extra options and effects to the original Sway, such as rounded corners,
+ shadows and inactive window dimming to bring back some of the Picom X11
+ compositor functionality, which was commonly used with the i3 window manager.
+ '';
+ };
+})
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix
index f5238180f5..ab68bc58ee 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix
@@ -73,6 +73,7 @@ stdenv.mkDerivation rec {
"--sysconfdir /etc"
"-Duse_system_wlroots=enabled"
"-Duse_system_wfconfig=enabled"
+ (lib.mesonEnable "wf-touch:tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
];
passthru.providedSessions = [ "wayfire" ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix
index 0a8e5c0bcd..19435a8739 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/wayfire/wf-config.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
# CMake is just used for finding doctest.
dontUseCmakeConfigure = true;
+ mesonFlags = [
+ (lib.mesonEnable "tests" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
+ ];
+
doCheck = true;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix
deleted file mode 100644
index 86bbfd3dc7..0000000000
--- a/third_party/nixpkgs/pkgs/applications/window-managers/wio/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, alacritty
-, cage
-, cairo
-, libxkbcommon
-, makeWrapper
-, mesa
-, meson
-, ninja
-, pkg-config
-, udev
-, wayland
-, wayland-protocols
-, wlroots
-, xwayland
-}:
-
-stdenv.mkDerivation rec {
- pname = "wio";
- version = "0.pre+unstable=2021-06-27";
-
- src = fetchFromGitHub {
- owner = "museoa";
- repo = pname;
- rev = "e0b258777995055d69e61a0246a6a64985743f42";
- sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI=";
- };
-
- nativeBuildInputs = [
- makeWrapper
- meson
- ninja
- pkg-config
- ];
-
- buildInputs = [
- cairo
- libxkbcommon
- mesa # for libEGL
- udev
- wayland
- wayland-protocols
- wlroots
- xwayland
- ];
-
- postInstall = ''
- wrapProgram $out/bin/wio \
- --prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}"
- '';
-
- meta = with lib; {
- homepage = "https://wio-project.org/";
- description = "That Plan 9 feel, for Wayland";
- longDescription = ''
- Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
- and feel to plan9's rio.
- '';
- license = licenses.mit;
- maintainers = with maintainers; [ AndersonTorres ];
- inherit (wayland.meta) platforms;
- };
-
- passthru.providedSessions = [ "wio" ];
-}
-# TODO: factor Linux-specific options
diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
index bcda40c800..0637964ca6 100644
--- a/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/appimage/default.nix
@@ -6,7 +6,7 @@
, libarchive
, pv
, squashfsTools
-, buildFHSUserEnv
+, buildFHSEnv
, pkgs
}:
@@ -43,7 +43,7 @@ rec {
extraPkgs,
meta ? {},
...
- }: buildFHSUserEnv
+ }: buildFHSEnv
(defaultFhsEnvArgs // {
inherit name;
diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 00375db220..acc433496b 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
@@ -88,6 +88,7 @@ let
else if targetPlatform.isMips then "${sharedLibraryLoader}/lib/ld.so.1"
# `ld-linux-riscv{32,64}-.so.1`
else if targetPlatform.isRiscV then "${sharedLibraryLoader}/lib/ld-linux-riscv*.so.1"
+ else if targetPlatform.isLoongArch64 then "${sharedLibraryLoader}/lib/ld-linux-loongarch*.so.1"
else if targetPlatform.isDarwin then "/usr/lib/dyld"
else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1"
else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
@@ -102,7 +103,7 @@ in
stdenv.mkDerivation {
pname = targetPrefix
+ (if name != "" then name else "${bintoolsName}-wrapper");
- version = if bintools == null then null else bintoolsVersion;
+ version = if bintools == null then "" else bintoolsVersion;
preferLocalBuild = true;
@@ -166,7 +167,7 @@ stdenv.mkDerivation {
# If we are asked to wrap `gas` and this bintools has it,
# then symlink it (`as` will be symlinked next).
- # This is mainly for the wrapped gnatboot on x86-64 Darwin,
+ # This is mainly for the wrapped gnat-bootstrap on x86-64 Darwin,
# as it must have both the GNU assembler from cctools (installed as `gas`)
# and the Clang integrated assembler (installed as `as`).
# See pkgs/os-specific/darwin/binutils/default.nix for details.
diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
index a49d3c781e..d06b11c8ee 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation (fBuildAttrs // {
runHook postBuild
'';
- installPhase = fFetchAttrs.installPhase or ''
+ installPhase = fFetchAttrs.installPhase or (''
runHook preInstall
# Remove all built in external workspaces, Bazel will recreate them when building
@@ -183,7 +183,7 @@ stdenv.mkDerivation (fBuildAttrs // {
(cd $bazelOut/ && tar czf $out --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner external/)
runHook postInstall
- '';
+ '');
dontFixup = true;
allowedRequisites = [];
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
similarity index 97%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index 78da74c828..305a959a35 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/buildFHSEnv.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -64,7 +64,7 @@ let
ldconfig = writeShellScriptBin "ldconfig" ''
# due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig
- exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
+ exec ${if stdenv.isx86_64 && stdenv.isLinux then pkgsi686Linux.glibc.bin else pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@"
'';
etcProfile = writeText "profile" ''
export PS1='${name}-chrootenv:\u@\h:\w\$ '
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
similarity index 97%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index 5d94c309fe..6c9b71624c 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, callPackage
, runCommandLocal
, writeShellScript
@@ -113,6 +114,7 @@ let
exec ${run} "$@"
'';
+ indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str)));
bwrapCmd = { initArgs ? "" }: ''
ignored=(/nix /dev /proc /etc)
ro_mounts=()
@@ -202,11 +204,13 @@ let
--symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \
--ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \
--remount-ro ${glibc}/etc \
+ '' + lib.optionalString (stdenv.isx86_64 && stdenv.isLinux) (indentLines ''
--tmpfs ${pkgsi686Linux.glibc}/etc \
--symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \
--symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \
--ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \
--remount-ro ${pkgsi686Linux.glibc}/etc \
+ '') + ''
"''${ro_mounts[@]}"
"''${symlinks[@]}"
"''${auto_mounts[@]}"
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/default.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/default.nix
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/default.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix
rename to third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/env.nix
diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
index 1f1d7489a9..adab6f239a 100644
--- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix
@@ -14,10 +14,9 @@
, propagateDoc ? cc != null && cc ? man
, extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
, nixSupport ? {}
-, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, isCcache ? cc.isCcache or false, gnugrep ? null
, buildPackages ? {}
, libcxx ? null
-, grossHackForStagingNext ? false
# Whether or not to add `-B` and `-L` to `nix-support/cc-{c,ld}flags`
, useCcForLibs ?
@@ -52,7 +51,6 @@
# the derivation at which the `-B` and `-L` flags added by `useCcForLibs` will point
, gccForLibs ? if useCcForLibs then cc else null
-, tmpDropB ? false # temporary hack; see PR #225846
}:
with lib;
@@ -161,7 +159,7 @@ assert nativePrefix == bintools.nativePrefix;
stdenv.mkDerivation {
pname = targetPrefix
+ (if name != "" then name else "${ccName}-wrapper");
- version = if cc == null then null else ccVersion;
+ version = if cc == null then "" else ccVersion;
preferLocalBuild = true;
@@ -208,7 +206,7 @@ stdenv.mkDerivation {
local dst="$1"
local wrapper="$2"
export prog="$3"
- export use_response_file_by_default=${if isClang then "1" else "0"}
+ export use_response_file_by_default=${if isClang && !isCcache then "1" else "0"}
substituteAll "$wrapper" "$out/bin/$dst"
chmod +x "$out/bin/$dst"
}
@@ -336,7 +334,7 @@ stdenv.mkDerivation {
##
## GCC libs for non-GCC support
##
- + optionalString (useGccForLibs && !tmpDropB) ''
+ + optionalString (useGccForLibs && isClang) ''
echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags
''
@@ -415,7 +413,7 @@ stdenv.mkDerivation {
# already knows how to find its own libstdc++, and adding
# additional -isystem flags will confuse gfortran (see
# https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
- + optionalString (libcxx == null && (if grossHackForStagingNext then isClang else true) && (useGccForLibs && gccForLibs.langCC or false)) ''
+ + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do
echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
done
@@ -598,8 +596,11 @@ stdenv.mkDerivation {
expandResponseParams = "${expand-response-params}/bin/expand-response-params";
shell = getBin shell + shell.shellPath or "";
gnugrep_bin = if nativeTools then "" else gnugrep;
+ # stdenv.cc.cc should not be null and we have nothing better for now.
+ # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
+ cc = if nativeTools then "" else cc;
wrapperName = "CC_WRAPPER";
- inherit suffixSalt coreutils_bin bintools cc;
+ inherit suffixSalt coreutils_bin bintools;
inherit libc_bin libc_dev libc_lib;
inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
};
diff --git a/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix
new file mode 100644
index 0000000000..9deb99648c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/default.nix
@@ -0,0 +1,186 @@
+{ stdenvNoCC
+, lib
+, makeSetupHook
+, dart
+, git
+, cacert
+, jq
+}:
+
+{
+ # The output hash of the dependencies for this project.
+ vendorHash ? ""
+ # Commands to run once before using Dart or pub.
+, sdkSetupScript ? ""
+ # Commands to run to populate the pub cache.
+, pubGetScript ? "dart pub get"
+ # A path to a pubspec.lock file to use instead of the one in the source directory.
+, pubspecLockFile ? null
+ # Arguments used in the derivation that builds the Dart package.
+ # Passing these is recommended to ensure that the same steps are made to prepare the sources in both this
+ # derivation and the one that builds the Dart package.
+, buildDrvArgs ? { }
+, ...
+}@args:
+
+# This is a fixed-output derivation and setup hook that can be used to fetch dependencies for Dart projects.
+# It is designed to be placed in the nativeBuildInputs of a derivation that builds a Dart package.
+# Providing the buildDrvArgs argument is highly recommended.
+let
+ buildDrvInheritArgNames = [
+ "name"
+ "pname"
+ "version"
+ "src"
+ "sourceRoot"
+ "setSourceRoot"
+ "preUnpack"
+ "unpackPhase"
+ "unpackCmd"
+ "postUnpack"
+ "prePatch"
+ "patchPhase"
+ "patches"
+ "patchFlags"
+ "postPatch"
+ ];
+
+ buildDrvInheritArgs = builtins.foldl'
+ (attrs: arg:
+ if buildDrvArgs ? ${arg}
+ then attrs // { ${arg} = buildDrvArgs.${arg}; }
+ else attrs)
+ { }
+ buildDrvInheritArgNames;
+
+ drvArgs = buildDrvInheritArgs // (removeAttrs args [ "buildDrvArgs" ]);
+ name = (if drvArgs ? name then drvArgs.name else "${drvArgs.pname}-${drvArgs.version}");
+
+ deps =
+ stdenvNoCC.mkDerivation ({
+ name = "${name}-dart-deps";
+
+ nativeBuildInputs = [
+ dart
+ git
+ ];
+
+ # avoid pub phase
+ dontBuild = true;
+
+ configurePhase = ''
+ # Configure the package cache
+ export PUB_CACHE="$out/cache/.pub-cache"
+ mkdir -p "$PUB_CACHE"
+
+ ${sdkSetupScript}
+ '';
+
+ installPhase = ''
+ _pub_get() {
+ ${pubGetScript}
+ }
+
+ # so we can use lock, diff yaml
+ mkdir -p "$out/pubspec"
+ cp "pubspec.yaml" "$out/pubspec"
+ ${lib.optionalString (pubspecLockFile != null) "install -m644 ${pubspecLockFile} pubspec.lock"}
+ if ! cp "pubspec.lock" "$out/pubspec"; then
+ echo 1>&2 -e '\nThe pubspec.lock file is missing. This is a requirement for reproducible builds.' \
+ '\nThe following steps should be taken to fix this issue:' \
+ '\n 1. If you are building an application, contact the developer(s).' \
+ '\n The pubspec.lock file should be provided with the source code.' \
+ '\n https://dart.dev/guides/libraries/private-files#pubspeclock' \
+ '\n 2. An attempt to generate and print a compressed pubspec.lock file will be made now.' \
+ '\n It is compressed with gzip and base64 encoded.' \
+ '\n Paste it to a file and extract it with `base64 -d pubspec.lock.in | gzip -d > pubspec.lock`.' \
+ '\n Provide the path to the pubspec.lock file in the pubspecLockFile argument.' \
+ '\n This must be updated whenever the application is updated.' \
+ '\n'
+ _pub_get
+ echo ""
+ gzip --to-stdout --best pubspec.lock | base64 1>&2
+ echo 1>&2 -e '\nA gzipped pubspec.lock file has been printed. Please see the informational message above.'
+ exit 1
+ fi
+
+ _pub_get
+
+ # nuke nondeterminism
+
+ # Remove Git directories in the Git package cache - these are rarely used by Pub,
+ # which instead maintains a corresponsing mirror and clones cached packages through it.
+ #
+ # An exception is made to keep .git/pub-packages files, which are important.
+ # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L621
+ if [ -d "$PUB_CACHE"/git ]; then
+ find "$PUB_CACHE"/git -maxdepth 4 -path "*/.git/*" ! -name "pub-packages" -prune -exec rm -rf {} +
+ fi
+
+ # Remove continuously updated package metadata caches
+ rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock
+ rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531
+
+ # Miscelaneous transient package cache files
+ rm -f "$PUB_CACHE"/README.md # May change with different Dart versions
+ rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131
+ rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348
+ '';
+
+ GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+ "GIT_PROXY_COMMAND"
+ "NIX_GIT_SSL_CAINFO"
+ "SOCKS_SERVER"
+ ];
+
+ # Patching shebangs introduces input references to this fixed-output derivation.
+ # This triggers a bug in Nix, causing the output path to change unexpectedly.
+ # https://github.com/NixOS/nix/issues/6660
+ dontPatchShebangs = true;
+
+ # The following operations are not generally useful for this derivation.
+ # If a package does contain some native components used at build time,
+ # please file an issue.
+ dontStrip = true;
+ dontMoveSbin = true;
+ dontPatchELF = true;
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = if vendorHash != "" then vendorHash else lib.fakeSha256;
+ } // (removeAttrs drvArgs [ "name" "pname" ]));
+
+ depsListDrv = stdenvNoCC.mkDerivation ({
+ name = "${name}-dart-deps-list.json";
+ nativeBuildInputs = [ hook dart jq ];
+
+ configurePhase = ''
+ runHook preConfigure
+ dart pub get --offline
+ runHook postConfigure
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ dart pub deps --json | jq .packages > $out
+ runHook postBuild
+ '';
+ } // buildDrvInheritArgs);
+
+ hook = (makeSetupHook {
+ # The setup hook should not be part of the fixed-output derivation.
+ # Updates to the hook script should not change vendor hashes, and it won't
+ # work at all anyway due to https://github.com/NixOS/nix/issues/6660.
+ name = "${name}-dart-deps-setup-hook";
+ substitutions = { inherit deps; };
+ propagatedBuildInputs = [ dart git ];
+ passthru = {
+ files = deps.outPath;
+ depsListFile = depsListDrv.outPath;
+ };
+ }) ./setup-hook.sh;
+in
+hook
diff --git a/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh
new file mode 100644
index 0000000000..37ef74aa62
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh
@@ -0,0 +1,41 @@
+preConfigureHooks+=(_setupPubCache)
+
+_setupPubCache() {
+ deps="@deps@"
+
+ # Configure the package cache.
+ export PUB_CACHE="$(mktemp -d)"
+ mkdir -p "$PUB_CACHE"
+
+ if [ -d "$deps/cache/.pub-cache/git" ]; then
+ # Link the Git package cache.
+ mkdir -p "$PUB_CACHE/git"
+ ln -s "$deps/cache/.pub-cache/git"/* "$PUB_CACHE/git"
+
+ # Recreate the internal Git cache subdirectory.
+ # See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339)
+ # Blank repositories are created instead of attempting to match the cache mirrors to checkouts.
+ # This is not an issue, as pub does not need the mirrors in the Flutter build process.
+ rm "$PUB_CACHE/git/cache" && mkdir "$PUB_CACHE/git/cache"
+ for mirror in $(ls -A "$deps/cache/.pub-cache/git/cache"); do
+ git --git-dir="$PUB_CACHE/git/cache/$mirror" init --bare --quiet
+ done
+ fi
+
+ # Link the remaining package cache directories.
+ # At this point, any subdirectories that must be writable must have been taken care of.
+ for file in $(comm -23 <(ls -A "$deps/cache/.pub-cache") <(ls -A "$PUB_CACHE")); do
+ ln -s "$deps/cache/.pub-cache/$file" "$PUB_CACHE/$file"
+ done
+
+ # ensure we're using a lockfile for the right package version
+ if [ ! -e pubspec.lock ]; then
+ cp -v "$deps/pubspec/pubspec.lock" .
+ # Sometimes the pubspec.lock will get opened in write mode, even when offline.
+ chmod u+w pubspec.lock
+ elif ! { diff -u pubspec.lock "$deps/pubspec/pubspec.lock" && diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml"; }; then
+ echo 1>&2 -e 'The pubspec.lock or pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \
+ '\nYou most likely forgot to update the vendorHash while updating the sources.'
+ exit 1
+ fi
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 8858d4e987..bae7148283 100644
--- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -284,4 +284,8 @@ stdenvNoCC.mkDerivation (args // {
} // args.passthru or { };
meta = (args.meta or { }) // { inherit platforms; };
-})
+}
+ # ICU tries to unconditionally load files from /usr/share/icu on Darwin, which makes builds fail
+ # in the sandbox, so disable ICU on Darwin. This, as far as I know, shouldn't cause any built packages
+ # to behave differently, just the dotnet build tool.
+ // lib.optionalAttrs stdenvNoCC.isDarwin { DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; })
diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix
index 56973f5d36..e920355f46 100644
--- a/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/default.nix
@@ -66,7 +66,7 @@ lib.warnIf (builtins.isString sparseCheckout)
stdenvNoCC.mkDerivation {
inherit name;
builder = ./builder.sh;
- fetcher = ./nix-prefetch-git; # This must be a string to ensure it's called with bash.
+ fetcher = ./nix-prefetch-git;
nativeBuildInputs = [ git ]
++ lib.optionals fetchLFS [ git-lfs ];
diff --git a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix
index a4b4942ef5..abb1c8ac35 100644
--- a/third_party/nixpkgs/pkgs/build-support/flutter/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/flutter/default.nix
@@ -1,284 +1,159 @@
-{ flutter
-, lib
-, llvmPackages_13
-, cmake
-, ninja
-, pkg-config
-, wrapGAppsHook
-, autoPatchelfHook
-, util-linux
-, libselinux
-, libsepol
-, libthai
-, libdatrie
-, libxkbcommon
-, at-spi2-core
-, libsecret
-, jsoncpp
-, xorg
-, dbus
-, gtk3
-, glib
-, pcre
-, libepoxy
+{ lib
+, callPackage
, stdenvNoCC
+, makeWrapper
+, llvmPackages_13
, cacert
-, git
-, dart
-, nukeReferences
-, bash
-, curl
-, unzip
-, which
-, xz
+, flutter
+, jq
}:
# absolutely no mac support for now
-args:
+{ pubGetScript ? "flutter pub get"
+, flutterBuildFlags ? [ ]
+, runtimeDependencies ? [ ]
+, customPackageOverrides ? { }
+, autoDepsList ? false
+, depsListFile ? null
+, vendorHash
+, pubspecLockFile ? null
+, nativeBuildInputs ? [ ]
+, preUnpack ? ""
+, postFixup ? ""
+, ...
+}@args:
let
- pl = n: "##FLUTTER_${n}_PLACEHOLDER_MARKER##";
- placeholder_deps = pl "DEPS";
- placeholder_flutter = pl "FLUTTER";
- fetchAttrs = [ "src" "sourceRoot" "setSourceRoot" "unpackPhase" "patches" ];
- getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null);
- flutterDeps = [
- # flutter deps
- flutter.unwrapped
- bash
- curl
- flutter.dart
- git
- unzip
- which
- xz
- ];
- self =
-(self: llvmPackages_13.stdenv.mkDerivation (args // {
- deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) {
- name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz";
+ flutterSetupScript = ''
+ export HOME="$NIX_BUILD_TOP"
+ flutter config --no-analytics &>/dev/null # mute first-run
+ flutter config --enable-linux-desktop >/dev/null
+ '';
- nativeBuildInputs = flutterDeps ++ [
- nukeReferences
- ];
+ deps = callPackage ../dart/fetch-dart-deps { dart = flutter; } {
+ sdkSetupScript = flutterSetupScript;
+ inherit pubGetScript vendorHash pubspecLockFile;
+ buildDrvArgs = args;
+ };
- # avoid pub phase
- dontBuild = true;
+ baseDerivation = llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // {
+ inherit flutterBuildFlags runtimeDependencies;
- installPhase = ''
- . ${../fetchgit/deterministic-git}
+ outputs = [ "out" "debug" ];
- TMP=$(mktemp -d)
+ nativeBuildInputs = [
+ makeWrapper
+ deps
+ flutter
+ jq
+ ] ++ nativeBuildInputs;
- export HOME="$TMP"
- export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
- export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
+ preUnpack = ''
+ ${lib.optionalString (!autoDepsList) ''
+ if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then
+ echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \
+ '\nPlease choose one of the following solutions:' \
+ '\n - Duplicate the following file and pass it to the depsListFile argument.' \
+ '\n ${finalAttrs.passthru.depsListFile}' \
+ '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'.
+ exit 1
+ fi
+ ''}
- flutter config --no-analytics &>/dev/null # mute first-run
- flutter config --enable-linux-desktop
- flutter packages get
- flutter build linux || true # so it downloads tools
- ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands}
-
- RES="$TMP"
-
- mkdir -p "$RES/f"
-
- # so we can use lock, diff yaml
- cp "pubspec.yaml" "$RES"
- cp "pubspec.lock" "$RES"
- [[ -e .packages ]] && mv .packages "$RES/f"
- mv .dart_tool .flutter-plugins .flutter-plugins-dependencies "$RES/f"
-
- # replace paths with placeholders
- find "$RES" -type f -exec sed -i \
- -e s,$TMP,${placeholder_deps},g \
- -e s,${flutter.unwrapped},${placeholder_flutter},g \
- {} +
-
- remove_line_matching() {
- replace_line_matching "$1" "$2" ""
- }
-
- replace_line_matching() {
- sed "s|.*$2.*|$3|g" -r -i "$1"
- }
-
- # nuke nondeterminism
-
- # clientId is random
- remove_line_matching "$RES/.flutter" clientId
-
- # deterministic git repos
- find "$RES" -iname .git -type d | while read -r repoGit; do
- make_deterministic_repo "$(dirname "$repoGit")"
- done
-
- # dart _fetchedAt, etc
- DART_DATE=$(date --date="@$SOURCE_DATE_EPOCH" -In | sed "s|,|.|g" | sed "s|+.*||g")
- find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} +
- replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",'
- replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",'
- [[ -e "$RES/f/.packages" ]] && remove_line_matching "$RES/f/.packages" "Generated by pub"
-
- # nuke refs
- find "$RES" -type f -exec nuke-refs {} +
-
- # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/
- tar --owner=0 --group=0 --numeric-owner --format=gnu \
- --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
- -czf "$out" -C "$RES" .
+ ${preUnpack}
'';
- GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
- SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ configurePhase = ''
+ runHook preConfigure
- impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
- "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER"
- ];
+ ${flutterSetupScript}
- # unnecesarry
- dontFixup = true;
+ runHook postConfigure
+ '';
- outputHashAlgo = if self ? vendorHash then null else "sha256";
- # outputHashMode = "recursive";
- outputHash = if self ? vendorHash then
- self.vendorHash
- else if self ? vendorSha256 then
- self.vendorSha256
- else
- lib.fakeSha256;
+ buildPhase = ''
+ runHook preBuild
+ mkdir -p build/flutter_assets/fonts
+
+ flutter packages get --offline -v
+ flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)}
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ built=build/linux/*/release/bundle
+
+ mkdir -p $out/bin
+ mv $built $out/app
+
+ for f in $(find $out/app -iname "*.desktop" -type f); do
+ install -D $f $out/share/applications/$(basename $f)
+ done
+
+ for f in $(find $out/app -maxdepth 1 -type f); do
+ ln -s $f $out/bin/$(basename $f)
+ done
+
+ # make *.so executable
+ find $out/app -iname "*.so" -type f -exec chmod +x {} +
+
+ # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral
+ for f in $(find $out/app -executable -type f); do
+ if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also
+ echo "strip RPath of $f"
+ newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g")
+ patchelf --set-rpath "$newrp" "$f"
+ fi
+ done
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ # Add runtime library dependencies to the LD_LIBRARY_PATH.
+ # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open().
+ #
+ # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately,
+ # which is not what application authors expect.
+ for f in "$out"/bin/*; do
+ wrapProgram "$f" \
+ --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}'
+ done
+
+ ${postFixup}
+ '';
+
+ passthru = {
+ inherit (deps) depsListFile;
+ };
});
- nativeBuildInputs = flutterDeps ++ [
- # flutter dev tools
- cmake
- ninja
- pkg-config
- wrapGAppsHook
- # flutter likes dynamic linking
- autoPatchelfHook
- ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs;
-
- buildInputs = [
- # cmake deps
- gtk3
- glib
- pcre
- util-linux
- # also required by cmake, not sure if really needed or dep of all packages
- libselinux
- libsepol
- libthai
- libdatrie
- xorg.libXdmcp
- xorg.libXtst
- libxkbcommon
- dbus
- at-spi2-core
- libsecret
- jsoncpp
- # build deps
- xorg.libX11
- # directly required by build
- libepoxy
- ] ++ lib.optionals (args ? buildInputs) args.buildInputs;
-
- # TODO: do we need this?
- NIX_LDFLAGS = "-rpath ${lib.makeLibraryPath self.buildInputs}";
- env.NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include";
- LD_LIBRARY_PATH = lib.makeLibraryPath self.buildInputs;
-
- configurePhase = ''
- runHook preConfigure
-
- # for some reason fluffychat build breaks without this - seems file gets overriden by some tool
- cp pubspec.yaml pubspec-backup
-
- # we get this from $depsFolder so disabled for now, but we might need it again once deps are fetched properly
- # flutter config --no-analytics >/dev/null 2>/dev/null # mute first-run
- # flutter config --enable-linux-desktop
-
- # extract deps
- depsFolder=$(mktemp -d)
- tar xzf "$deps" -C "$depsFolder"
-
- # after extracting update paths to point to real paths
- find "$depsFolder" -type f -exec sed -i \
- -e s,${placeholder_deps},$depsFolder,g \
- -e s,${placeholder_flutter},${flutter.unwrapped},g \
- {} +
-
- # ensure we're using a lockfile for the right package version
- if [ -e pubspec.lock ]; then
- # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things.
- # diff -u pubspec.lock $depsFolder/pubspec.lock
- true
+ packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides;
+ productPackages = builtins.filter (package: package.kind != "dev")
+ (if autoDepsList
+ then builtins.fromJSON (builtins.readFile deps.depsListFile)
else
- cp -v "$depsFolder/pubspec.lock" .
- fi
- diff -u pubspec.yaml $depsFolder/pubspec.yaml
-
- mv -v $(find $depsFolder/f -type f) .
-
- # prepare
- export HOME=$depsFolder
- export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
- export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
-
- # binaries need to be patched
- autoPatchelf -- "$depsFolder"
-
- runHook postConfigure
- '';
-
- buildPhase = ''
- runHook preBuild
-
- # for some reason fluffychat build breaks without this - seems file gets overriden by some tool
- mv pubspec-backup pubspec.yaml
- mkdir -p build/flutter_assets/fonts
-
- flutter packages get --offline -v
- flutter build linux --release -v
-
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
-
- built=build/linux/*/release/bundle
-
- mkdir -p $out/bin
- mv $built $out/app
-
- for f in $(find $out/app -iname "*.desktop" -type f); do
- install -D $f $out/share/applications/$(basename $f)
- done
-
- for f in $(find $out/app -maxdepth 1 -type f); do
- ln -s $f $out/bin/$(basename $f)
- done
-
- # this confuses autopatchelf hook otherwise
- rm -rf "$depsFolder"
-
- # make *.so executable
- find $out/app -iname "*.so" -type f -exec chmod +x {} +
-
- # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral
- for f in $(find $out/app -executable -type f); do
- if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also
- echo "strip RPath of $f"
- newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g")
- patchelf --set-rpath "$newrp" "$f"
- fi
- done
-
- runHook postInstall
- '';
-})) self;
+ if depsListFile == null
+ then [ ]
+ else builtins.fromJSON (builtins.readFile depsListFile));
in
- self
+builtins.foldl'
+ (prev: package:
+ if packageOverrideRepository ? ${package.name}
+ then
+ prev.overrideAttrs
+ (packageOverrideRepository.${package.name} {
+ inherit (package)
+ name
+ version
+ kind
+ source
+ dependencies;
+ })
+ else prev)
+ baseDerivation
+ productPackages
diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix
index 045ce11fe0..2c5d1827cd 100644
--- a/third_party/nixpkgs/pkgs/build-support/go/module.nix
+++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix
@@ -83,12 +83,16 @@ let
inherit (args) src;
inherit (go) GOOS GOARCH;
+ # The following inheritence behavior is not trivial to expect, and some may
+ # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and
+ # out in the wild. In anycase, it's documented in:
+ # doc/languages-frameworks/go.section.md
prePatch = args.prePatch or "";
patches = args.patches or [];
patchFlags = args.patchFlags or [];
postPatch = args.postPatch or "";
preBuild = args.preBuild or "";
- postBuild = args.postBuild or "";
+ postBuild = args.modPostBuild or "";
sourceRoot = args.sourceRoot or "";
GO111MODULE = "on";
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
index dc0e9b87db..f3cf3d59f9 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
@@ -78,14 +78,14 @@ in
STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;
}) ''
- mkdir ./root
+ mkdir -p ./root/var/empty
make-initrd-ng "$contentsPath" ./root
mkdir "$out"
(cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +)
for PREP in $prepend; do
cat $PREP >> $out/initrd
done
- (cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
+ (cd root && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
if [ -n "$makeUInitrd" ]; then
mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img
diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
index 26cc678c57..1c3fb6a74e 100644
--- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
@@ -12,6 +12,9 @@
# The output hash of the dependencies for this project.
# Can be calculated in advance with prefetch-npm-deps.
, npmDepsHash ? ""
+ # Whether to force the usage of Git dependencies that have install scripts, but not a lockfile.
+ # Use with care.
+, forceGitDeps ? false
# Whether to make the cache writable prior to installing dependencies.
# Don't set this unless npm tries to write to the cache directory, as it can slow down the build.
, makeCacheWritable ? false
@@ -32,7 +35,7 @@
let
npmDeps = fetchNpmDeps {
- inherit src srcs sourceRoot prePatch patches postPatch;
+ inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch;
name = "${name}-npm-deps";
hash = npmDepsHash;
};
diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix
index d87071d855..41cad9d12e 100644
--- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/default.nix
@@ -36,8 +36,8 @@
'';
};
- makeTest = { name, src, hash }: testers.invalidateFetcherByDrvHash fetchNpmDeps {
- inherit name hash;
+ makeTest = { name, src, hash, forceGitDeps ? false }: testers.invalidateFetcherByDrvHash fetchNpmDeps {
+ inherit name hash forceGitDeps;
src = makeTestSrc { inherit name src; };
};
@@ -108,6 +108,8 @@
};
hash = "sha256-+KA8/orSBJ4EhuSyQO8IKSxsN/FAsYU3lOzq+awuxNQ=";
+
+ forceGitDeps = true;
};
};
@@ -121,6 +123,7 @@
fetchNpmDeps =
{ name ? "npm-deps"
, hash ? ""
+ , forceGitDeps ? false
, ...
} @ args:
let
@@ -131,6 +134,8 @@
outputHash = "";
outputHashAlgo = "sha256";
};
+
+ forceGitDeps_ = lib.optionalAttrs forceGitDeps { FORCE_GIT_DEPS = true; };
in
stdenvNoCC.mkDerivation (args // {
inherit name;
@@ -161,5 +166,5 @@
dontInstall = true;
outputHashMode = "recursive";
- } // hash_);
+ } // hash_ // forceGitDeps_);
}
diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs
index 715e115e72..5326c3e858 100644
--- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs
+++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs
@@ -72,7 +72,7 @@ impl Cache {
&mut p,
&hash
.into_iter()
- .map(|x| format!("{:02x}", x))
+ .map(|n| format!("{n:02x}"))
.collect::(),
);
diff --git a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs
index 3d2204071a..57725a922d 100644
--- a/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs
+++ b/third_party/nixpkgs/pkgs/build-support/node/fetch-npm-deps/src/main.rs
@@ -1,250 +1,18 @@
#![warn(clippy::pedantic)]
use crate::cacache::Cache;
-use anyhow::{anyhow, Context};
+use anyhow::anyhow;
use rayon::prelude::*;
-use serde::Deserialize;
use serde_json::{Map, Value};
use std::{
- collections::{HashMap, HashSet},
- env, fmt, fs, io,
+ env, fs,
path::Path,
- process::{self, Command, Stdio},
+ process::{self, Command},
};
use tempfile::tempdir;
-use url::Url;
mod cacache;
-#[cfg(test)]
-mod tests;
-
-#[derive(Deserialize)]
-struct PackageLock {
- #[serde(rename = "lockfileVersion")]
- version: u8,
- dependencies: Option>,
- packages: Option>,
-}
-
-#[derive(Deserialize)]
-struct OldPackage {
- version: UrlOrString,
- #[serde(default)]
- bundled: bool,
- resolved: Option,
- integrity: Option,
- dependencies: Option>,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq)]
-struct Package {
- resolved: Option,
- integrity: Option,
-}
-
-#[derive(Debug, Deserialize, PartialEq, Eq)]
-#[serde(untagged)]
-enum UrlOrString {
- Url(Url),
- String(String),
-}
-
-impl fmt::Display for UrlOrString {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- match self {
- UrlOrString::Url(url) => url.fmt(f),
- UrlOrString::String(string) => string.fmt(f),
- }
- }
-}
-
-#[allow(clippy::case_sensitive_file_extension_comparisons)]
-fn to_new_packages(
- old_packages: HashMap,
- initial_url: &Url,
-) -> anyhow::Result> {
- let mut new = HashMap::new();
-
- for (name, mut package) in old_packages {
- // In some cases, a bundled dependency happens to have the same version as a non-bundled one, causing
- // the bundled one without a URL to override the entry for the non-bundled instance, which prevents the
- // dependency from being downloaded.
- if package.bundled {
- continue;
- }
-
- if let UrlOrString::Url(v) = &package.version {
- for (scheme, host) in [
- ("github", "github.com"),
- ("bitbucket", "bitbucket.org"),
- ("gitlab", "gitlab.com"),
- ] {
- if v.scheme() == scheme {
- package.version = {
- let mut new_url = initial_url.clone();
-
- new_url.set_host(Some(host))?;
-
- if v.path().ends_with(".git") {
- new_url.set_path(v.path());
- } else {
- new_url.set_path(&format!("{}.git", v.path()));
- }
-
- new_url.set_fragment(v.fragment());
-
- UrlOrString::Url(new_url)
- };
-
- break;
- }
- }
- }
-
- new.insert(
- format!("{name}-{}", package.version),
- Package {
- resolved: if matches!(package.version, UrlOrString::Url(_)) {
- Some(package.version)
- } else {
- package.resolved
- },
- integrity: package.integrity,
- },
- );
-
- if let Some(dependencies) = package.dependencies {
- new.extend(to_new_packages(dependencies, initial_url)?);
- }
- }
-
- Ok(new)
-}
-
-#[allow(clippy::case_sensitive_file_extension_comparisons)]
-fn get_hosted_git_url(url: &Url) -> Option {
- if ["git", "http", "git+ssh", "git+https", "ssh", "https"].contains(&url.scheme()) {
- let mut s = url.path_segments()?;
-
- match url.host_str()? {
- "github.com" => {
- let user = s.next()?;
- let mut project = s.next()?;
- let typ = s.next();
- let mut commit = s.next();
-
- if typ.is_none() {
- commit = url.fragment();
- } else if typ.is_some() && typ != Some("tree") {
- return None;
- }
-
- if project.ends_with(".git") {
- project = project.strip_suffix(".git")?;
- }
-
- let commit = commit.unwrap();
-
- Some(
- Url::parse(&format!(
- "https://codeload.github.com/{user}/{project}/tar.gz/{commit}"
- ))
- .ok()?,
- )
- }
- "bitbucket.org" => {
- let user = s.next()?;
- let mut project = s.next()?;
- let aux = s.next();
-
- if aux == Some("get") {
- return None;
- }
-
- if project.ends_with(".git") {
- project = project.strip_suffix(".git")?;
- }
-
- let commit = url.fragment()?;
-
- Some(
- Url::parse(&format!(
- "https://bitbucket.org/{user}/{project}/get/{commit}.tar.gz"
- ))
- .ok()?,
- )
- }
- "gitlab.com" => {
- let path = &url.path()[1..];
-
- if path.contains("/~/") || path.contains("/archive.tar.gz") {
- return None;
- }
-
- let user = s.next()?;
- let mut project = s.next()?;
-
- if project.ends_with(".git") {
- project = project.strip_suffix(".git")?;
- }
-
- let commit = url.fragment()?;
-
- Some(
- Url::parse(&format!(
- "https://gitlab.com/{user}/{project}/repository/archive.tar.gz?ref={commit}"
- ))
- .ok()?,
- )
- }
- "git.sr.ht" => {
- let user = s.next()?;
- let mut project = s.next()?;
- let aux = s.next();
-
- if aux == Some("archive") {
- return None;
- }
-
- if project.ends_with(".git") {
- project = project.strip_suffix(".git")?;
- }
-
- let commit = url.fragment()?;
-
- Some(
- Url::parse(&format!(
- "https://git.sr.ht/{user}/{project}/archive/{commit}.tar.gz"
- ))
- .ok()?,
- )
- }
- _ => None,
- }
- } else {
- None
- }
-}
-
-fn get_ideal_hash(integrity: &str) -> anyhow::Result<&str> {
- let split: Vec<_> = integrity.split_ascii_whitespace().collect();
-
- if split.len() == 1 {
- Ok(split[0])
- } else {
- for hash in ["sha512-", "sha1-"] {
- if let Some(h) = split.iter().find(|s| s.starts_with(hash)) {
- return Ok(h);
- }
- }
-
- Err(anyhow!("not sure which hash to select out of {split:?}"))
- }
-}
-
-fn get_initial_url() -> anyhow::Result {
- Url::parse("git+ssh://git@a.b").context("initial url should be valid")
-}
+mod parse;
/// `fixup_lockfile` removes the `integrity` field from Git dependencies.
///
@@ -294,7 +62,6 @@ fn fixup_lockfile(mut lock: Map) -> anyhow::Result